Skip to content

Commit de14fe2

Browse files
deathaxedeathaxe
committed
Merge branch 'st4-develop'
2 parents 9e20e19 + 8b218b7 commit de14fe2

16 files changed

+1152
-738
lines changed

‎Default (Linux).sublime-keymap‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,6 +1084,12 @@
10841084
{ "key": "overlay_visible", "operator": "equal", "operand": false }
10851085
]
10861086
},
1087+
// Reset GFM tasks
1088+
{ "keys": ["alt+shift+x"], "command": "mde_reset_task_list_items", "context":
1089+
[
1090+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
1091+
]
1092+
},
10871093
// Toggle GFM tasks
10881094
{ "keys": ["alt+x"], "command": "mde_toggle_task_list_item", "context":
10891095
[
@@ -1462,6 +1468,18 @@
14621468
]
14631469
},
14641470

1471+
// navigate between critics
1472+
{ "keys": ["alt+c", "alt+down"], "command": "mde_goto_next_critic", "context":
1473+
[
1474+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
1475+
]
1476+
},
1477+
{ "keys": ["alt+c", "alt+up"], "command": "mde_goto_prev_critic", "context":
1478+
[
1479+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
1480+
]
1481+
},
1482+
14651483
//
14661484
// Wiki
14671485
//

‎Default (OSX).sublime-keymap‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,6 +1084,12 @@
10841084
{ "key": "overlay_visible", "operator": "equal", "operand": false }
10851085
]
10861086
},
1087+
// Reset GFM tasks
1088+
{ "keys": ["alt+shift+x"], "command": "mde_reset_task_list_items", "context":
1089+
[
1090+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
1091+
]
1092+
},
10871093
// Toggle GFM tasks
10881094
{ "keys": ["alt+x"], "command": "mde_toggle_task_list_item", "context":
10891095
[
@@ -1462,6 +1468,18 @@
14621468
]
14631469
},
14641470

1471+
// navigate between critics
1472+
{ "keys": ["super+alt+c", "super+alt+down"], "command": "mde_goto_next_critic", "context":
1473+
[
1474+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
1475+
]
1476+
},
1477+
{ "keys": ["super+alt+c", "super+alt+up"], "command": "mde_goto_prev_critic", "context":
1478+
[
1479+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
1480+
]
1481+
},
1482+
14651483
//
14661484
// Wiki
14671485
//

‎Default (Windows).sublime-keymap‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,6 +1084,12 @@
10841084
{ "key": "overlay_visible", "operator": "equal", "operand": false }
10851085
]
10861086
},
1087+
// Reset GFM tasks
1088+
{ "keys": ["alt+shift+x"], "command": "mde_reset_task_list_items", "context":
1089+
[
1090+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
1091+
]
1092+
},
10871093
// Toggle GFM tasks
10881094
{ "keys": ["alt+x"], "command": "mde_toggle_task_list_item", "context":
10891095
[
@@ -1462,6 +1468,18 @@
14621468
]
14631469
},
14641470

1471+
// navigate between critics
1472+
{ "keys": ["alt+c", "alt+down"], "command": "mde_goto_next_critic", "context":
1473+
[
1474+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
1475+
]
1476+
},
1477+
{ "keys": ["alt+c", "alt+up"], "command": "mde_goto_prev_critic", "context":
1478+
[
1479+
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
1480+
]
1481+
},
1482+
14651483
//
14661484
// Wiki
14671485
//

‎Default.sublime-commands‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,23 @@
205205
"command": "mde_switch_list_bullet_type"
206206
},
207207

208+
//
209+
// Tasks
210+
//
211+
212+
{
213+
"caption": "MarkdownEditing: Insert Task",
214+
"command": "mde_insert_task_list_item"
215+
},
216+
{
217+
"caption": "MarkdownEditing: Toggle Task",
218+
"command": "mde_toggle_task_list_item"
219+
},
220+
{
221+
"caption": "MarkdownEditing: Reset Tasks",
222+
"command": "mde_reset_task_list_items"
223+
},
224+
208225
//
209226
// References
210227
//
@@ -262,6 +279,19 @@
262279
"command": "mde_reference_organize"
263280
},
264281

