Skip to content

Commit 6e7fe13

Browse files
deathaxedeathaxe
committed
Merge branch 'st4-develop'
2 parents bff21d0 + 8d7d179 commit 6e7fe13

25 files changed

Lines changed: 272 additions & 227 deletions

‎.github/workflows/ci-lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
- 'x64'
3131
steps:
3232
- name: Checkout Repository
33-
uses: actions/checkout@v2
33+
uses: actions/checkout@v3
3434
- name: Set up Python ${{ matrix.python }}
35-
uses: actions/setup-python@v2
35+
uses: actions/setup-python@v3
3636
with:
3737
python-version: ${{ matrix.python }}
3838
architecture: ${{ matrix.arch }}

‎.github/workflows/ci-syntax-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
syntax_tests:
2525
name: Sublime Text ${{ matrix.build }}
26-
runs-on: ubuntu-18.04
26+
runs-on: ubuntu-latest
2727
timeout-minutes: 15 # default is 6 hours!
2828
strategy:
2929
matrix:
@@ -33,7 +33,7 @@ jobs:
3333
- build: latest
3434
default_packages: master
3535
steps:
36-
- uses: actions/checkout@v2
36+
- uses: actions/checkout@v3
3737
- uses: SublimeText/syntax-test-action@v2
3838
with:
3939
build: ${{ matrix.build }}

‎.github/workflows/ci-unit-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ on:
2121
jobs:
2222
test:
2323
name: Sublime Text ${{ matrix.st-version }}
24-
runs-on: ubuntu-18.04
24+
runs-on: ubuntu-latest
2525
timeout-minutes: 15 # default is 6 hours!
2626
strategy:
2727
fail-fast: false
2828
matrix:
2929
st-version: [4]
3030
steps:
31-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v3
3232
- uses: SublimeText/UnitTesting/actions/setup@v1
3333
with:
3434
sublime-text-version: ${{ matrix.st-version }}

‎.github/workflows/deploy-gh-pages.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ on:
1111
jobs:
1212
build:
1313
name: Deploy Docs to Github Pages
14-
runs-on: ubuntu-18.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout Repository
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1818
with:
1919
fetch-depth: 0
2020
- name: Set up Python

