Skip to content

Commit 25f98a4

Browse files
author
DeathAxe
committed
Merge branch '3.0.7' into st3176
2 parents faad9c8 + ebb3246 commit 25f98a4

15 files changed

+180
-72
lines changed

‎.flake8

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[flake8]
22
exclude = .*/,tests/,plugin.py,**/__init__.py
3-
ignore = E203,E266,E501,W503
3+
ignore = C901,E203,E266,E501,W503
44
max-complexity = 25
55
max-line-length = 100
66
select = B,C,E,F,W,T4,B9

‎Default (Linux).sublime-keymap

+2-2
Original file line numberDiff line numberDiff line change
@@ -438,13 +438,13 @@
438438
{ "key": "setting.mde.keymap_disable.set_heading_level", "operand": false }
439439
]
440440
},
441-
{ "keys": ["ctrl+alt+."], "command": "mde_change_headings_level", "args": {"by": 1}, "context":
441+
{ "keys": ["shift+alt+."], "command": "mde_change_headings_level", "args": {"by": 1}, "context":
442442
[
443443
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw", "match_all": true },
444444
{ "key": "setting.mde.keymap_disable.set_heading_level", "operand": false }
445445
]
446446
},
447-
{ "keys": ["ctrl+alt+,"], "command": "mde_change_headings_level", "args": {"by": -1}, "context":
447+
{ "keys": ["shift+alt+,"], "command": "mde_change_headings_level", "args": {"by": -1}, "context":
448448
[
449449
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw", "match_all": true },
450450
{ "key": "setting.mde.keymap_disable.set_heading_level", "operand": false }

‎Default (OSX).sublime-keymap

+2-2
Original file line numberDiff line numberDiff line change
@@ -438,13 +438,13 @@
438438
{ "key": "setting.mde.keymap_disable.set_heading_level", "operand": false }
439439
]
440440
},
441-
{ "keys": ["super+alt+."], "command": "mde_change_headings_level", "args": {"by": 1}, "context":
441+
{ "keys": ["shift+alt+."], "command": "mde_change_headings_level", "args": {"by": 1}, "context":
442442
[
443443
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw", "match_all": true },
444444
{ "key": "setting.mde.keymap_disable.set_heading_level", "operand": false }
445445
]
446446
},
447-
{ "keys": ["super+alt+,"], "command": "mde_change_headings_level", "args": {"by": -1}, "context":
447+
{ "keys": ["shift+alt+,"], "command": "mde_change_headings_level", "args": {"by": -1}, "context":
448448
[
449449
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw", "match_all": true },
450450
{ "key": "setting.mde.keymap_disable.set_heading_level", "operand": false }

‎Default (Windows).sublime-keymap

+2-2
Original file line numberDiff line numberDiff line change
@@ -438,13 +438,13 @@
438438
{ "key": "setting.mde.keymap_disable.set_heading_level", "operand": false }
439439
]
440440
},
441-
{ "keys": ["ctrl+alt+."], "command": "mde_change_headings_level", "args": {"by": 1}, "context":
441+
{ "keys": ["shift+alt+."], "command": "mde_change_headings_level", "args": {"by": 1}, "context":
442442
[
443443
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw", "match_all": true },
444444
{ "key": "setting.mde.keymap_disable.set_heading_level", "operand": false }
445445
]
446446
},
447-
{ "keys": ["ctrl+alt+,"], "command": "mde_change_headings_level", "args": {"by": -1}, "context":
447+
{ "keys": ["shift+alt+,"], "command": "mde_change_headings_level", "args": {"by": -1}, "context":
448448
[
449449
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw", "match_all": true },
450450
{ "key": "setting.mde.keymap_disable.set_heading_level", "operand": false }

‎docs/usage.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ or use one of the following bindings:
109109
|---------------|-------|-------------
110110
| <kbd>Alt</kbd> + <kbd>k</kbd>, <kbd>Alt</kbd> + <kbd>0</kbd> | <kbd>^</kbd> + <kbd>k</kbd>, <kbd>^</kbd> + <kbd>0</kbd> | convert headings into normal text
111111
| <kbd>Alt</kbd> + <kbd>k</kbd>, <kbd>Alt</kbd> + <kbd>1..6</kbd> | <kbd>^</kbd> + <kbd>k</kbd>, <kbd>^</kbd> + <kbd>1..6</kbd> | set headings level to 1..6
112-
| <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>,</kbd> | <kbd>⌘</kbd> + <kbd>^</kbd> + <kbd>,</kbd> | reduce headings level by one
113-
| <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>.</kbd> | <kbd>⌘</kbd> + <kbd>^</kbd> + <kbd>.</kbd> | increase headings level by one
112+
| <kbd>Shift</kbd> + <kbd>Alt</kbd> + <kbd>,</kbd> | <kbd>⇧</kbd> + <kbd>^</kbd> + <kbd>,</kbd> | reduce headings level by one
113+
| <kbd>Shift</kbd> + <kbd>Alt</kbd> + <kbd>.</kbd> | <kbd>⇧</kbd> + <kbd>^</kbd> + <kbd>.</kbd> | increase headings level by one
114114

115115
Key bindings can be disabled via `"mde.keymap_disable.set_heading_level": true`.
116116

‎macros/Add Line and Balance Trailing Hashes.sublime-macro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[
22
{"command": "move_to", "args": {"to": "hardbol", "extend": false} },
33
{"command": "move_to", "args": {"to": "hardeol", "extend": true} },
4-
{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^(\\s*(?:>\\s*)*)(#+)(.*?)\\s*#*\\s*$/$1$2$3 $2\n$1/}"}}
4+
{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^(\\s*(?:>\\s*)*)(#+)(.*?)(?:\\s+#+)?\\s*$/$1$2$3 $2\n$1/}"}}
55
]

‎macros/Add Line and Delete Trailing Hashes.sublime-macro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[
22
{"command": "move_to", "args": {"to": "hardbol", "extend": false} },
33
{"command": "move_to", "args": {"to": "hardeol", "extend": true} },
4-
{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^(\\s*(?:>\\s*)*)(#+)(.*?)\\s*#*\\s*$/$1$2$3\n$1/}"}}
4+
{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^(\\s*(?:>\\s*)*)(#+)(.*?)(?:\\s+#+)?\\s*$/$1$2$3\n$1/}"}}
55
]

‎make.cmd

+52-6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ if /i "%1" == "docs" goto DOCS
1111
if /i "%1" == "deploy-docs" goto DEPLOY-DOCS
1212
if /i "%1" == "serve" goto SERVE
1313
if /i "%1" == "lint" goto LINT
14+
if /i "%1" == "release" goto RELEASE
15+
if /i "%1" == "branch" goto BRANCH
1416
goto :usage
1517

1618
:INIT
@@ -43,6 +45,48 @@ goto :usage
4345
flake8
4446
goto :eof
4547

48+
:BRANCH
49+
if "%2"== "" goto :usage
50+
git checkout -b %2
51+
goto :eof
52+
53+
:RELEASE
54+
if "%2"== "" goto :usage
55+
if not exist "messages/release-%2.md" (
56+
echo Missing release-%2.md
57+
exit /b 1
58+
)
59+
git checkout st3176 && git merge %2 --no-ff
60+
if not errorlevel 0 (
61+
echo Unable to merge %2 into st3176!
62+
exit /b 1
63+
)
64+
git checkout master && git merge %2 --no-ff
65+
if not errorlevel 0 (
66+
echo Unable to merge %2 into master!
67+
exit /b 1
68+
)
69+
echo Hit any key to push branches!
70+
pause
71+
call git push origin st3176
72+
if not errorlevel 0 (
73+
echo Failed to push st3176!
74+
exit /b 1
75+
)
76+
call git push origin master
77+
if not errorlevel 0 (
78+
echo Failed to push master!
79+
exit /b 1
80+
)
81+
echo Hit any key to publish release!
82+
pause
83+
: create release for ST3
84+
gh release create --target st3176 -t "MarkdownEditing %2 (ST3176+)" -F "messages/release-%2.md" "3176-%2"
85+
: create release for ST3
86+
gh release create --target master -t "MarkdownEditing %2 (ST4107+)" -F "messages/release-%2.md" "4107-%2"
87+
git fetch
88+
goto :eof
89+
4690
:VENV
4791
call .venv\scripts\activate.bat
4892
if "%VIRTUAL_ENV%" neq ".venv" exit /b 1
@@ -51,11 +95,13 @@ goto :usage
5195
:USAGE
5296
echo USAGE:
5397
echo.
54-
echo make ^[init^|docs^|gh-pages^|serve^|lint^]
98+
echo make ^[init^|docs^|gh-pages^|serve^|lint^|branch^|release^]
5599
echo.
56-
echo init -- setup .venv and install requirements.
57-
echo docs -- build documentation
58-
echo deploy-docs -- build documentation and publish on Github Pages
59-
echo serve -- build documentation and serve via development server
60-
echo lint -- run black, flake8 and pytest
100+
echo init -- setup .venv and install requirements.
101+
echo docs -- build documentation
102+
echo deploy-docs -- build documentation and publish on Github Pages
103+
echo serve -- build documentation and serve via development server
104+
echo lint -- run black, flake8 and pytest
105+
echo branch 3.0.0 -- prepare version branch
106+
echo release 3.0.0 -- make a release
61107
goto :eof

‎messages.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@
3232
"3.0.3": "messages/3.0.3.md",
3333
"3.0.4": "messages/3.0.4.md",
3434
"3.0.5": "messages/3.0.5.md",
35-
"3.0.6": "messages/3.0.6.md"
35+
"3.0.6": "messages/3.0.6.md",
36+
"3.0.7": "messages/3.0.7.md"
3637
}

‎messages/3.0.7.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# MarkdownEditing 3.0.7 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+
* More robust trailing hash detection in macros
9+
* Normalize whitespace of reference definition symbols
10+
* Fix _Make Wiki Page Reference_ menu item visibility check
11+
* Fix parens after footnotes highlighted as link destination
12+
* Resolve remaining ctrl+alt+ key binding conflict (fixes #654)
13+
* Improve selector matching in references plugin (fixes #658)
14+
15+
## New Features
16+
17+
* Add SVELTE support for fenced code block (closes #662)
18+
* Derive reference name from link url if no text is available (#660)
19+
20+
## Changes
21+
22+
[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues

0 commit comments

Comments
 (0)