282+
//
283+
// CriticMarkup
284+
//
285+
286+
{
287+
"caption": "MarkdownEditing: Goto Next Critic",
288+
"command": "mde_goto_next_critic"
289+
},
290+
{
291+
"caption": "MarkdownEditing: Goto Previous Critic",
292+
"command": "mde_goto_prev_critic"
293+
},
294+
265295
//
266296
// Wiki
267297
//

‎docs/usage.md‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Further available key bindings:
250250
| <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>,</kbd> | <kbd>⌘</kbd> + <kbd>⇧</kbd> + <kbd>,</kbd> | Decrease block quote level (remove a `> `)
251251
| <kbd>Ctrl</kbd> + <kbd>Enter</kbd> | <kbd>⌘</kbd> + <kbd>Enterkbd> | Terminate block quote by adding two newline's.<br/>If the current line is empty, block quote signs are removed.
252252

253-
# Lists and Tasks
253+
# Lists
254254

255255
List bullets are automatically changed when indenting or unindenting list items by default. This behaviour can be disabled via `"mde.list_indent_auto_switch_bullet": false`.
256256

@@ -261,12 +261,24 @@ Following commands are provided via Command Palette:
261261
* **Switch List Bullet Type**
262262
Switches the highlighted list between numbered and bulleted style.
263263

264+
# Tasks
265+
266+
Following commands are provided via Command Palette to manage tasks:
267+
268+
* **Insert Task**
269+
Creates new GFM task (`* [ ] task`)
270+
* **Toggle Task**
271+
Toggles GFM task check marks (`* [x] task`)
272+
* **Reset Tasks**
273+
Clear all task check boxes. If non-empty selection exists, only selected tasks are reset.
274+
264275
Following key bindings may be used to create or toggle tasks.
265276

266277
| Linux/Windows | MacOS | Description
267278
|---------------|-------|-------------
268279
| <kbd>Alt</kbd> + <kbd>t</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>t</kbd> | Creates new GFM task (`* [ ] task`)
269-
| <kbd>Alt</kbd> + <kbd>x</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>x</kbd> | Toggles GFM task check marks (`* [x] task`)
280+
| <kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>x</kbd> | <kbd>⌥</kbd> + <kbd>⇧</kbd> + <kbd>x</kbd> | Clear GFM all (selected) task check marks (`* [0] task`)
281+
| <kbd>Alt</kbd> + <kbd>x</kbd> | <kbd>⌥</kbd> + <kbd>x</kbd> | Toggles GFM task check marks (`* [x] task`)
270282

271283
# References
272284

@@ -321,6 +333,11 @@ Important functions are bound to following keys by default:
321333

322334
MarkdownEditing supports document review by highlighting critic markup and enable adding critic or accepting and rejecting proposed changes via key bindings.
323335

336+
| Linux/Windows | MacOS | Description
337+
|---------------|-------|-------------
338+
| <kbd>Alt</kbd> + <kbd>c</kbd>, <kbd>Alt</kbd> + <kbd>down</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>c</kbd>, <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>down</kbd> | Jump to next critic marker.
339+
| <kbd>Alt</kbd> + <kbd>c</kbd>, <kbd>Alt</kbd> + <kbd>up</kbd> | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>c</kbd>, <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>up</kbd> | Jump to previous critic marker.
340+
324341
## Reviewer
325342

326343
A document reviewer can insert critic or propose changes for single words or selections with following key bindings:

‎make.cmd‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,12 @@ goto :usage
5353
:RELEASE
5454
if "%2"== "" goto :usage
5555

