Merge branch 'st4-develop'

deathaxe · deathaxe · commit ddd8822e7fc5 · 2022-09-30T22:06:19.000+02:00
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
@@ -125,7 +125,7 @@
 
 	{ "keys": ["`"], "command": "insert_snippet", "args": {"contents": "`$0`"}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - meta.code-fence - markup.raw - markup.kbd", "match_all": true },
 			{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "preceding_text", "operator": "not_regex_contains", "operand": "[\\w`]$", "match_all": true },
@@ -134,21 +134,21 @@
 	},
 	{ "keys": ["`"], "command": "insert_snippet", "args": {"contents": "`${0:$SELECTION}`"}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - meta.code-fence - markup.raw - markup.kbd", "match_all": true },
 			{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true }
 		]
 	},
 	{ "keys": ["`"], "command": "move", "args": {"by": "characters", "forward": true}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.raw - meta.code-fence - markup.raw.code-fence", "match_all": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true }
 		]
 	},
 	{ "keys": ["backspace"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Left Right.sublime-macro"}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "punctuation.definition.raw.begin.markdown", "match_all": true },
 			{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "preceding_text", "operator": "regex_contains", "operand": "`$", "match_all": true },
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -125,7 +125,7 @@
 
 	{ "keys": ["`"], "command": "insert_snippet", "args": {"contents": "`$0`"}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - meta.code-fence - markup.raw - markup.kbd", "match_all": true },
 			{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "preceding_text", "operator": "not_regex_contains", "operand": "[\\w`]$", "match_all": true },
@@ -134,21 +134,21 @@
 	},
 	{ "keys": ["`"], "command": "insert_snippet", "args": {"contents": "`${0:$SELECTION}`"}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - meta.code-fence - markup.raw - markup.kbd", "match_all": true },
 			{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true }
 		]
 	},
 	{ "keys": ["`"], "command": "move", "args": {"by": "characters", "forward": true}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.raw - meta.code-fence - markup.raw.code-fence", "match_all": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true }
 		]
 	},
 	{ "keys": ["backspace"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Left Right.sublime-macro"}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "punctuation.definition.raw.begin.markdown", "match_all": true },
 			{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "preceding_text", "operator": "regex_contains", "operand": "`$", "match_all": true },
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
@@ -125,7 +125,7 @@
 
 	{ "keys": ["`"], "command": "insert_snippet", "args": {"contents": "`$0`"}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - meta.code-fence - markup.raw - markup.kbd", "match_all": true },
 			{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "preceding_text", "operator": "not_regex_contains", "operand": "[\\w`]$", "match_all": true },
@@ -134,21 +134,21 @@
 	},
 	{ "keys": ["`"], "command": "insert_snippet", "args": {"contents": "`${0:$SELECTION}`"}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - meta.code-fence - markup.raw - markup.kbd", "match_all": true },
 			{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true }
 		]
 	},
 	{ "keys": ["`"], "command": "move", "args": {"by": "characters", "forward": true}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.raw - meta.code-fence - markup.raw.code-fence", "match_all": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true }
 		]
 	},
 	{ "keys": ["backspace"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Left Right.sublime-macro"}, "context":
 		[
-			{ "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },
+			{ "key": "selector", "operator": "equal", "operand": "punctuation.definition.raw.begin.markdown", "match_all": true },
 			{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
 			{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
 			{ "key": "preceding_text", "operator": "regex_contains", "operand": "`$", "match_all": true },
diff --git a/messages.json b/messages.json
@@ -39,5 +39,6 @@
 	"3.1.2": "messages/3.1.2.md",
 	"3.1.3": "messages/3.1.3.md",
 	"3.1.4": "messages/3.1.4.md",
-	"3.1.5": "messages/3.1.5.md"
+	"3.1.5": "messages/3.1.5.md",
+	"3.1.6": "messages/3.1.6.md"
 }
diff --git a/messages/3.1.6.md b/messages/3.1.6.md
@@ -0,0 +1,18 @@
+# MarkdownEditing 3.1.6 Changelog
+
+Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
+feedback you can use [GitHub issues][issues].
+
+## Bug Fixes
+
+* Respect `set_unsaved_view_name` setting (#704)
+* Fix `markup.raw` auto-pairing key bindings (#707)
+* Fix ST freezing due to SETEXT headings with trailing spaces
+
+## New Features
+
+* Add support for Makefile syntax in fenced code blocks
+
+## Changes
+
+[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues
diff --git a/plugins/headings/common.py b/plugins/headings/common.py
@@ -57,7 +57,7 @@ class MdeUnsavedViewNameSetter(MdeViewEventListener):
     MAX_NAME = 50
 
     def on_modified(self):
-        if self.view.file_name() is not None:
+        if self.view.file_name() is not None or not self.view.settings().get("set_unsaved_view_name"):
             return
 
         name = first_heading_text(self.view)
diff --git a/syntaxes/Markdown.sublime-syntax b/syntaxes/Markdown.sublime-syntax
@@ -918,12 +918,24 @@ contexts:
     - include: setext-heading-content
 
   setext-heading-content:
+    - include: setext-hard-line-breaks
     - include: emphasis
     - include: images
     - include: literals
     - include: links
     - include: markups
 
+  setext-hard-line-breaks:
+    # This context consumes what 'hard-line-breaks' does for normal
+    # paragraphs to avoid deadlock of ST's syntax engine.
+    #
+    # as workaround for
+    #    https://github.com/sublimehq/sublime_text/issues/5415
+    # causing
+    #    https://github.com/sublimehq/Packages/issues/3494
+    - match: '[ ]{2,}$'
+    - match: '\\\n'
+
   paragraph:
     # https://spec.commonmark.org/0.30/#paragraphs
     - meta_scope: meta.paragraph.markdown
@@ -983,6 +995,7 @@ contexts:
     - include: fenced-jsx
     - include: fenced-lisp
     - include: fenced-lua
+    - include: fenced-makefile
     - include: fenced-matlab
     - include: fenced-objc
     - include: fenced-objcpp
@@ -1454,6 +1467,25 @@ contexts:
         0: meta.code-fence.definition.end.lua.markdown-gfm
         1: punctuation.definition.raw.code-fence.end.markdown
 
+  fenced-makefile:
+    - match: |-
+         (?x)
+          {{fenced_code_block_start}}
+          ((?i:makefile))
+          {{fenced_code_block_trailing_infostring_characters}}
+      captures:
+        0: meta.code-fence.definition.begin.markdown-gfm
+        2: punctuation.definition.raw.code-fence.begin.markdown
+        5: constant.other.language-name.markdown
+      embed: scope:source.makefile
+      embed_scope:
+        markup.raw.code-fence.makefile.markdown-gfm
+        source.makefile
+      escape: '{{fenced_code_block_escape}}'
+      escape_captures:
+        0: meta.code-fence.definition.end.markdown-gfm
+        1: punctuation.definition.raw.code-fence.end.markdown
+
   fenced-matlab:
     - match: |-
          (?x)
diff --git a/tests/syntax_test_markdown.md b/tests/syntax_test_markdown.md
@@ -1876,6 +1876,13 @@ for (var i = 0; i < 10; i++) {
 | <- meta.code-fence.definition.end.lua.markdown-gfm punctuation.definition.raw.code-fence.end.markdown
 |^^ meta.code-fence.definition.end.lua.markdown-gfm punctuation.definition.raw.code-fence.end.markdown
 
+```makefile
+
+| <- markup.raw.code-fence.makefile.markdown-gfm source.makefile
+```
+| <- meta.code-fence.definition.end.markdown-gfm punctuation.definition.raw.code-fence.end.markdown
+|^^ meta.code-fence.definition.end.markdown-gfm punctuation.definition.raw.code-fence.end.markdown
+
 ```matlab
 
 | <- markup.raw.code-fence.matlab.markdown-gfm source.matlab

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@`
`125`	`125`
`126`	`126`	{ "keys": ["`"], "command": "insert_snippet", "args": {"contents": "`$0`"}, "context":
`127`	`127`	`[`
`128`		`- { "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },`
	`128`	`+ { "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - meta.code-fence - markup.raw - markup.kbd", "match_all": true },`
`129`	`129`	`{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },`
`130`	`130`	`{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },`
`131`	`131`	{ "key": "preceding_text", "operator": "not_regex_contains", "operand": "[\\w`]$", "match_all": true },
`@@ -134,21 +134,21 @@`
`134`	`134`	`},`
`135`	`135`	{ "keys": ["`"], "command": "insert_snippet", "args": {"contents": "`${0:$SELECTION}`"}, "context":
`136`	`136`	`[`
`137`		`- { "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },`
	`137`	`+ { "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - meta.code-fence - markup.raw - markup.kbd", "match_all": true },`
`138`	`138`	`{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },`
`139`	`139`	`{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true }`
`140`	`140`	`]`
`141`	`141`	`},`
`142`	`142`	{ "keys": ["`"], "command": "move", "args": {"by": "characters", "forward": true}, "context":
`143`	`143`	`[`
`144`		`- { "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },`
	`144`	`+ { "key": "selector", "operator": "equal", "operand": "text.html.markdown markup.raw - meta.code-fence - markup.raw.code-fence", "match_all": true },`
`145`	`145`	`{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },`
`146`	`146`	{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true }
`147`	`147`	`]`
`148`	`148`	`},`
`149`	`149`	`{ "keys": ["backspace"], "command": "run_macro_file", "args": {"file": "Packages/Default/Delete Left Right.sublime-macro"}, "context":`
`150`	`150`	`[`
`151`		`- { "key": "selector", "operator": "equal", "operand": "text.html.markdown - meta.frontmatter - meta.disable-markdown - markup.raw - markup.kbd", "match_all": true },`
	`151`	`+ { "key": "selector", "operator": "equal", "operand": "punctuation.definition.raw.begin.markdown", "match_all": true },`
`152`	`152`	`{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },`
`153`	`153`	`{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },`
`154`	`154`	{ "key": "preceding_text", "operator": "regex_contains", "operand": "`$", "match_all": true },
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,6 @@`
`39`	`39`	`"3.1.2": "messages/3.1.2.md",`
`40`	`40`	`"3.1.3": "messages/3.1.3.md",`
`41`	`41`	`"3.1.4": "messages/3.1.4.md",`
`42`		`- "3.1.5": "messages/3.1.5.md"`
	`42`	`+ "3.1.5": "messages/3.1.5.md",`
	`43`	`+ "3.1.6": "messages/3.1.6.md"`
`43`	`44`	`}`