Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ST4 next #770

Merged
merged 4 commits into from
Jul 26, 2024
Merged

ST4 next #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c7a05f
Syntax: Improve shell line continuation
deathaxe Jul 25, 2024
8c46c32
Syntax: Fix utf-8 incompatible character
deathaxe Jul 26, 2024
f1e0581
Scheme: Add highlighting rules for ==highlight==
deathaxe Jul 26, 2024
94add27
Merge branch 'st3-develop' into st4-develop
deathaxe Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions schemes/MarkdownEditor-ArcDark.sublime-color-scheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions schemes/MarkdownEditor-Dark.sublime-color-scheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions schemes/MarkdownEditor-Focus.sublime-color-scheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions schemes/MarkdownEditor-Yellow.sublime-color-scheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions schemes/MarkdownEditor.sublime-color-scheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion syntaxes/Markdown.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 don’t 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
Expand Down
10 changes: 9 additions & 1 deletion syntaxes/Shell (for Markdown).sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ contexts:
- match: ^\s*(>)\s
captures:
1: comment.other.shell
scope: comment.other.shell

main:
- match: ^(?=\s*\$\s)
Expand All @@ -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
4 changes: 2 additions & 2 deletions tests/syntax_test_markdown.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down Expand Up @@ -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
Expand Down
Loading