Skip to content

Commit de30ae6

Browse files
deathaxedeathaxe
committed
Merge branch 'st4-develop'
2 parents 5153c41 + 21abe39 commit de30ae6

File tree

6 files changed

+81
-44
lines changed

6 files changed

+81
-44
lines changed

‎.github/workflows/ci-syntax-tests.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- 'master'
7-
- 'st3176'
87
paths:
98
- '.github/workflows/ci-syntax-tests.yml'
109
- '**.sublime-syntax'
@@ -28,14 +27,8 @@ jobs:
2827
strategy:
2928
matrix:
3029
include:
31-
- build: 4107
32-
default_packages: v4107
33-
- build: 4126
34-
default_packages: v4126
35-
- build: 4152
36-
default_packages: v4152
37-
- build: 4169
38-
default_packages: v4169
30+
- build: 4200
31+
default_packages: v4200
3932
- build: latest
4033
default_packages: master
4134
steps:

‎make.cmd‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ goto :usage
5252

5353
:RELEASE
5454
if "%2"== "" goto :usage
55+
set version=%2
5556

5657
git checkout master && git merge st4-develop --no-ff
5758
if not errorlevel 0 (
@@ -69,14 +70,28 @@ goto :usage
6970

7071
echo Createing assets for "%package%"...
7172

72-
:: create downloadable asset for ST4134+
73+
:: create tag and download asset for ST4152+
7374
set build=4107
74-
set archive=%package%-%2-st%build%.sublime-package
75+
set branch=st%build%
76+
set tag=%build%-%version%
77+
set archive=%package%-%version%-st%build%.sublime-package
7578
set assets="%archive%#%archive%"
76-
call git archive --format zip -o "%archive%" master
79+
call git push origin %branch%
80+
call git tag -f %tag% %branch%
81+
call git push --force origin %tag%
82+
call git archive --format zip -o "%archive%" %branch%
83+
84+
:: create tag and download asset for ST4200+ (master branch)
85+
set build=4200
86+
set branch=master
87+
set tag=%build%-%version%
88+
set archive=%package%-%version%-st%build%.sublime-package
89+
set assets=%assets% "%archive%#%archive%"
90+
call git push origin %branch%
91+
call git archive --format zip -o "%archive%" %branch%
7792

7893
:: create the release
79-
gh release create --target master -t "%package% %2" "%build%-%2" %assets%
94+
gh release create --target %branch% -t "%package% %version%" "%tag%" %assets%
8095
del /f /q *.sublime-package
8196
git fetch
8297
goto :eof

‎messages/3.4.0.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ feedback you can use [GitHub issues][issues].
1515

1616
- add support for journal files with date and time (#792)
1717
- add support for merge conflict marker highlighting
18-
19-
## Changes
18+
- add support for ZSH syntax highlighting in fenced code blocks (ST4200+)
2019

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

syntaxes/Shell (for Markdown).sublime-syntax renamed to syntaxes/Bash (for Markdown).sublime-syntax

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
%YAML 1.2
22
---
3-
scope: source.shell.embedded.markdown
3+
scope: source.shell.bash.embedded.markdown
44
version: 2
55
hidden: true
66

7-
extends: Packages/ShellScript/Shell-Unix-Generic.sublime-syntax
7+
extends: Packages/ShellScript/Bash.sublime-syntax
88

99
contexts:
1010
main:

‎syntaxes/Markdown.sublime-syntax‎

Lines changed: 48 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,6 +1261,7 @@ contexts:
12611261
- include: fenced-scala
12621262
- include: fenced-shell
12631263
- include: fenced-sql
1264+
- include: fenced-toml
12641265
- include: fenced-tsx
12651266
- include: fenced-typescript
12661267
- include: fenced-xml
@@ -1293,7 +1294,6 @@ contexts:
12931294
- include: fenced-svelte
12941295
- include: fenced-swift
12951296
- include: fenced-terraform
1296-
- include: fenced-toml
12971297
- include: fenced-twee
12981298
- include: fenced-twig
12991299
- include: fenced-verilog
@@ -2156,19 +2156,40 @@ contexts:
21562156
- match: |-
21572157
(?x)
21582158
{{fenced_code_block_start}}
2159-
(?i:\s*(console|bash|shell(?:-script)?|sh)|zsh)
2159+
(?i:\s*(console|bash|shell(?:-script)?|sh))
21602160
{{fenced_code_block_trailing_infostring_characters}}
21612161
captures:
21622162
0: meta.code-fence.definition.begin.markdown-gfm
21632163
2: punctuation.definition.raw.code-fence.begin.markdown
21642164
5: constant.other.language-name.markdown
21652165
6: comment.line.infostring.markdown
21662166
7: meta.fold.code-fence.begin.markdown
2167-
embed: scope:source.shell.embedded.markdown
2167+
embed: scope:source.shell.bash.embedded.markdown
21682168
embed_scope:
21692169
meta.code-fence.body.markdown-gfm
21702170
markup.raw.code-fence.shell.markdown-gfm
2171-
source.shell
2171+
source.shell.bash
2172+
escape: '{{fenced_code_block_escape}}'
2173+
escape_captures:
2174+
0: meta.code-fence.definition.end.markdown-gfm
2175+
1: punctuation.definition.raw.code-fence.end.markdown
2176+
2: meta.fold.code-fence.end.markdown
2177+
- match: |-
2178+
(?x)
2179+
{{fenced_code_block_start}}
2180+
(?i:\s*(zsh))
2181+
{{fenced_code_block_trailing_infostring_characters}}
2182+
captures:
2183+
0: meta.code-fence.definition.begin.markdown-gfm
2184+
2: punctuation.definition.raw.code-fence.begin.markdown
2185+
5: constant.other.language-name.markdown
2186+
6: comment.line.infostring.markdown
2187+
7: meta.fold.code-fence.begin.markdown
2188+
embed: scope:source.shell.zsh.embedded.markdown
2189+
embed_scope:
2190+
meta.code-fence.body.markdown-gfm
2191+
markup.raw.code-fence.shell.markdown-gfm
2192+
source.shell.zsh
21722193
escape: '{{fenced_code_block_escape}}'
21732194
escape_captures:
21742195
0: meta.code-fence.definition.end.markdown-gfm
@@ -2198,6 +2219,29 @@ contexts:
21982219
1: punctuation.definition.raw.code-fence.end.markdown
21992220
2: meta.fold.code-fence.end.markdown
22002221
2222+
fenced-toml:
2223+
- match: |-
2224+
(?x)
2225+
{{fenced_code_block_start}}
2226+
(?i:\s*(toml))
2227+
{{fenced_code_block_trailing_infostring_characters}}
2228+
captures:
2229+
0: meta.code-fence.definition.begin.markdown-gfm
2230+
2: punctuation.definition.raw.code-fence.begin.markdown
2231+
5: constant.other.language-name.markdown
2232+
6: comment.line.infostring.markdown
2233+
7: meta.fold.code-fence.begin.markdown
2234+
embed: scope:source.toml
2235+
embed_scope:
2236+
meta.code-fence.body.markdown-gfm
2237+
markup.raw.code-fence.toml.markdown-gfm
2238+
source.toml
2239+
escape: '{{fenced_code_block_escape}}'
2240+
escape_captures:
2241+
0: meta.code-fence.definition.end.markdown-gfm
2242+
1: punctuation.definition.raw.code-fence.end.markdown
2243+
2: meta.fold.code-fence.end.markdown
2244+
22012245
fenced-tsx:
22022246
- match: |-
22032247
(?x)
@@ -2933,29 +2977,6 @@ contexts:
29332977
1: punctuation.definition.raw.code-fence.end.markdown
29342978
2: meta.fold.code-fence.end.markdown
29352979
2936-
fenced-toml:
2937-
- match: |-
2938-
(?x)
2939-
{{fenced_code_block_start}}
2940-
(?i:\s*(toml))
2941-
{{fenced_code_block_trailing_infostring_characters}}
2942-
captures:
2943-
0: meta.code-fence.definition.begin.markdown-gfm
2944-
2: punctuation.definition.raw.code-fence.begin.markdown
2945-
5: constant.other.language-name.markdown
2946-
6: comment.line.infostring.markdown
2947-
7: meta.fold.code-fence.begin.markdown
2948-
embed: scope:source.toml
2949-
embed_scope:
2950-
meta.code-fence.body.markdown-gfm
2951-
markup.raw.code-fence.toml.markdown-gfm
2952-
source.toml
2953-
escape: '{{fenced_code_block_escape}}'
2954-
escape_captures:
2955-
0: meta.code-fence.definition.end.markdown-gfm
2956-
1: punctuation.definition.raw.code-fence.end.markdown
2957-
2: meta.fold.code-fence.end.markdown
2958-
29592980
fenced-twee:
29602981
- match: |-
29612982
(?x)

‎syntaxes/Zsh (for Markdown).sublime-syntax‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
%YAML 1.2
2+
---
3+
scope: source.shell.zsh.embedded.markdown
4+
version: 2
5+
hidden: true
6+
7+
extends:
8+
- Bash (for Markdown).sublime-syntax
9+
- Packages/ShellScript/Zsh.sublime-syntax

0 commit comments

Comments
 (0)