Skip to content

Commit 7248a0b

Browse files
chore: update grammars and themes
1 parent 9f79f99 commit 7248a0b

File tree

3 files changed

+106
-42
lines changed

3 files changed

+106
-42
lines changed

latest-shiki-commit.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dc39773b566d250468f6605d493d67c62e34e1c8
1+
0926238bae6cb54962cfe6cd10e41b666b654cc4

vendor/phiki/phiki/resources/languages/apex.json

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -992,16 +992,26 @@
992992
]
993993
},
994994
"implements-class": {
995-
"begin": "(implements)\\b\\s+([_[:alpha:]][_[:alnum:]]*)",
995+
"begin": "(implements)\\b",
996996
"beginCaptures": {
997997
"1": {
998998
"name": "keyword.other.implements.apex"
999-
},
1000-
"2": {
1001-
"name": "entity.name.type.implements.apex"
1002999
}
10031000
},
1004-
"end": "(?=\\{|extends)"
1001+
"end": "(?=\\{|extends)",
1002+
"patterns": [
1003+
{
1004+
"captures": {
1005+
"1": {
1006+
"name": "entity.name.type.implements.apex"
1007+
},
1008+
"2": {
1009+
"name": "punctuation.separator.comma.apex"
1010+
}
1011+
},
1012+
"match": "([_[:alpha:]][_[:alnum:]]*)\\b\\s*(,)?"
1013+
}
1014+
]
10051015
},
10061016
"indexer-declaration": {
10071017
"begin": "(?<return_type>(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<indexer_name>this)\\s*(?=\\[)",
@@ -2365,7 +2375,7 @@
23652375
]
23662376
},
23672377
"switch-statement": {
2368-
"begin": "(switch)\\b\\s+(on)\\b\\s+(?:(['().?_[:alnum:]]+)\\s*)?(\\{)",
2378+
"begin": "(switch)\\b\\s+(on)\\b\\s+(.*)(\\{)",
23692379
"beginCaptures": {
23702380
"1": {
23712381
"name": "keyword.control.switch.apex"
@@ -2940,19 +2950,20 @@
29402950
]
29412951
},
29422952
"when-string": {
2943-
"begin": "(when)\\b(\\s*)((')['*,._\\s[:alnum:]]+)",
2953+
"begin": "(when)\\b\\s*('[^\\n']*')(,)?",
29442954
"beginCaptures": {
29452955
"1": {
29462956
"name": "keyword.control.switch.when.apex"
29472957
},
29482958
"2": {
2949-
"name": "punctuation.whitespace.apex"
2959+
"patterns": [
2960+
{
2961+
"include": "#string-literal"
2962+
}
2963+
]
29502964
},
29512965
"3": {
29522966
"patterns": [
2953-
{
2954-
"include": "#when-string-statement"
2955-
},
29562967
{
29572968
"include": "#punctuation-comma"
29582969
}
@@ -2969,25 +2980,6 @@
29692980
}
29702981
]
29712982
},
2972-
"when-string-statement": {
2973-
"patterns": [
2974-
{
2975-
"begin": "'",
2976-
"beginCaptures": {
2977-
"0": {
2978-
"name": "punctuation.definition.string.begin.apex"
2979-
}
2980-
},
2981-
"end": "'",
2982-
"endCaptures": {
2983-
"0": {
2984-
"name": "punctuation.definition.string.end.apex"
2985-
}
2986-
},
2987-
"name": "string.quoted.single.apex"
2988-
}
2989-
]
2990-
},
29912983
"where-clause": {
29922984
"captures": {
29932985
"1": {

vendor/phiki/phiki/resources/languages/bicep.json

Lines changed: 83 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,13 @@
8282
"include": "#string-literal"
8383
},
8484
{
85-
"include": "#string-verbatim"
85+
"include": "#multiline-string"
86+
},
87+
{
88+
"include": "#multiline-string-1-interp"
89+
},
90+
{
91+
"include": "#multiline-string-2-interp"
8692
},
8793
{
8894
"include": "#numeric-literal"
@@ -164,6 +170,79 @@
164170
"match": "//.*(?=$)",
165171
"name": "comment.line.double-slash.bicep"
166172
},
173+
"multiline-1-string-subst": {
174+
"begin": "(\\$\\{)",
175+
"beginCaptures": {
176+
"1": {
177+
"name": "punctuation.definition.template-expression.begin.bicep"
178+
}
179+
},
180+
"end": "(})",
181+
"endCaptures": {
182+
"1": {
183+
"name": "punctuation.definition.template-expression.end.bicep"
184+
}
185+
},
186+
"name": "meta.multiline-1-string-subst.bicep",
187+
"patterns": [
188+
{
189+
"include": "#expression"
190+
},
191+
{
192+
"include": "#comments"
193+
}
194+
]
195+
},
196+
"multiline-2-string-subst": {
197+
"begin": "(\\$\\$\\{)",
198+
"beginCaptures": {
199+
"1": {
200+
"name": "punctuation.definition.template-expression.begin.bicep"
201+
}
202+
},
203+
"end": "(})",
204+
"endCaptures": {
205+
"1": {
206+
"name": "punctuation.definition.template-expression.end.bicep"
207+
}
208+
},
209+
"name": "meta.multiline-2-string-subst.bicep",
210+
"patterns": [
211+
{
212+
"include": "#expression"
213+
},
214+
{
215+
"include": "#comments"
216+
}
217+
]
218+
},
219+
"multiline-string": {
220+
"begin": "'''",
221+
"end": "'''(?!')",
222+
"name": "string.quoted.multi.bicep",
223+
"patterns": [
224+
]
225+
},
226+
"multiline-string-1-interp": {
227+
"begin": "(?<!\\$)\\$'''",
228+
"end": "'''(?!')",
229+
"name": "string.quoted.multi.bicep",
230+
"patterns": [
231+
{
232+
"include": "#multiline-1-string-subst"
233+
}
234+
]
235+
},
236+
"multiline-string-2-interp": {
237+
"begin": "\\$\\$'''",
238+
"end": "'''(?!')",
239+
"name": "string.quoted.multi.bicep",
240+
"patterns": [
241+
{
242+
"include": "#multiline-2-string-subst"
243+
}
244+
]
245+
},
167246
"named-literal": {
168247
"match": "\\b(true|false|null)\\b",
169248
"name": "constant.language.bicep"
@@ -201,11 +280,11 @@
201280
"include": "#escape-character"
202281
},
203282
{
204-
"include": "#string-literal-subst"
283+
"include": "#string-subst"
205284
}
206285
]
207286
},
208-
"string-literal-subst": {
287+
"string-subst": {
209288
"begin": "(?<!\\\\)(\\$\\{)",
210289
"beginCaptures": {
211290
"1": {
@@ -218,7 +297,7 @@
218297
"name": "punctuation.definition.template-expression.end.bicep"
219298
}
220299
},
221-
"name": "meta.string-literal-subst.bicep",
300+
"name": "meta.string-subst.bicep",
222301
"patterns": [
223302
{
224303
"include": "#expression"
@@ -227,13 +306,6 @@
227306
"include": "#comments"
228307
}
229308
]
230-
},
231-
"string-verbatim": {
232-
"begin": "'''",
233-
"end": "'''(?!')",
234-
"name": "string.quoted.multi.bicep",
235-
"patterns": [
236-
]
237309
}
238310
},
239311
"scopeName": "source.bicep"

0 commit comments

Comments
 (0)