Skip to content

Commit b064a37

Browse files
author
DeathAxe
committed
Merge branch '3.0.6'
2 parents 1795ce1 + 409e224 commit b064a37

10 files changed

+36
-24
lines changed

‎Default (Linux).sublime-keymap

+4-4
Original file line numberDiff line numberDiff line change
@@ -1052,15 +1052,15 @@
10521052
{ "keys": ["ctrl+enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
10531053
[
10541054
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
1055-
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
1056-
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
1055+
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
1056+
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
10571057
]
10581058
},
10591059
{ "keys": ["ctrl+keypad_enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
10601060
[
10611061
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
1062-
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
1063-
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
1062+
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
1063+
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
10641064
]
10651065
},
10661066
// Decrease block quote level

‎Default (OSX).sublime-keymap

+4-4
Original file line numberDiff line numberDiff line change
@@ -1052,15 +1052,15 @@
10521052
{ "keys": ["super+enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
10531053
[
10541054
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
1055-
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
1056-
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
1055+
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
1056+
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
10571057
]
10581058
},
10591059
{ "keys": ["super+keypad_enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
10601060
[
10611061
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
1062-
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
1063-
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
1062+
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
1063+
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
10641064
]
10651065
},
10661066
// Decrease block quote level

‎Default (Windows).sublime-keymap

+4-4
Original file line numberDiff line numberDiff line change
@@ -1052,15 +1052,15 @@
10521052
{ "keys": ["ctrl+enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
10531053
[
10541054
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
1055-
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
1056-
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
1055+
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
1056+
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
10571057
]
10581058
},
10591059
{ "keys": ["ctrl+keypad_enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
10601060
[
10611061
{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
1062-
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
1063-
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
1062+
{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
1063+
{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
10641064
]
10651065
},
10661066
// Decrease block quote level

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[
2-
{"command": "expand_selection", "args": {"to": "line"}},
3-
{"command": "move", "args": {"by": "characters", "extend": true, "forward": false}},
2+
{"command": "move_to", "args": {"to": "hardbol", "extend": false} },
3+
{"command": "move_to", "args": {"to": "hardeol", "extend": true} },
44
{"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

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

‎macros/Delete Empty Blockquote.sublime-macro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[
2-
{"command": "expand_selection", "args": {"to": "line"}},
3-
{"command": "move", "args": {"by": "characters", "extend": true, "forward": false}},
2+
{"command": "move_to", "args": {"to": "hardbol", "extend": false} },
3+
{"command": "move_to", "args": {"to": "hardeol", "extend": true} },
44
{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^([\\s>]*)>.*/$1/}"}}
55
]

‎macros/Delete Empty List Item.sublime-macro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[
2-
{"command": "expand_selection", "args": {"to": "line"}},
3-
{"command": "move", "args": {"by": "characters", "extend": true, "forward": false}},
2+
{"command": "move_to", "args": {"to": "hardbol", "extend": false} },
3+
{"command": "move_to", "args": {"to": "hardeol", "extend": true} },
44
{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^([\\s>]*).*/$1/}"}}
55
]

‎macros/Terminate Empty Blockquote.sublime-macro

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

‎messages.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@
3131
"3.0.2": "messages/3.0.2.md",
3232
"3.0.3": "messages/3.0.3.md",
3333
"3.0.4": "messages/3.0.4.md",
34-
"3.0.5": "messages/3.0.5.md"
34+
"3.0.5": "messages/3.0.5.md",
35+
"3.0.6": "messages/3.0.6.md"
3536
}

‎messages/3.0.6.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# MarkdownEditing 3.0.6 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+
* Recently changed macros work on end of file again (fixes #653)
9+
* Enable terminate block quote for non-list items
10+
11+
[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues

0 commit comments

Comments
 (0)