‎Context.sublime-menu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
},
1010
{
1111
"caption": "Fold Section",
12-
"command": "mde_fold_section_context"
12+
"command": "mde_fold_section"
1313
},
1414
{
1515
"caption": "Unfold Section",
16-
"command": "mde_unfold_section_context"
16+
"command": "mde_unfold_section"
1717
},
1818
{
1919
"caption": "-",

‎Default (Linux).sublime-keymap‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -678,24 +678,20 @@
678678
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw", "match_all": true }
679679
]
680680
},
681-
{ "keys": ["shift+tab"], "command": "mde_fold_section", "context":
681+
{ "keys": ["ctrl+shift+["], "command": "mde_fold_section", "context":
682682
[
683683
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.list", "match_all": true },
684684
{ "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
685-
{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
686685
{ "key": "has_prev_field", "operator": "equal", "operand": false },
687-
{ "key": "overlay_visible", "operator": "equal", "operand": false },
688-
{ "key": "preceding_text", "operator": "not_regex_match", "operand": "^\\s+", "match_all": true }
686+
{ "key": "overlay_visible", "operator": "equal", "operand": false }
689687
]
690688
},
691-
{ "keys": ["shift+tab"], "command": "mde_fold_section", "context":
689+
{ "keys": ["ctrl+shift+]"], "command": "mde_unfold_section", "context":
692690
[
693-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
691+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.list", "match_all": true },
694692
{ "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
695-
{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
696693
{ "key": "has_prev_field", "operator": "equal", "operand": false },
697-
{ "key": "overlay_visible", "operator": "equal", "operand": false },
698-
{ "key": "text", "operator": "regex_contains", "operand": "^(#{1,6}(?!#))|^(-{3,}|={3,})$"}
694+
{ "key": "overlay_visible", "operator": "equal", "operand": false }
699695
]
700696
},
701697
{ "keys": ["ctrl+shift+tab"], "command": "mde_show_fold_all_sections", "context":

‎Default (OSX).sublime-keymap‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -678,24 +678,20 @@
678678
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw", "match_all": true }
679679
]
680680
},
681-
{ "keys": ["shift+tab"], "command": "mde_fold_section", "context":
681+
{ "keys": ["super+shift+["], "command": "mde_fold_section", "context":
682682
[
683683
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.list", "match_all": true },
684684
{ "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
685-
{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
686685
{ "key": "has_prev_field", "operator": "equal", "operand": false },
687-
{ "key": "overlay_visible", "operator": "equal", "operand": false },
688-
{ "key": "preceding_text", "operator": "not_regex_match", "operand": "^\\s+", "match_all": true }
686+
{ "key": "overlay_visible", "operator": "equal", "operand": false }
689687
]
690688
},
691-
{ "keys": ["shift+tab"], "command": "mde_fold_section", "context":
689+
{ "keys": ["super+shift+]"], "command": "mde_unfold_section", "context":
692690
[
693-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
691+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.list", "match_all": true },
694692
{ "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
695-
{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
696693
{ "key": "has_prev_field", "operator": "equal", "operand": false },
697-
{ "key": "overlay_visible", "operator": "equal", "operand": false },
698-
{ "key": "text", "operator": "regex_contains", "operand": "^(#{1,6}(?!#))|^(-{3,}|={3,})$"}
694+
{ "key": "overlay_visible", "operator": "equal", "operand": false }
699695
]
700696
},
701697
{ "keys": ["ctrl+shift+tab"], "command": "mde_show_fold_all_sections", "context":

‎Default (Windows).sublime-keymap‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -678,24 +678,20 @@
678678
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw", "match_all": true }
679679
]
680680
},
681-
{ "keys": ["shift+tab"], "command": "mde_fold_section", "context":
681+
{ "keys": ["ctrl+shift+["], "command": "mde_fold_section", "context":
682682
[
683683
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.list", "match_all": true },
684684
{ "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
685-
{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
686685
{ "key": "has_prev_field", "operator": "equal", "operand": false },
687-
{ "key": "overlay_visible", "operator": "equal", "operand": false },
688-
{ "key": "preceding_text", "operator": "not_regex_match", "operand": "^\\s+", "match_all": true }
686+
{ "key": "overlay_visible", "operator": "equal", "operand": false }
689687
]
690688
},
691-
{ "keys": ["shift+tab"], "command": "mde_fold_section", "context":
689+
{ "keys": ["ctrl+shift+]"], "command": "mde_unfold_section", "context":
692690
[
693-
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
691+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.list", "match_all": true },
694692
{ "key": "setting.mde.keymap_disable.fold_section", "operator": "not_equal", "operand": true },
695-
{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
696693
{ "key": "has_prev_field", "operator": "equal", "operand": false },
697-
{ "key": "overlay_visible", "operator": "equal", "operand": false },
698-
{ "key": "text", "operator": "regex_contains", "operand": "^(#{1,6}(?!#))|^(-{3,}|={3,})$"}
694+
{ "key": "overlay_visible", "operator": "equal", "operand": false }
699695
]
700696
},
701697
{ "keys": ["ctrl+shift+tab"], "command": "mde_show_fold_all_sections", "context":

‎Default.sublime-commands‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,13 @@
146146
//
147147

148148
{
149-
"caption": "MarkdownEditing: Toggle Folding Current Section",
149+
"caption": "MarkdownEditing: Fold Current Section",
150150
"command": "mde_fold_section"
151151
},
152+
{
153+
"caption": "MarkdownEditing: Unold Current Section",
154+
"command": "mde_unfold_section"
155+
},
152156
{
153157
"caption": "MarkdownEditing: Fold Level 1 Sections",
154158
"command": "mde_fold_all_sections",

‎docs/usage.md‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,21 @@ Adding or removing `#` at the beginning of lines also modifies heading levels im
133133
134134
Irrelevant sections of documents can be folded/collapsed via Command Palette:
135135
136-
* **MarkdownEditing: Toggle Folding Current Section**
137-
Whether child sections are folded or unfolded as well depends on folding level defined by calling one of the following commands.
136+
* **MarkdownEditing: Fold Current Section**
137+
Whether child sections are folded depends on folding level defined by calling one of the following commands.
138138
139-
If `Fold All Sections` was called before _("outline mode" is active)_, the region between current and following sibling or child heading is (un)folded only.
139+
If `Fold All Sections` was called before _("outline mode" is active)_, the region between current and following sibling or child heading is folded only.
140+
141+
If `Unfold All Sections` was called before, all child sections are folded.
142+
143+
* **MarkdownEditing: Unfold Current Section**
144+
Whether child sections are unfolded depends on folding level defined by calling one of the following commands.
145+
146+
If `Fold All Sections` was called before _("outline mode" is active)_, the region between current and following sibling or child heading is unfolded only.
140147
141148
If `Fold Level 1-6 Sections` was called before, all child sections with lower level keep folded when unfolding their parent section.
142149
143-
If `Unfold All Sections` was called before, all child sections are (un)folded.
150+
If `Unfold All Sections` was called before, all child sections are unfolded.
144151
145152
* **MarkdownEditing: Fold Level 1-6 Sections**
146153
Folds all sections of headings of specific level. Also hides lower level headings.
@@ -158,7 +165,8 @@ Folding is bound to following keys by default:
158165
| <kbd>Ctrl</kbd> + <kbd>k</kbd>, <kbd>Ctrl</kbd> + <kbd>0</kbd> | <kbd>⌥</kbd> + <kbd>k</kbd>, <kbd>⌥</kbd> + <kbd>0</kbd> | Unfold all sections
159166
| <kbd>Ctrl</kbd> + <kbd>k</kbd>, <kbd>Ctrl</kbd> + <kbd>1..6</kbd> | <kbd>⌥</kbd> + <kbd>k</kbd>, <kbd>⌥</kbd> + <kbd>1..6</kbd> | Fold sections by level 1..6
160167
| <kbd>Ctrl</kbd> + <kbd>k</kbd>, <kbd>Ctrl</kbd> + <kbd>9</kbd> | <kbd>⌥</kbd> + <kbd>k</kbd>, <kbd>⌥</kbd> + <kbd>9</kbd> | Fold all sections, but keep headings of any level visible
161-
| <kbd>Shift</kbd> + <kbd>Tab</kbd> | <kbd>⇧</kbd> + <kbd>Tab</kbd> | Fold/Unfold current section.
168+
| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>[</kbd> | <kbd>^</kbd> + <kbd>⇧</kbd> + <kbd>Tab</kbd> | Fold current section.
169+
| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>]</kbd> | <kbd>^</kbd> + <kbd>⇧</kbd> + <kbd>Tab</kbd> | Unfold current section.
162170
| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd> | <kbd>^</kbd> + <kbd>⇧</kbd> + <kbd>Tab</kbd> | Fold all sections under headings of a certain level.
163171
164172
## Automatic Link Url Folding

0 commit comments

Comments
 (0)