56-
git checkout st3176 && git merge st3-develop --no-ff
57-
if not errorlevel 0 (
58-
echo Unable to merge st3-develop into st3176!
59-
exit /b 1
60-
)
6156
git checkout master && git merge st4-develop --no-ff
6257
if not errorlevel 0 (
6358
echo Unable to merge st4-develop into master!
6459
exit /b 1
6560
)
66-
echo Hit any key to push branches!
67-
pause
68-
call git push origin st3176
69-
if not errorlevel 0 (
70-
echo Failed to push st3176!
71-
exit /b 1
72-
)
61+
7362
call git push origin master
7463
if not errorlevel 0 (
7564
echo Failed to push master!
@@ -80,22 +69,13 @@ goto :usage
8069

8170
echo Createing assets for "%package%"...
8271

83-
:: create downloadable asset for ST4126+
84-
set build=3176
85-
set archive=%package%-%2-st%build%.sublime-package
86-
set assets="%archive%#%archive%"
87-
call git tag -f %build%-%2 st%build%
88-
call git archive --format zip -o "%archive%" %build%-%2
89-
9072
:: create downloadable asset for ST4134+
9173
set build=4107
9274
set archive=%package%-%2-st%build%.sublime-package
93-
set assets=%assets% "%archive%#%archive%"
94-
call git tag -f %build%-%2 master
95-
call git archive --format zip -o "%archive%" %build%-%2
75+
set assets="%archive%#%archive%"
76+
call git archive --format zip -o "%archive%" master
9677

9778
:: create the release
98-
call git push --tags --force
9979
gh release create --target master -t "%package% %2" "%build%-%2" %assets%
10080
del /f /q *.sublime-package
10181
git fetch

‎messages.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,7 @@
4848
"3.1.11": "messages/3.1.11.md",
4949
"3.1.12": "messages/3.1.12.md",
5050
"3.1.13": "messages/3.1.13.md",
51-
"3.1.14": "messages/3.1.14.md"
51+
"3.1.14": "messages/3.1.14.md",
52+
"3.2.0": "messages/3.2.0.md",
53+
"3.3.0": "messages/3.3.0.md"
5254
}

‎messages/3.2.0.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# MarkdownEditing 3.2.0 Changelog
2+
3+
Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
4+
feedback you can use [GitHub issues][issues].
5+
6+
## Bug Fixes
7+
8+
## New Features
9+
10+
* add support for auto-folding headings when loading document
11+
* add support for pandoc fenced divs
12+
13+
## Changes
14+
15+
* merge shellscript related fenced code block contexts
16+
17+
[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues

‎messages/3.3.0.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# MarkdownEditing 3.3.0 Changelog
2+
3+
Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
4+
feedback you can use [GitHub issues][issues].
5+
6+
## Bug Fixes
7+
8+
* fix `==highlight==` not being scoped at beginning of paragraphs (#789)
9+
10+
## New Features
11+
12+
* add `Reset Task Items` (#786)
13+
* add `Goto Next Critic` and `Goto Previous Critic` (#787)
14+
15+
## Changes
16+
17+
* drop support for ST3 (latest available version for ST3 is 3.2.0)
18+
* align frontmatter punctuation scopes with ST's default Markdown syntax
19+
* align code fence scopes with ST's default Markdown syntax
20+
* optimize paragraph termination patterns to improve parsing performance
21+
22+
[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues

‎plugin.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
from .plugins.color_schemes import (
2828
MdeSelectColorSchemeCommand,
2929
)
30+
from .plugins.critic import (
31+
MdeGotoNextCriticCommand,
32+
MdeGotoPrevCriticCommand
33+
)
3034
from .plugins.folding import (
3135
MdeAutoFoldListener,
3236
MdeFoldAllSectionsCommand,
@@ -63,6 +67,7 @@
6367
MdeNumberListCommand,
6468
MdeSwitchListBulletTypeCommand,
6569
MdeInsertTaskListItemCommand,
70+
MdeResetTaskListItemsCommand,
6671
MdeToggleTaskListItemCommand,
6772
MdeJoinLines,
6873
)

0 commit comments

Comments
 (0)