From b5251b2e5c86e5b9b027421a2c42b31f6b10d699 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Sun, 20 Feb 2022 18:11:40 +0100 Subject: [PATCH 01/11] Changelog: Prepare for 3.1.2 --- messages.json | 3 ++- messages/3.1.2.md | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 messages/3.1.2.md diff --git a/messages.json b/messages.json index 628d9e8d..aa51b540 100644 --- a/messages.json +++ b/messages.json @@ -35,5 +35,6 @@ "3.0.6": "messages/3.0.6.md", "3.0.7": "messages/3.0.7.md", "3.1.0": "messages/3.1.0.md", - "3.1.1": "messages/3.1.1.md" + "3.1.1": "messages/3.1.1.md", + "3.1.2": "messages/3.1.2.md" } diff --git a/messages/3.1.2.md b/messages/3.1.2.md new file mode 100644 index 00000000..486be9f4 --- /dev/null +++ b/messages/3.1.2.md @@ -0,0 +1,12 @@ +# MarkdownEditing 3.1.2 Changelog + +Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of +feedback you can use [GitHub issues][issues]. + +## Bug Fixes + +## New Features + +## Changes + +[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues From 8e78fe6c8924f95cf9740dbaf1453d8543f52741 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Mon, 24 Jan 2022 17:49:24 +0100 Subject: [PATCH 02/11] Colors: Improve strikethrough visibility with line_highlight --- messages/3.1.2.md | 2 ++ schemes/Mariana.sublime-color-scheme | 2 +- schemes/Monokai.sublime-color-scheme | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/messages/3.1.2.md b/messages/3.1.2.md index 486be9f4..c1643189 100644 --- a/messages/3.1.2.md +++ b/messages/3.1.2.md @@ -5,6 +5,8 @@ feedback you can use [GitHub issues][issues]. ## Bug Fixes +* fix strikethrough visibility with `line_highlight` + ## New Features ## Changes diff --git a/schemes/Mariana.sublime-color-scheme b/schemes/Mariana.sublime-color-scheme index e3b1dd2b..063cd7a4 100644 --- a/schemes/Mariana.sublime-color-scheme +++ b/schemes/Mariana.sublime-color-scheme @@ -63,7 +63,7 @@ { "name": "Markdown: Striked Punctuations", "scope": "text.html.markdown markup.strikethrough & (punctuation.definition | punctuation.separator | punctuation.definition.strikethrough | punctuation.definition.constant | punctuation.definition.image | punctuation.definition.link | punctuation.definition.metadata | markup.bold punctuation.definition.bold | markup.italic punctuation.definition.italic | string punctuation.definition.string)", - "foreground": "var(blue2)", + "foreground": "var(blue6)", "font_style": "" }, { diff --git a/schemes/Monokai.sublime-color-scheme b/schemes/Monokai.sublime-color-scheme index 4f3684fd..6d253ad1 100644 --- a/schemes/Monokai.sublime-color-scheme +++ b/schemes/Monokai.sublime-color-scheme @@ -57,19 +57,19 @@ { "name": "Markdown: Striked Content", "scope": "text.html.markdown markup.strikethrough, text.html.markdown markup.strikethrough string", - "foreground": "var(grey)", + "foreground": "var(yellow5)", "font_style": "" }, { "name": "Markdown: Striked Punctuations", "scope": "text.html.markdown markup.strikethrough & (punctuation.definition | punctuation.separator | punctuation.definition.strikethrough | punctuation.definition.constant | punctuation.definition.image | punctuation.definition.link | punctuation.definition.metadata | punctuation.definition.bold | punctuation.definition.italic | punctuation.definition.string)", - "foreground": "var(grey)", + "foreground": "var(yellow5)", "font_style": "" }, { "name": "Markdown: Striked URLs", "scope": "text.html.markdown markup.strikethrough & (markup.underline.link.markdown | markup.underline.link.image.markdown)", - "foreground": "var(grey)" + "foreground": "var(yellow5)", }, { "name": "Markdown: Hard Line Breaks", From 470873e722d612e6c136dcab98b27b960d1c6ee9 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Sun, 30 Jan 2022 13:46:18 +0100 Subject: [PATCH 03/11] CI: Update black 22.1.0 --- plugins/references.py | 1 - tests/requirements.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/references.py b/plugins/references.py index 29bd0096..76cced0e 100644 --- a/plugins/references.py +++ b/plugins/references.py @@ -932,7 +932,6 @@ def on_query_completions(self, _, locations): sublime.INHIBIT_WORD_COMPLETIONS | sublime.INHIBIT_EXPLICIT_COMPLETIONS, ) - else: class MdeReferenceCompletionsProvider(MdeViewEventListener): diff --git a/tests/requirements.txt b/tests/requirements.txt index 90f454f2..51ee8a6b 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -6,4 +6,4 @@ mccabe == 0.6.1 ; python_version == '3.8' pycodestyle == 2.7.0 ; python_version == '3.8' pyflakes == 2.3.1 ; python_version == '3.8' flake8 == 3.9.2 ; python_version == '3.8' -black == 21.5b1 ; python_version == '3.8' +black == 22.1.0 ; python_version == '3.8' From 2e378106287731d8a00e66c6ef8bd930bf839877 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Wed, 9 Feb 2022 18:55:07 +0100 Subject: [PATCH 04/11] Fix: Hide Symbols in fenced code blocks This commit fixes the selector to hide symbols in fenced code blocks. It's required due to recent syntax definition changes. --- messages/3.1.2.md | 1 + syntaxes/Symbol List - Hide.tmPreferences | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/messages/3.1.2.md b/messages/3.1.2.md index c1643189..bb012325 100644 --- a/messages/3.1.2.md +++ b/messages/3.1.2.md @@ -6,6 +6,7 @@ feedback you can use [GitHub issues][issues]. ## Bug Fixes * fix strikethrough visibility with `line_highlight` +* don't add symbols of fenced code blocks to symbol list ## New Features diff --git a/syntaxes/Symbol List - Hide.tmPreferences b/syntaxes/Symbol List - Hide.tmPreferences index 08321d7b..e4be6ddf 100644 --- a/syntaxes/Symbol List - Hide.tmPreferences +++ b/syntaxes/Symbol List - Hide.tmPreferences @@ -3,7 +3,7 @@ scope - text.html.markdown markup.raw.block.fenced.markdown, text.html.markdown meta.toc-list.id + text.html.markdown markup.raw.code-fence, text.html.markdown meta.toc-list.id settings showInSymbolList From c3169b492e7660515d720fb523aac4421e1b845a Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Wed, 16 Feb 2022 21:18:47 +0100 Subject: [PATCH 05/11] Syntax: Add interactive unix shell support in fenced code blocks It seems common practice to treat `shell` code blocks as interactive shell. Means each line starting with `$` is treated as shell command, while other lines denote output only, which may not be highlighted. --- messages/3.1.2.md | 1 + syntaxes/Markdown.sublime-syntax | 20 +++++++++++- syntaxes/Shell (for Markdown).sublime-syntax | 25 +++++++++++++++ tests/syntax_test_markdown.md | 32 ++++++++++++++++++-- 4 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 syntaxes/Shell (for Markdown).sublime-syntax diff --git a/messages/3.1.2.md b/messages/3.1.2.md index bb012325..09887a2c 100644 --- a/messages/3.1.2.md +++ b/messages/3.1.2.md @@ -7,6 +7,7 @@ feedback you can use [GitHub issues][issues]. * fix strikethrough visibility with `line_highlight` * don't add symbols of fenced code blocks to symbol list +* fix interactive shell highlighting in fenced code blocks ## New Features diff --git a/syntaxes/Markdown.sublime-syntax b/syntaxes/Markdown.sublime-syntax index 619ed512..80f4ad8f 100644 --- a/syntaxes/Markdown.sublime-syntax +++ b/syntaxes/Markdown.sublime-syntax @@ -914,6 +914,7 @@ contexts: - include: fenced-ruby - include: fenced-rust - include: fenced-scala + - include: fenced-shell - include: fenced-shell-script - include: fenced-sql - include: fenced-tsx @@ -1531,11 +1532,28 @@ contexts: 0: meta.code-fence.definition.end.scala.markdown-gfm 1: punctuation.definition.raw.code-fence.end.markdown + fenced-shell: + - match: |- + (?x) + {{fenced_code_block_start}} + ((?i:console|shell)) + {{fenced_code_block_trailing_infostring_characters}} + captures: + 0: meta.code-fence.definition.begin.shell.markdown-gfm + 2: punctuation.definition.raw.code-fence.begin.markdown + 5: constant.other.language-name.markdown + embed: scope:source.shell.interactive.markdown + embed_scope: markup.raw.code-fence.shell.markdown-gfm + escape: '{{fenced_code_block_escape}}' + escape_captures: + 0: meta.code-fence.definition.end.shell.markdown-gfm + 1: punctuation.definition.raw.code-fence.end.markdown + fenced-shell-script: - match: |- (?x) {{fenced_code_block_start}} - ((?i:console|shell(?:-script)?|sh|bash|zsh)) + ((?i:shell-script|sh|bash|zsh)) {{fenced_code_block_trailing_infostring_characters}} captures: 0: meta.code-fence.definition.begin.shell-script.markdown-gfm diff --git a/syntaxes/Shell (for Markdown).sublime-syntax b/syntaxes/Shell (for Markdown).sublime-syntax new file mode 100644 index 00000000..74443cd4 --- /dev/null +++ b/syntaxes/Shell (for Markdown).sublime-syntax @@ -0,0 +1,25 @@ +%YAML 1.2 +--- +name: Interactive Unix Shell +scope: source.shell.interactive.markdown +hidden: true + +contexts: + main: + - match: ^(?=\$\s) + push: shell-interactive + - include: shell-statements + + shell-interactive: + - match: ^\$(?=\s) + scope: comment.other.shell + push: shell-statements + with_prototype: + # continuation lines begin with `> ` + - match: ^>(?=\s) + scope: comment.other.shell + - match: ^ + pop: true + + shell-statements: + - include: scope:source.shell diff --git a/tests/syntax_test_markdown.md b/tests/syntax_test_markdown.md index 50a02c84..3414555b 100644 --- a/tests/syntax_test_markdown.md +++ b/tests/syntax_test_markdown.md @@ -1690,11 +1690,37 @@ unclosed_paren = ( |^^ meta.code-fence.definition.end.shell-script.markdown-gfm punctuation.definition.raw.code-fence.end.markdown ```shell +function foo () { +| <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown meta.function.shell storage.type +} +| <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown meta.function.shell punctuation.section -| <- markup.raw.code-fence.shell-script.markdown-gfm source.shell.bash +$ ls ~ +| <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive comment.other.shell +| ^^ meta.function-call.shell variable.function.shell +| ^^ meta.function-call.arguments.shell + +output.txt +| <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive - meta.function-call - variable +|^^^^^^^^^ markup.raw.code-fence.shell.markdown-gfm source.shell.interactive - meta.function-call - variable + +$ ls \ +> /foo/ +| <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown comment.other.shell +|^^^^^^^ markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown + +$ ls \ +> /foo/ +bar +| <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown - meta.function-call +|^^^ markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown - meta.function-call + +function foo () {} +| <- markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown - meta.function +|^^^^^^^^^^^^^^^^^^ markup.raw.code-fence.shell.markdown-gfm source.shell.interactive.markdown - meta.function ``` -| <- meta.code-fence.definition.end.shell-script.markdown-gfm punctuation.definition.raw.code-fence.end.markdown -|^^ meta.code-fence.definition.end.shell-script.markdown-gfm punctuation.definition.raw.code-fence.end.markdown +| <- 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-script From 0ac2df9c7f9dffef531b7872bda1a61562a61a28 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Sun, 20 Feb 2022 18:09:01 +0100 Subject: [PATCH 06/11] Syntax: ST4 related tweaks of Interactive Shell syntax This commit inherits from Shell-Unix-Generic to scope `>` at bol via `prototype` --- syntaxes/Shell (for Markdown).sublime-syntax | 23 ++++++++++---------- tests/syntax_test_markdown.md | 6 ++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/syntaxes/Shell (for Markdown).sublime-syntax b/syntaxes/Shell (for Markdown).sublime-syntax index 74443cd4..23190627 100644 --- a/syntaxes/Shell (for Markdown).sublime-syntax +++ b/syntaxes/Shell (for Markdown).sublime-syntax @@ -2,24 +2,25 @@ --- name: Interactive Unix Shell scope: source.shell.interactive.markdown +version: 2 hidden: true +extends: Packages/ShellScript/Shell-Unix-Generic.sublime-syntax + contexts: + prototype: + - meta_prepend: true + # continuation lines begin with `> ` + - match: ^>(?=\s) + scope: comment.other.shell + main: - match: ^(?=\$\s) push: shell-interactive - - include: shell-statements + - include: statements shell-interactive: - match: ^\$(?=\s) scope: comment.other.shell - push: shell-statements - with_prototype: - # continuation lines begin with `> ` - - match: ^>(?=\s) - scope: comment.other.shell - - match: ^ - pop: true - - shell-statements: - - include: scope:source.shell + embed: statements + escape: (? Date: Sat, 12 Mar 2022 14:04:57 +0100 Subject: [PATCH 07/11] Syntax: Fix interactive shell in indented code blocks --- syntaxes/Shell (for Markdown).sublime-syntax | 12 +++++++----- tests/syntax_test_markdown.md | 7 +++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/syntaxes/Shell (for Markdown).sublime-syntax b/syntaxes/Shell (for Markdown).sublime-syntax index 74443cd4..5c047bde 100644 --- a/syntaxes/Shell (for Markdown).sublime-syntax +++ b/syntaxes/Shell (for Markdown).sublime-syntax @@ -6,18 +6,20 @@ hidden: true contexts: main: - - match: ^(?=\$\s) + - match: ^(?=\s*\$\s) push: shell-interactive - include: shell-statements shell-interactive: - - match: ^\$(?=\s) - scope: comment.other.shell + - match: ^\s*(\$)(?=\s) + captures: + 1: comment.other.shell push: shell-statements with_prototype: # continuation lines begin with `> ` - - match: ^>(?=\s) - scope: comment.other.shell + - match: ^\s*(>)\s + captures: + 1: comment.other.shell - match: ^ pop: true diff --git a/tests/syntax_test_markdown.md b/tests/syntax_test_markdown.md index 3414555b..484b045e 100644 --- a/tests/syntax_test_markdown.md +++ b/tests/syntax_test_markdown.md @@ -1722,6 +1722,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 From f661ac1f5eb24e454f6f6485789a98f2968d5740 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Sun, 13 Mar 2022 10:54:25 +0100 Subject: [PATCH 08/11] Syntax: Re-scope mapping separators --- syntaxes/Markdown.sublime-syntax | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntaxes/Markdown.sublime-syntax b/syntaxes/Markdown.sublime-syntax index 80f4ad8f..be3a9359 100644 --- a/syntaxes/Markdown.sublime-syntax +++ b/syntaxes/Markdown.sublime-syntax @@ -3140,7 +3140,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] From 758dbd17a51e7d76c4daca683076e596fcc1eba3 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Thu, 24 Mar 2022 17:29:29 +0100 Subject: [PATCH 09/11] Colors: Underline URLs Fixes #685 --- messages/3.1.2.md | 2 ++ schemes/MarkdownEditor-ArcDark.sublime-color-scheme | 5 +++++ schemes/MarkdownEditor-Dark.sublime-color-scheme | 5 +++++ schemes/MarkdownEditor-Focus.sublime-color-scheme | 5 +++++ schemes/MarkdownEditor-Yellow.sublime-color-scheme | 5 +++++ schemes/MarkdownEditor.sublime-color-scheme | 5 +++++ 6 files changed, 27 insertions(+) diff --git a/messages/3.1.2.md b/messages/3.1.2.md index 09887a2c..23afef2e 100644 --- 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 index 137fd3c1..8ccb1c0b 100644 --- a/schemes/MarkdownEditor-ArcDark.sublime-color-scheme +++ b/schemes/MarkdownEditor-ArcDark.sublime-color-scheme @@ -350,6 +350,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 index 16f33ffa..84ffdb28 100644 --- a/schemes/MarkdownEditor-Dark.sublime-color-scheme +++ b/schemes/MarkdownEditor-Dark.sublime-color-scheme @@ -362,6 +362,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 index 1fb80e1c..feef8944 100644 --- a/schemes/MarkdownEditor-Focus.sublime-color-scheme +++ b/schemes/MarkdownEditor-Focus.sublime-color-scheme @@ -381,6 +381,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 index 71f32eef..d212c80a 100644 --- a/schemes/MarkdownEditor-Yellow.sublime-color-scheme +++ b/schemes/MarkdownEditor-Yellow.sublime-color-scheme @@ -360,6 +360,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 index b6cb2669..04890c00 100644 --- a/schemes/MarkdownEditor.sublime-color-scheme +++ b/schemes/MarkdownEditor.sublime-color-scheme @@ -359,6 +359,11 @@ "foreground": "#B7B7B7", "background": "#E6E6E6" }, + { + "name": "Markdown: Underline", + "scope": "markup.underline", + "font_style": "underline" + }, // // Markups From 0c8d7f5828e1cf3a13b58a69e2077a37c8e776e5 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Thu, 24 Mar 2022 17:30:08 +0100 Subject: [PATCH 10/11] Colors: Highlight URL separators with text color --- schemes/MarkdownEditor-ArcDark.sublime-color-scheme | 12 +++++++++++- schemes/MarkdownEditor-Dark.sublime-color-scheme | 12 +++++++++++- schemes/MarkdownEditor-Focus.sublime-color-scheme | 12 +++++++++++- schemes/MarkdownEditor-Yellow.sublime-color-scheme | 12 +++++++++++- schemes/MarkdownEditor.sublime-color-scheme | 12 +++++++++++- 5 files changed, 55 insertions(+), 5 deletions(-) diff --git a/schemes/MarkdownEditor-ArcDark.sublime-color-scheme b/schemes/MarkdownEditor-ArcDark.sublime-color-scheme index 8ccb1c0b..f3676afb 100644 --- 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" }, { diff --git a/schemes/MarkdownEditor-Dark.sublime-color-scheme b/schemes/MarkdownEditor-Dark.sublime-color-scheme index 84ffdb28..ebee93fd 100644 --- 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" }, { diff --git a/schemes/MarkdownEditor-Focus.sublime-color-scheme b/schemes/MarkdownEditor-Focus.sublime-color-scheme index feef8944..da939a68 100644 --- 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" }, { diff --git a/schemes/MarkdownEditor-Yellow.sublime-color-scheme b/schemes/MarkdownEditor-Yellow.sublime-color-scheme index d212c80a..a022bf28 100644 --- 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" }, { diff --git a/schemes/MarkdownEditor.sublime-color-scheme b/schemes/MarkdownEditor.sublime-color-scheme index 04890c00..95ee46db 100644 --- 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" }, { From fbcf6ef8a9e082f3b80a73465dcca5d33be93242 Mon Sep 17 00:00:00 2001 From: DeathAxe Date: Sat, 12 Mar 2022 09:51:17 +0100 Subject: [PATCH 11/11] Syntax: MultiMarkdown extends Markdown --- syntaxes/MultiMarkdown.sublime-syntax | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/syntaxes/MultiMarkdown.sublime-syntax b/syntaxes/MultiMarkdown.sublime-syntax index 5bf6f59f..eeaaf301 100644 --- a/syntaxes/MultiMarkdown.sublime-syntax +++ b/syntaxes/MultiMarkdown.sublime-syntax @@ -3,6 +3,8 @@ name: MultiMarkdown scope: text.html.markdown.multimarkdown +extends: Markdown.sublime-syntax + first_line_match: (?i:^format:\s*complete\s*$) variables: @@ -17,7 +19,7 @@ contexts: multimarkdown-header: - match: ^$ - pop: true + pop: 1 - match: ^(?:{{header}}\s*)? captures: 1: keyword.other.multimarkdown @@ -28,8 +30,8 @@ contexts: - meta_scope: meta.header.multimarkdown - meta_content_scope: string.unquoted.multimarkdown - match: \n - pop: true + pop: 1 multimarkdown-content: - meta_scope: meta.content.multimarkdown - - include: scope:text.html.markdown + - include: markdown