Merge branch '3.0.6' into st3176

SublimeText-Markdown · Oct 3, 2021 · faad9c8 · faad9c8
2 parents 30f308f + 409e224
commit faad9c8
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 24 deletions.
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
@@ -1052,15 +1052,15 @@
 	{ "keys": ["ctrl+enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
 		[
 			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
-			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
-			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
+			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
+			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
 		]
 	},
 	{ "keys": ["ctrl+keypad_enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
 		[
 			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
-			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
-			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
+			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
+			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
 		]
 	},
 	// Decrease block quote level

diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -1052,15 +1052,15 @@
 	{ "keys": ["super+enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
 		[
 			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
-			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
-			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
+			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
+			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
 		]
 	},
 	{ "keys": ["super+keypad_enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
 		[
 			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
-			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
-			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
+			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
+			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
 		]
 	},
 	// Decrease block quote level

diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
@@ -1052,15 +1052,15 @@
 	{ "keys": ["ctrl+enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
 		[
 			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
-			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
-			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
+			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
+			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
 		]
 	},
 	{ "keys": ["ctrl+keypad_enter"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Terminate Empty Blockquote.sublime-macro"}, "context":
 		[
 			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.quote", "match_all": true },
-			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>\\s*(?:[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])\\s*$", "match_all": true },
-			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true },
+			{ "key": "preceding_text", "operator": "regex_match", "operand": "^[\\s>]*>(?:\\s*[-+*](?:\\s+\\[[ xX]\\])?|\\d+[.)])?\\s*$", "match_all": true },
+			{ "key": "following_text", "operator": "regex_match", "operand": "^\\s*$", "match_all": true }
 		]
 	},
 	// Decrease block quote level

diff --git a/macros/Add Line and Balance Trailing Hashes.sublime-macro b/macros/Add Line and Balance Trailing Hashes.sublime-macro
@@ -1,5 +1,5 @@
 [
-	{"command": "expand_selection", "args": {"to": "line"}},
-	{"command": "move", "args": {"by": "characters", "extend": true, "forward": false}},
+	{"command": "move_to", "args": {"to": "hardbol", "extend": false} },
+	{"command": "move_to", "args": {"to": "hardeol", "extend": true} },
 	{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^(\\s*(?:>\\s*)*)(#+)(.*?)\\s*#*\\s*$/$1$2$3 $2\n$1/}"}}
 ]
diff --git a/macros/Add Line and Delete Trailing Hashes.sublime-macro b/macros/Add Line and Delete Trailing Hashes.sublime-macro
@@ -1,5 +1,5 @@
 [
-	{"command": "expand_selection", "args": {"to": "line"}},
-	{"command": "move", "args": {"by": "characters", "extend": true, "forward": false}},
+	{"command": "move_to", "args": {"to": "hardbol", "extend": false} },
+	{"command": "move_to", "args": {"to": "hardeol", "extend": true} },
 	{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^(\\s*(?:>\\s*)*)(#+)(.*?)\\s*#*\\s*$/$1$2$3\n$1/}"}}
 ]
diff --git a/macros/Delete Empty Blockquote.sublime-macro b/macros/Delete Empty Blockquote.sublime-macro
@@ -1,5 +1,5 @@
 [
-	{"command": "expand_selection", "args": {"to": "line"}},
-	{"command": "move", "args": {"by": "characters", "extend": true, "forward": false}},
+	{"command": "move_to", "args": {"to": "hardbol", "extend": false} },
+	{"command": "move_to", "args": {"to": "hardeol", "extend": true} },
 	{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^([\\s>]*)>.*/$1/}"}}
 ]
diff --git a/macros/Delete Empty List Item.sublime-macro b/macros/Delete Empty List Item.sublime-macro
@@ -1,5 +1,5 @@
 [
-	{"command": "expand_selection", "args": {"to": "line"}},
-	{"command": "move", "args": {"by": "characters", "extend": true, "forward": false}},
+	{"command": "move_to", "args": {"to": "hardbol", "extend": false} },
+	{"command": "move_to", "args": {"to": "hardeol", "extend": true} },
 	{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^([\\s>]*).*/$1/}"}}
 ]
diff --git a/macros/Terminate Empty Blockquote.sublime-macro b/macros/Terminate Empty Blockquote.sublime-macro
@@ -1,5 +1,5 @@
 [
-	{"command": "expand_selection", "args": {"to": "line"}},
-	{"command": "move", "args": {"by": "characters", "extend": true, "forward": false}},
-	{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^(\\s*).*/\n$1/}"}}
+	{"command": "move_to", "args": {"to": "hardbol", "extend": false} },
+	{"command": "move_to", "args": {"to": "hardeol", "extend": true} },
+	{"command": "insert_snippet", "args": {"contents": "${TM_SELECTED_TEXT/^(\\s*).*$/\n$1/}"}}
 ]
diff --git a/messages.json b/messages.json
@@ -31,5 +31,6 @@
 	"3.0.2": "messages/3.0.2.md",
 	"3.0.3": "messages/3.0.3.md",
 	"3.0.4": "messages/3.0.4.md",
-	"3.0.5": "messages/3.0.5.md"
+	"3.0.5": "messages/3.0.5.md",
+	"3.0.6": "messages/3.0.6.md"
 }
diff --git a/messages/3.0.6.md b/messages/3.0.6.md
@@ -0,0 +1,11 @@
+# MarkdownEditing 3.0.6 Changelog
+
+Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
+feedback you can use [GitHub issues][issues].
+
+## Bug Fixes
+
+* Recently changed macros work on end of file again (fixes #653)
+* Enable terminate block quote for non-list items
+
+[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues