Skip to content

Commit 38bb411

Browse files
deathaxedeathaxe
committed
Merge branch 'st4-develop'
2 parents feaa639 + 7c71f62 commit 38bb411

11 files changed

+745
-188
lines changed

‎.github/workflows/ci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
jobs:
2222
lint:
2323
name: Python ${{ matrix.python }}
24-
runs-on: ubuntu-18.04
24+
runs-on: ubuntu-20.04
2525
strategy:
2626
matrix:
2727
python:

‎CONTRIBUTING.md

Lines changed: 55 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,84 @@
22

33
## Where to Begin
44

5-
Development is based on milestones. Each milestone will be implemented in its own branch (e.g. branch `v2.0.4`).
5+
Development is proceeding in development branches for compatible ST builds:
66

7-
The first thing you should do is determining the branch to base your edits on.
7+
| develop branch | target branch | ST builds
8+
| --- | --- | ---
9+
| st3-develop | ST3176 | 3176 - 4106
10+
| st4-develop | master | 4107...
811

9-
If you are fixing an issue that already exists in the issue tracker, see which milestone it belongs to and commit your contribution to the branch with the same name as the milestone. If the issue doesn't belong to a milestone;
12+
> **Note**
13+
>
14+
> Currently main difference between ST3 and ST4 branches
15+
> is syntax definition using `version: 2` in ST4.
1016
11-
* __push-access users__: assign it to the closest milestone.
12-
* __non-push-access users__: pick the closest milestone.
17+
Common improvements for ST3 and ST4 should be based on and merged into `st3-develop`.
18+
It is frequently merged into `st4-develop`, if required.
1319

14-
If your contribution is independent from the issue tracker, pick the closest milestone and create your commits in that branch.
20+
Only changes, which require ST4, are based on and merged directly into `st4-develop`.
1521

16-
If the milestone branch doesn't exist yet;
22+
New releases will be created, if enough or critical fixes are available.
1723

18-
* __push-access users__: create it. The format is e.g. `v2.0.4` and increments decimally. It is _not semver_.
19-
* __non-push-access users__: pick `master` branch.
20-
21-
After you've done with your commits;
22-
23-
* __push-access users__: push your local branch to the same named branch on GitHub.
24-
* __non-push-access users__: send a pull request from your local branch to the same named branch on GitHub.
25-
26-
Each milestone will have a pull request that will be kept open until the milestone is completed. The purpose of this is having a showcase and discussion page for the milestone. You can describe there what you have implemented, preferably using screenshots. It's also an early feedback place for the users about your contribution.
24+
Release version number will be determined based on amount and kind of changes.
2725

2826
## General Guidelines
2927

3028
* Code formatting:
3129
- __Indentation__: 4 spaces
3230
- __Line endings__: `\n`
33-
* If your contribution deserves a place in `README.md`, please do so. Preferably in the same commit with your modifications.
34-
* If you want to add screenshots to `README.md`, put your images under `screenshots/` directory. For creating your screenshots, you can use markdown files under `samples/` directory.
35-
* We create __changelog__ files for Package Manager updates. They are under `messages/` directory.
3631

37-
If your contribution deserves a place under one of the "Bug Fixes", "New Features", "Changes" titles, please do so. Preferably in the same commit with your modifications.
32+
* If your contribution deserves a place in `README.md`, please do so.
33+
Preferably in the same commit with your modifications.
34+
35+
Consider updating
36+
37+
* We create __changelog__ files for Package Manager updates.
38+
They are under `messages/` directory.
3839

39-
You have to edit the changelog that belongs to the branch you've worked on. For example, if you have based your commits on branch `v2.0.4`, then the changelog you should edit is `messages/2.0.4.md`.
40+
If your contribution deserves a place under one of
41+
the "Bug Fixes", "New Features", "Changes" titles,
42+
please do so.
43+
Preferably in the same commit with your modifications.
4044

41-
If the changelog file doesn't exist yet, create it by copying `messages/template.md` as a template.
45+
Changelog is created in `messages/next.md`.
46+
It will be renamed to match release version number
47+
as part of the release workflow.
4248

43-
* If you are defining a new __key binding__, please define for all the 3 OSs in their own `.sublime-keymap` files. You have to insert your edits into the exacly same place in the 3 files.
44-
* If you want to introduce a new setting key for one of the `.sublime-settings` files, use `mde.` prefix in your setting key.
45-
* For testing your changes, you can use the test files under `tests/`. You can extend those files to add new tests and edge cases.
49+
* If you are defining a new __key binding__,
50+
please define for all the 3 OSs in their own `.sublime-keymap` files.
51+
You have to insert your edits into the exactly same place in the 3 files.
52+
53+
* Setting keys are added to one of the `.sublime-settings` files,
54+
using `mde.` prefix and a description comment.
55+
56+
* For testing your changes, you can use the test files under `tests/`.
57+
You can extend those files to add new tests and edge cases.
4658

4759
## Publishing to Package Control
4860

