Skip to content

Commit 677d606

Browse files
authored
Update TextMate grammars used in tests, and baselines (#8819)
2 parents a8c8f97 + bb15a8e commit 677d606

File tree

4 files changed

+1543
-820
lines changed

4 files changed

+1543
-820
lines changed

test/razor/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/JavaScript.tmLanguage.json

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/8c7482b94b548eab56da64dbfb30b82589b3f747",
7+
"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/48f608692aa6d6ad7bd65b478187906c798234a8",
88
"name": "JavaScript (with React support)",
99
"scopeName": "source.js",
1010
"patterns": [
@@ -2351,12 +2351,15 @@
23512351
]
23522352
},
23532353
"import-export-assert-clause": {
2354-
"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(assert)\\s*(\\{)",
2354+
"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(with)|(assert))\\s*(\\{)",
23552355
"beginCaptures": {
23562356
"1": {
2357-
"name": "keyword.control.assert.js"
2357+
"name": "keyword.control.with.js"
23582358
},
23592359
"2": {
2360+
"name": "keyword.control.assert.js"
2361+
},
2362+
"3": {
23602363
"name": "punctuation.definition.block.js"
23612364
}
23622365
},
@@ -2409,7 +2412,7 @@
24092412
"include": "#comment"
24102413
},
24112414
{
2412-
"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*))",
2415+
"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(?:(\\btype)\\s+)?(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))",
24132416
"captures": {
24142417
"1": {
24152418
"name": "keyword.control.type.js"
@@ -2424,13 +2427,19 @@
24242427
"name": "variable.other.readwrite.js"
24252428
},
24262429
"5": {
2430+
"name": "string.quoted.alias.js"
2431+
},
2432+
"12": {
24272433
"name": "keyword.control.as.js"
24282434
},
2429-
"6": {
2435+
"13": {
24302436
"name": "keyword.control.default.js"
24312437
},
2432-
"7": {
2438+
"14": {
24332439
"name": "variable.other.readwrite.alias.js"
2440+
},
2441+
"15": {
2442+
"name": "string.quoted.alias.js"
24342443
}
24352444
}
24362445
},
@@ -2446,13 +2455,16 @@
24462455
"match": "\\b(default)\\b"
24472456
},
24482457
{
2449-
"match": "(?:(\\btype)\\s+)?([_$[:alpha:]][_$[:alnum:]]*)",
2458+
"match": "(?:(\\btype)\\s+)?(?:([_$[:alpha:]][_$[:alnum:]]*)|((\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`)))",
24502459
"captures": {
24512460
"1": {
24522461
"name": "keyword.control.type.js"
24532462
},
24542463
"2": {
24552464
"name": "variable.other.readwrite.alias.js"
2465+
},
2466+
"3": {
2467+
"name": "string.quoted.alias.js"
24562468
}
24572469
}
24582470
}
@@ -2633,13 +2645,13 @@
26332645
},
26342646
{
26352647
"name": "string.regexp.js",
2636-
"begin": "(?<=\\))\\s*\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
2648+
"begin": "(?<=\\))\\s*\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
26372649
"beginCaptures": {
26382650
"0": {
26392651
"name": "punctuation.definition.string.begin.js"
26402652
}
26412653
},
2642-
"end": "(/)([dgimsuy]*)",
2654+
"end": "(/)([dgimsuvy]*)",
26432655
"endCaptures": {
26442656
"1": {
26452657
"name": "punctuation.definition.string.end.js"
@@ -4886,13 +4898,13 @@
48864898
"patterns": [
48874899
{
48884900
"name": "string.regexp.js",
4889-
"begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[\\()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\]|\\(([^\\)\\\\]|\\\\.)+\\))+\\/([dgimsuy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
4901+
"begin": "(?<!\\+\\+|--|})(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[\\()]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\]|\\(([^\\)\\\\]|\\\\.)+\\))+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
48904902
"beginCaptures": {
48914903
"1": {
48924904
"name": "punctuation.definition.string.begin.js"
48934905
}
48944906
},
4895-
"end": "(/)([dgimsuy]*)",
4907+
"end": "(/)([dgimsuvy]*)",
48964908
"endCaptures": {
48974909
"1": {
48984910
"name": "punctuation.definition.string.end.js"
@@ -4909,13 +4921,13 @@
49094921
},
49104922
{
49114923
"name": "string.regexp.js",
4912-
"begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*\\/)|((?<=^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case))\\s*)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
4924+
"begin": "((?<![_$[:alnum:])\\]]|\\+\\+|--|}|\\*\\/)|((?<=^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case))\\s*)\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)*\\])+\\/([dgimsuvy]+|(?![\\/\\*])|(?=\\/\\*))(?!\\s*[a-zA-Z0-9_$]))",
49134925
"beginCaptures": {
49144926
"0": {
49154927
"name": "punctuation.definition.string.begin.js"
49164928
}
49174929
},
4918-
"end": "(/)([dgimsuy]*)",
4930+
"end": "(/)([dgimsuvy]*)",
49194931
"endCaptures": {
49204932
"1": {
49214933
"name": "punctuation.definition.string.end.js"

0 commit comments

Comments
 (0)