Merge branch 'st3-develop' into st4-develop

SublimeText-Markdown · Mar 30, 2022 · 073708a · 073708a
2 parents fbcf6ef + 0c8d7f5
commit 073708a
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 10 deletions.
diff --git a/messages/3.1.2.md b/messages/3.1.2.md
@@ -13,4 +13,6 @@ feedback you can use [GitHub issues][issues].
 
 ## Changes
 
+* MardownEditings color schemes now underline link urls (fixes #685)
+
 [issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues
diff --git a/schemes/MarkdownEditor-ArcDark.sublime-color-scheme b/schemes/MarkdownEditor-ArcDark.sublime-color-scheme
@@ -265,9 +265,19 @@
 			"scope": "markup.underline.link, constant.other.reference.link",
 			"foreground": "#555555"
 		},
+		{
+			"name": "Markdown: Link URL Separators",
+			"scope": "markup.underline.link punctuation.separator",
+			"foreground": "#555555"
+		},
 		{
 			"name": "Markup: Plain Link",
-			"scope": "meta.link.inet markup.underline.link, meta.link.email.lt-gt markup.underline.link",
+			"scope": "meta.link.inet markup.underline.link, meta.link.email markup.underline.link",
+			"foreground": "#bbbb77"
+		},
+		{
+			"name": "Markdown: Plain Link Separators",
+			"scope": "meta.link.inet markup.underline.link punctuation.separator, meta.link.email markup.underline.link punctuation.separator",
 			"foreground": "#bbbb77"
 		},
 		{
@@ -350,6 +360,11 @@
 			"scope": "markup.strikethrough markup.kbd.content",
 			"foreground": "#484848"
 		},
+		{
+			"name": "Markdown: Underline",
+			"scope": "markup.underline",
+			"font_style": "underline"
+		},
 
 		//
 		// Markups

diff --git a/schemes/MarkdownEditor-Dark.sublime-color-scheme b/schemes/MarkdownEditor-Dark.sublime-color-scheme
@@ -273,9 +273,19 @@
 			"foreground": "#555555",
 			"background": "#171717"
 		},
+		{
+			"name": "Markdown: Link URL Separators",
+			"scope": "markup.underline.link punctuation.separator",
+			"foreground": "#555555"
+		},
 		{
 			"name": "Markdown: Plain Link",
-			"scope": "meta.link.inet markup.underline.link, meta.link.email.lt-gt markup.underline.link",
+			"scope": "meta.link.inet markup.underline.link, meta.link.email markup.underline.link",
+			"foreground": "#bbbb77"
+		},
+		{
+			"name": "Markdown: Plain Link Separators",
+			"scope": "meta.link.inet markup.underline.link punctuation.separator, meta.link.email markup.underline.link punctuation.separator",
 			"foreground": "#bbbb77"
 		},
 		{
@@ -362,6 +372,11 @@
 			"foreground": "#484848",
 			"background": "#222222"
 		},
+		{
+			"name": "Markdown: Underline",
+			"scope": "markup.underline",
+			"font_style": "underline"
+		},
 
 		//
 		// Markups

diff --git a/schemes/MarkdownEditor-Focus.sublime-color-scheme b/schemes/MarkdownEditor-Focus.sublime-color-scheme
@@ -294,9 +294,19 @@
 			"scope": "markup.underline.link, constant.other.reference.link",
 			"foreground": "#AAAAAA"
 		},
+		{
+			"name": "Markdown: Link URL Separators",
+			"scope": "markup.underline.link punctuation.separator",
+			"foreground": "#AAAAAA"
+		},
 		{
 			"name": "Markdown: Plain Link",
-			"scope": "meta.link.inet markup.underline.link, meta.link.email.lt-gt markup.underline.link",
+			"scope": "meta.link.inet markup.underline.link, meta.link.email markup.underline.link",
+			"foreground": "#444488"
+		},
+		{
+			"name": "Markdown: Plain Link Separators",
+			"scope": "meta.link.inet markup.underline.link punctuation.separator, meta.link.email markup.underline.link punctuation.separator",
 			"foreground": "#444488"
 		},
 		{
@@ -381,6 +391,11 @@
 			"foreground": "#aaaaaa",
 			"background": "#cccccc"
 		},
+		{
+			"name": "Markdown: Underline",
+			"scope": "markup.underline",
+			"font_style": "underline"
+		},
 
 		//
 		// Markups

diff --git a/schemes/MarkdownEditor-Yellow.sublime-color-scheme b/schemes/MarkdownEditor-Yellow.sublime-color-scheme
@@ -271,9 +271,19 @@
 			"scope": "markup.underline.link, constant.other.reference.link",
 			"foreground": "#b7a884"
 		},