49-
When the milestone is completed, push-access users can publish the new version to the Package Control. Creating the new version __tag__ on the GitHub repository is enough for this. For example, if the name of the milestone is `v2.0.4`, the tag should be `2.0.4`.
61+
> **Note**
62+
>
63+
> For push-access users, only!
64+
65+
For each target:
66+
67+
1. check and update changelog.
68+
2. determine version number.
69+
3. rename changelog `messages/next.md` to `messages/<version>.md`
70+
4. add a corresponding entry in `messages.json`
71+
5. merge development branch into target branch (e.g.: `st3-develop` => `st3176`)
72+
6. create and push a tag in form `<build>-<version>` (e.g. `3176-2.3.4`)
5073

51-
The update process may take __up to an hour__ depending on the crawl frequency by the Package Control.
74+
The update process may take __up to an hour__
75+
depending on the crawl frequency by the Package Control.
5276

5377
## Contributing to themes
5478

55-
Here are the used scopes under 3 different markdown flavors. If you are not sure about how the scopes are used, checkout .tmlanguage files or ask in issues. __Unique__ scopes are marked as bold.
79+
Here are the used scopes under 3 different markdown flavors.
80+
If you are not sure about how the scopes are used,
81+
checkout .sublime-syntax files or ask in issues.
82+
__Unique__ scopes are marked as bold.
5683

5784
### ScopeName: text.html.markdown
5885

‎Default (Linux).sublime-keymap

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,55 @@
77
]
88
},
99

10+
//
11+
// The following key bindings enforce indentation by 2 chars in YAML frontmatter
12+
// without regards to syntax specific or global indentation settings,
13+
// to avoid YAML parsing errors.
14+
//
15+
16+
// insert newline and indent it by two chars
17+
{ "keys": ["enter"], "command": "insert_snippet", "args": { "contents": "\n" }, "context":
18+
[
19+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
20+
{ "key": "following_text", "operator": "regex_match", "operand": "^$" }
21+
]
22+
},
23+
// indent by one char if line starts with odd amount of spaces
24+
{ "keys": ["tab"], "command": "insert", "args": { "characters": " " }, "context":
25+
[
26+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
27+
{ "key": "preceding_text", "operator": "regex_match", "operand": "(?:[ ]{2})*[ ]$" }
28+
]
29+
},
30+
// indent by two chars if line starts with even amount of spaces
31+
{ "keys": ["tab"], "command": "insert", "args": { "characters": " " }, "context":
32+
[
33+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
34+
{ "key": "preceding_text", "operator": "regex_match", "operand": "(?:[ ]{2})*$" }
35+
]
36+
},
37+
// unindent by one char if line starts with odd amount of spaces
38+
{ "keys": ["shift+tab"], "command": "left_delete", "context":
39+
[
40+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
41+
{ "key": "preceding_text", "operator": "regex_match", "operand": "(?:[ ]{2})*[ ]$" }
42+
]
43+
},
44+
// unindent by two chars if line starts with even amount of spaces
45+
{ "keys": ["shift+tab"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Delete Left 2.sublime-macro"}, "context":
46+
[
47+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
48+
{ "key": "preceding_text", "operator": "regex_match", "operand": "(?:[ ]{2})*$" }
49+
]
50+
},
51+
// unindent by two chars if line starts with even amount of spaces
52+
{ "keys": ["backspace"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Delete Left 2.sublime-macro"}, "context":
53+
[
54+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
55+
{ "key": "preceding_text", "operator": "regex_match", "operand": "(?:[ ]{2})*$" }
56+
]
57+
},
58+
1059
//
1160
// Auto-Pairing Astersisks
1261
//
@@ -947,7 +996,7 @@
947996
// Unindent list item no matter of caret position if `shift_tab_unindent` is set
948997
{ "keys": ["shift+tab"], "command": "mde_unindent_list_item", "context":
949998
[
950-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
999+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter", "match_all": true },
9511000
{ "key": "setting.shift_tab_unindent", "operator": "equal", "operand": true },
9521001
{ "key": "has_prev_field", "operator": "equal", "operand": false },
9531002
{ "key": "overlay_visible", "operator": "equal", "operand": false },
@@ -957,7 +1006,7 @@
9571006
// Unindent list item if caret is in front of bullets
9581007
{ "keys": ["shift+tab"], "command": "mde_unindent_list_item", "context":
9591008
[
960-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1009+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter", "match_all": true },
9611010
{ "key": "has_prev_field", "operator": "equal", "operand": false },
9621011
{ "key": "overlay_visible", "operator": "equal", "operand": false },
9631012
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*$", "match_all": true },
@@ -967,7 +1016,7 @@
9671016
// Unindent list item if caret is behind bullets
9681017
{ "keys": ["shift+tab"], "command": "mde_unindent_list_item", "context":
9691018
[
970-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1019+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter", "match_all": true },
9711020
{ "key": "has_prev_field", "operator": "equal", "operand": false },
9721021
{ "key": "overlay_visible", "operator": "equal", "operand": false },
9731022
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*[-+*]\\s*$", "match_all": true },
@@ -977,7 +1026,7 @@
9771026
// Unindent list item if caret is at eol
9781027
{ "keys": ["shift+tab"], "command": "mde_unindent_list_item", "context":
9791028
[
980-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1029+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter", "match_all": true },
9811030
{ "key": "has_prev_field", "operator": "equal", "operand": false },
9821031
{ "key": "overlay_visible", "operator": "equal", "operand": false },
9831032
{ "key": "preceding_text", "operator": "regex_contains", "operand": "^[\\s>]*[-+*]\\s", "match_all": true },

‎Default (OSX).sublime-keymap

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,55 @@
77
]
88
},
99

10+
//
11+
// The following key bindings enforce indentation by 2 chars in YAML frontmatter
12+
// without regards to syntax specific or global indentation settings,
13+
// to avoid YAML parsing errors.
14+
//
15+
16+
// insert newline and indent it by two chars
17+
{ "keys": ["enter"], "command": "insert_snippet", "args": { "contents": "\n" }, "context":
18+
[
19+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
20+
{ "key": "following_text", "operator": "regex_match", "operand": "^$" }
21+
]
22+
},
23+
// indent by one char if line starts with odd amount of spaces
24+
{ "keys": ["tab"], "command": "insert", "args": { "characters": " " }, "context":
25+
[
26+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
27+
{ "key": "preceding_text", "operator": "regex_match", "operand": "(?:[ ]{2})*[ ]$" }
28+
]
29+
},
30+
// indent by two chars if line starts with even amount of spaces
31+
{ "keys": ["tab"], "command": "insert", "args": { "characters": " " }, "context":
32+
[
33+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
34+
{ "key": "preceding_text", "operator": "regex_match", "operand": "(?:[ ]{2})*$" }
35+
]
36+
},
37+
// unindent by one char if line starts with odd amount of spaces
38+
{ "keys": ["shift+tab"], "command": "left_delete", "context":
39+
[
40+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
41+
{ "key": "preceding_text", "operator": "regex_match", "operand": "(?:[ ]{2})*[ ]$" }
42+
]
43+
},
44+
// unindent by two chars if line starts with even amount of spaces
45+
{ "keys": ["shift+tab"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Delete Left 2.sublime-macro"}, "context":
46+
[
47+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
48+
{ "key": "preceding_text", "operator": "regex_match", "operand": "(?:[ ]{2})*$" }
49+
]
50+
},
51+
// unindent by two chars if line starts with even amount of spaces
52+
{ "keys": ["backspace"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Delete Left 2.sublime-macro"}, "context":
53+
[
54+
{ "key": "selector", "operand": "text.html.markdown meta.frontmatter source.yaml" },
55+
{ "key": "preceding_text", "operator": "regex_match", "operand": "(?:[ ]{2})*$" }
56+
]
57+
},
58+
1059
//
1160
// Auto-Pairing Astersisks
1261
//
@@ -947,7 +996,7 @@
947996
// Unindent list item no matter of caret position if `shift_tab_unindent` is set
948997
{ "keys": ["shift+tab"], "command": "mde_unindent_list_item", "context":
949998
[
950-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
999+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter", "match_all": true },
9511000
{ "key": "setting.shift_tab_unindent", "operator": "equal", "operand": true },
9521001
{ "key": "has_prev_field", "operator": "equal", "operand": false },
9531002
{ "key": "overlay_visible", "operator": "equal", "operand": false },
@@ -957,7 +1006,7 @@
9571006
// Unindent list item if caret is in front of bullets
9581007
{ "keys": ["shift+tab"], "command": "mde_unindent_list_item", "context":
9591008
[
960-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1009+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter", "match_all": true },
9611010
{ "key": "has_prev_field", "operator": "equal", "operand": false },
9621011
{ "key": "overlay_visible", "operator": "equal", "operand": false },
9631012
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*$", "match_all": true },
@@ -967,7 +1016,7 @@
9671016
// Unindent list item if caret is behind bullets
9681017
{ "keys": ["shift+tab"], "command": "mde_unindent_list_item", "context":
9691018
[
970-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
1019+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter", "match_all": true },
9711020
{ "key": "has_prev_field", "operator": "equal", "operand": false },
9721021
{ "key": "overlay_visible", "operator": "equal", "operand": false },
9731022
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*[-+*]\\s*$", "match_all": true },
@@ -977,7 +1026,7 @@
9771026
// Unindent list item if caret is at eol
9781027
{ "keys": ["shift+tab"], "command": "mde_unindent_list_item", "context":
9791028
[
980-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.list", "match_all": true },
1029+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter", "match_all": true },
9811030
{ "key": "has_prev_field", "operator": "equal", "operand": false },
9821031
{ "key": "overlay_visible", "operator": "equal", "operand": false },
9831032
{ "key": "preceding_text", "operator": "regex_contains", "operand": "^[\\s>]*[-+*]\\s", "match_all": true },

0 commit comments

Comments
 (0)