Merge pull request #770 from SublimeText-Markdown/st4-develop

ST4 next
SublimeText-Markdown · Jul 26, 2024 · 1df39dc · 1df39dc
2 parents 88f589f + 94add27
commit 1df39dc
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 4 deletions.
diff --git a/schemes/MarkdownEditor-ArcDark.sublime-color-scheme b/schemes/MarkdownEditor-ArcDark.sublime-color-scheme
@@ -394,6 +394,12 @@
 			"scope": "markup.prompt",
 			"foreground": "#aaaaaa"
 		},
+		{
+			"name": "Markup: Highlight",
+			"scope": "markup.highlight",
+			"foreground": "var(critic_highlight_fg)",
+			"background": "var(critic_highlight_bg)"
+		},
 
 		//
 		// CriticMarkup

diff --git a/schemes/MarkdownEditor-Dark.sublime-color-scheme b/schemes/MarkdownEditor-Dark.sublime-color-scheme
@@ -406,6 +406,12 @@
 			"scope": "markup.prompt",
 			"foreground": "#aaaaaa"
 		},
+		{
+			"name": "Markup: Highlight",
+			"scope": "markup.highlight",
+			"foreground": "var(critic_highlight_fg)",
+			"background": "var(critic_highlight_bg)"
+		},
 
 		//
 		// CriticMarkup

diff --git a/schemes/MarkdownEditor-Focus.sublime-color-scheme b/schemes/MarkdownEditor-Focus.sublime-color-scheme
@@ -425,6 +425,12 @@
 			"scope": "markup.prompt",
 			"foreground": "#555555"
 		},
+		{
+			"name": "Markup: Highlight",
+			"scope": "markup.highlight",
+			"foreground": "var(critic_highlight_fg)",
+			"background": "var(critic_highlight_bg)"
+		},
 
 		//
 		// CriticMarkup

diff --git a/schemes/MarkdownEditor-Yellow.sublime-color-scheme b/schemes/MarkdownEditor-Yellow.sublime-color-scheme
@@ -404,6 +404,12 @@
 			"scope": "markup.prompt",
 			"foreground": "#705442"
 		},
+		{
+			"name": "Markup: Highlight",
+			"scope": "markup.highlight",
+			"foreground": "var(critic_highlight_fg)",
+			"background": "var(critic_highlight_bg)"
+		},
 
 		//
 		// CriticMarkup

diff --git a/schemes/MarkdownEditor.sublime-color-scheme b/schemes/MarkdownEditor.sublime-color-scheme
@@ -403,6 +403,12 @@
 			"scope": "markup.prompt",
 			"foreground": "#555555"
 		},
+		{
+			"name": "Markup: Highlight",
+			"scope": "markup.highlight",
+			"foreground": "var(critic_highlight_fg)",
+			"background": "var(critic_highlight_bg)"
+		},
 
 		//
 		// CriticMarkup

diff --git a/syntaxes/Markdown.sublime-syntax b/syntaxes/Markdown.sublime-syntax
@@ -4016,7 +4016,7 @@ contexts:
     - meta_scope: meta.link.inet.markdown markup.underline.link.markdown-gfm
     # 1. When an autolink ends in ), we scan the entire autolink for the total
     #    number of parentheses. If there is a greater number of closing parentheses
-    #    than opening ones, we dont consider the last character part of the
+    #    than opening ones, we don't consider the last character part of the
     #    autolink, in order to facilitate including an autolink inside a parenthesis
     # 2. If an autolink ends in a semicolon (;), we check to see if it appears to
     #    resemble an entity reference; if the preceding text is & followed by one

diff --git a/syntaxes/Shell (for Markdown).sublime-syntax b/syntaxes/Shell (for Markdown).sublime-syntax
@@ -14,7 +14,6 @@ contexts:
     - match: ^\s*(>)\s
       captures:
         1: comment.other.shell
-      scope: comment.other.shell
 
   main:
     - match: ^(?=\s*\$\s)
@@ -27,3 +26,12 @@ contexts:
         1: comment.other.shell
       embed: statements
       escape: (?<![^\\]\\)(?<![\\]{3})\n
+
+  line-continuation-body:
+    - meta_prepend: true
+    - meta_include_prototype: false
+    # continuation lines begin with `> `
+    - match: ^\s*(>)\s
+      captures:
+        1: comment.other.shell
+      pop: 1
diff --git a/tests/syntax_test_markdown.md b/tests/syntax_test_markdown.md
@@ -1790,7 +1790,7 @@ foo
 # test
 | ^^^^^ source.shell comment.line.number-sign
 echo hello, \
-|           ^^ punctuation.separator.continuation.line
+|           ^ punctuation.separator.continuation.line
 echo This is a smiley :-\) \(I have to escape the parentheses, though!\)
 |                       ^^ constant.character.escape
 ```
@@ -2045,7 +2045,7 @@ unclosed_paren = (
 function foo () {
 | <- markup.raw.code-fence.shell.markdown-gfm meta.function.shell keyword.declaration.function.shell 
 }
-| <- markup.raw.code-fence.shell.markdown-gfm meta.function.shell meta.compound.shell punctuation.section.compound.end.shell
+| <- markup.raw.code-fence.shell.markdown-gfm meta.function.shell punctuation.section
 
 $ ls ~
 | <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive comment.other.shell