+		{
+			"name": "Markdown: Link URL Separators",
+			"scope": "markup.underline.link punctuation.separator",
+			"foreground": "#b7a884"
+		},
 		{
 			"name": "Markdown: Plain Link",
-			"scope": "meta.link.inet markup.underline.link, meta.link.email.lt-gt markup.underline.link",
+			"scope": "meta.link.inet markup.underline.link, meta.link.email markup.underline.link",
+			"foreground": "#624369"
+		},
+		{
+			"name": "Markdown: Plain Link Separators",
+			"scope": "meta.link.inet markup.underline.link punctuation.separator, meta.link.email markup.underline.link punctuation.separator",
 			"foreground": "#624369"
 		},
 		{
@@ -360,6 +370,11 @@
 			"foreground": "#c2b58e",
 			"background": "#e2daab"
 		},
+		{
+			"name": "Markdown: Underline",
+			"scope": "markup.underline",
+			"font_style": "underline"
+		},
 
 		//
 		// Markups

diff --git a/schemes/MarkdownEditor.sublime-color-scheme b/schemes/MarkdownEditor.sublime-color-scheme
@@ -271,9 +271,19 @@
 			"scope": "markup.underline.link, constant.other.reference.link",
 			"foreground": "#AAAAAA"
 		},
+		{
+			"name": "Markdown: Link URL Separators",
+			"scope": "markup.underline.link punctuation.separator",
+			"foreground": "#AAAAAA"
+		},
 		{
 			"name": "Markdown: Plain Link",
-			"scope": "meta.link.inet markup.underline.link, meta.link.email.lt-gt markup.underline.link",
+			"scope": "meta.link.inet markup.underline.link, meta.link.email markup.underline.link",
+			"foreground": "#444488"
+		},
+		{
+			"name": "Markdown: Plain Link Separators",
+			"scope": "meta.link.inet markup.underline.link punctuation.separator, meta.link.email markup.underline.link punctuation.separator",
 			"foreground": "#444488"
 		},
 		{
@@ -359,6 +369,11 @@
 			"foreground": "#B7B7B7",
 			"background": "#E6E6E6"
 		},
+		{
+			"name": "Markdown: Underline",
+			"scope": "markup.underline",
+			"font_style": "underline"
+		},
 
 		//
 		// Markups

diff --git a/syntaxes/Markdown.sublime-syntax b/syntaxes/Markdown.sublime-syntax
@@ -3159,7 +3159,7 @@ contexts:
       scope: punctuation.definition.attributes.end.markdown
       pop: true
     - match: \,
-      scope: punctuation.separator.mapping.pair.markdown
+      scope: punctuation.separator.sequence.markdown
     - match: '{{tag_attribute_name_start}}'
       push: [tag-attr-meta, tag-attr-equals, tag-attr-name]
 

diff --git a/syntaxes/Shell (for Markdown).sublime-syntax b/syntaxes/Shell (for Markdown).sublime-syntax
@@ -11,16 +11,19 @@ contexts:
   prototype:
     - meta_prepend: true
     # continuation lines begin with `> `
-    - match: ^>(?=\s)
+    - match: ^\s*(>)\s
+      captures:
+        1: comment.other.shell
       scope: comment.other.shell
 
   main:
-    - match: ^(?=\$\s)
+    - match: ^(?=\s*\$\s)
       push: shell-interactive
     - include: statements
 
   shell-interactive:
-    - match: ^\$(?=\s)
-      scope: comment.other.shell
+    - match: ^\s*(\$)(?=\s)
+      captures:
+        1: comment.other.shell
       embed: statements
       escape: (?<![^\\]\\)(?<![\\]{3})\n
diff --git a/tests/syntax_test_markdown.md b/tests/syntax_test_markdown.md
@@ -1965,6 +1965,13 @@ function foo () {}
 | <- meta.code-fence.definition.end.shell.markdown-gfm punctuation.definition.raw.code-fence.end.markdown
 |^^ meta.code-fence.definition.end.shell.markdown-gfm punctuation.definition.raw.code-fence.end.markdown
 
+   ```shell
+   $ ls
+|  ^^^^^ markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown
+|  ^ comment.other.shell
+|    ^^ meta.function-call.identifier.shell variable.function.shell
+   ```
+
 ```shell-script
 
 | <- markup.raw.code-fence.shell-script.markdown-gfm source.shell.bash
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,6 @@ feedback you can use [GitHub issues][issues].

		## Changes

		* MardownEditings color schemes now underline link urls (fixes #685)

		[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues