Skip to content

Commit 9613018

Browse files
mjbvzmjbvz
committed
Update ts grammar
1 parent 3a54e32 commit 9613018

5 files changed

Lines changed: 37 additions & 50 deletions

File tree

‎extensions/javascript/syntaxes/JavaScript.tmLanguage.json‎

Lines changed: 3 additions & 6 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/4109ddc9e27186afcf7263a448c86a59e9aa7d9e",
7+
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/824f47ea6e98590ac2e75db5bebdf6eff71421ad",
88
"name": "JavaScript (with React support)",
99
"scopeName": "source.js",
1010
"fileTypes": [
@@ -1707,8 +1707,7 @@
17071707
"include": "#comment"
17081708
},
17091709
{
1710-
"comment": "(default|*|name) as alias",
1711-
"match": "(?x) (?: \\b(default)\\b | (\\*) | ([_$[:alpha:]][_$[:alnum:]]*)) \\s+\n (as) \\s+ (?: (\\b default \\b | \\*) | ([_$[:alpha:]][_$[:alnum:]]*))",
1710+
"match": "(?<!\\.|\\$)(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*))\\s+(as)\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*)",
17121711
"captures": {
17131712
"1": {
17141713
"name": "keyword.control.default.js"
@@ -1723,9 +1722,6 @@
17231722
"name": "keyword.control.as.js"
17241723
},
17251724
"5": {
1726-
"name": "invalid.illegal.js"
1727-
},
1728-
"6": {
17291725
"name": "variable.other.readwrite.alias.js"
17301726
}
17311727
}
@@ -4104,6 +4100,7 @@
41044100
}
41054101
},
41064102
"end": "(?=[/]?>)",
4103+
"contentName": "meta.tag.attributes.js",
41074104
"patterns": [
41084105
{
41094106
"include": "#comment"

‎extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json‎

Lines changed: 3 additions & 6 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/4109ddc9e27186afcf7263a448c86a59e9aa7d9e",
7+
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/824f47ea6e98590ac2e75db5bebdf6eff71421ad",
88
"name": "JavaScript (with React support)",
99
"scopeName": "source.js.jsx",
1010
"fileTypes": [
@@ -1707,8 +1707,7 @@
17071707
"include": "#comment"
17081708
},
17091709
{
1710-
"comment": "(default|*|name) as alias",
1711-
"match": "(?x) (?: \\b(default)\\b | (\\*) | ([_$[:alpha:]][_$[:alnum:]]*)) \\s+\n (as) \\s+ (?: (\\b default \\b | \\*) | ([_$[:alpha:]][_$[:alnum:]]*))",
1710+
"match": "(?<!\\.|\\$)(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*))\\s+(as)\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*)",
17121711
"captures": {
17131712
"1": {
17141713
"name": "keyword.control.default.js.jsx"
@@ -1723,9 +1722,6 @@
17231722
"name": "keyword.control.as.js.jsx"
17241723
},
17251724
"5": {
1726-
"name": "invalid.illegal.js.jsx"
1727-
},
1728-
"6": {
17291725
"name": "variable.other.readwrite.alias.js.jsx"
17301726
}
17311727
}
@@ -4104,6 +4100,7 @@
41044100
}
41054101
},
41064102
"end": "(?=[/]?>)",
4103+
"contentName": "meta.tag.attributes.js.jsx",
41074104
"patterns": [
41084105
{
41094106
"include": "#comment"

‎extensions/javascript/test/colorize-results/test_jsx.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1772,7 +1772,7 @@
17721772
},
17731773
{
17741774
"c": " ",
1775-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx",
1775+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx",
17761776
"r": {
17771777
"dark_plus": "default: #D4D4D4",
17781778
"light_plus": "default: #000000",
@@ -1783,7 +1783,7 @@
17831783
},
17841784
{
17851785
"c": "href",
1786-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx entity.other.attribute-name.js.jsx",
1786+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx",
17871787
"r": {
17881788
"dark_plus": "entity.other.attribute-name: #9CDCFE",
17891789
"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1794,7 +1794,7 @@
17941794
},
17951795
{
17961796
"c": "=",
1797-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx keyword.operator.assignment.js.jsx",
1797+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx keyword.operator.assignment.js.jsx",
17981798
"r": {
17991799
"dark_plus": "keyword.operator: #D4D4D4",
18001800
"light_plus": "keyword.operator: #000000",
@@ -1805,7 +1805,7 @@
18051805
},
18061806
{
18071807
"c": "\"",
1808-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx string.quoted.double.js.jsx punctuation.definition.string.begin.js.jsx",
1808+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx string.quoted.double.js.jsx punctuation.definition.string.begin.js.jsx",
18091809
"r": {
18101810
"dark_plus": "string: #CE9178",
18111811
"light_plus": "string: #A31515",
@@ -1816,7 +1816,7 @@
18161816
},
18171817
{
18181818
"c": "\"",
1819-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx string.quoted.double.js.jsx punctuation.definition.string.end.js.jsx",
1819+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx string.quoted.double.js.jsx punctuation.definition.string.end.js.jsx",
18201820
"r": {
18211821
"dark_plus": "string: #CE9178",
18221822
"light_plus": "string: #A31515",
@@ -1827,7 +1827,7 @@
18271827
},
18281828
{
18291829
"c": " ",
1830-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx",
1830+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx",
18311831
"r": {
18321832
"dark_plus": "default: #D4D4D4",
18331833
"light_plus": "default: #000000",
@@ -1838,7 +1838,7 @@
18381838
},
18391839
{
18401840
"c": "onClick",
1841-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx entity.other.attribute-name.js.jsx",
1841+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx",
18421842
"r": {
18431843
"dark_plus": "entity.other.attribute-name: #9CDCFE",
18441844
"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1849,7 +1849,7 @@
18491849
},
18501850
{
18511851
"c": "=",
1852-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx keyword.operator.assignment.js.jsx",
1852+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx keyword.operator.assignment.js.jsx",
18531853
"r": {
18541854
"dark_plus": "keyword.operator: #D4D4D4",
18551855
"light_plus": "keyword.operator: #000000",
@@ -1860,7 +1860,7 @@
18601860
},
18611861
{
18621862
"c": "{",
1863-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.embedded.expression.js.jsx punctuation.section.embedded.begin.js.jsx",
1863+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx meta.embedded.expression.js.jsx punctuation.section.embedded.begin.js.jsx",
18641864
"r": {
18651865
"dark_plus": "punctuation.section.embedded: #569CD6",
18661866
"light_plus": "punctuation.section.embedded: #0000FF",
@@ -1871,7 +1871,7 @@
18711871
},
18721872
{
18731873
"c": "this",
1874-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.embedded.expression.js.jsx variable.language.this.js.jsx",
1874+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx meta.embedded.expression.js.jsx variable.language.this.js.jsx",
18751875
"r": {
18761876
"dark_plus": "variable.language: #569CD6",
18771877
"light_plus": "variable.language: #0000FF",
@@ -1882,7 +1882,7 @@
18821882
},
18831883
{
18841884
"c": ".",
1885-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.embedded.expression.js.jsx punctuation.accessor.js.jsx",
1885+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx meta.embedded.expression.js.jsx punctuation.accessor.js.jsx",
18861886
"r": {
18871887
"dark_plus": "meta.embedded: #D4D4D4",
18881888
"light_plus": "meta.embedded: #000000",
@@ -1893,7 +1893,7 @@
18931893
},
18941894
{
18951895
"c": "toggle",
1896-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.embedded.expression.js.jsx variable.other.property.js.jsx",
1896+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx meta.embedded.expression.js.jsx variable.other.property.js.jsx",
18971897
"r": {
18981898
"dark_plus": "variable: #9CDCFE",
18991899
"light_plus": "variable: #001080",
@@ -1904,7 +1904,7 @@
19041904
},
19051905
{
19061906
"c": "}",
1907-
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.embedded.expression.js.jsx punctuation.section.embedded.end.js.jsx",
1907+
"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx meta.tag.without-attributes.js.jsx meta.jsx.children.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx meta.embedded.expression.js.jsx punctuation.section.embedded.end.js.jsx",
19081908
"r": {
19091909
"dark_plus": "punctuation.section.embedded: #569CD6",
19101910
"light_plus": "punctuation.section.embedded: #0000FF",
@@ -2168,7 +2168,7 @@
21682168
},
21692169
{
21702170
"c": " ",
2171-
"t": "source.js.jsx meta.tag.js.jsx",
2171+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx",
21722172
"r": {
21732173
"dark_plus": "default: #D4D4D4",
21742174
"light_plus": "default: #000000",
@@ -2179,7 +2179,7 @@
21792179
},
21802180
{
21812181
"c": "default",
2182-
"t": "source.js.jsx meta.tag.js.jsx entity.other.attribute-name.js.jsx",
2182+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx",
21832183
"r": {
21842184
"dark_plus": "entity.other.attribute-name: #9CDCFE",
21852185
"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2190,7 +2190,7 @@
21902190
},
21912191
{
21922192
"c": "=",
2193-
"t": "source.js.jsx meta.tag.js.jsx keyword.operator.assignment.js.jsx",
2193+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx keyword.operator.assignment.js.jsx",
21942194
"r": {
21952195
"dark_plus": "keyword.operator: #D4D4D4",
21962196
"light_plus": "keyword.operator: #000000",
@@ -2201,7 +2201,7 @@
22012201
},
22022202
{
22032203
"c": "\"",
2204-
"t": "source.js.jsx meta.tag.js.jsx string.quoted.double.js.jsx punctuation.definition.string.begin.js.jsx",
2204+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx string.quoted.double.js.jsx punctuation.definition.string.begin.js.jsx",
22052205
"r": {
22062206
"dark_plus": "string: #CE9178",
22072207
"light_plus": "string: #A31515",
@@ -2212,7 +2212,7 @@
22122212
},
22132213
{
22142214
"c": "World",
2215-
"t": "source.js.jsx meta.tag.js.jsx string.quoted.double.js.jsx",
2215+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx string.quoted.double.js.jsx",
22162216
"r": {
22172217
"dark_plus": "string: #CE9178",
22182218
"light_plus": "string: #A31515",
@@ -2223,7 +2223,7 @@
22232223
},
22242224
{
22252225
"c": "\"",
2226-
"t": "source.js.jsx meta.tag.js.jsx string.quoted.double.js.jsx punctuation.definition.string.end.js.jsx",
2226+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx string.quoted.double.js.jsx punctuation.definition.string.end.js.jsx",
22272227
"r": {
22282228
"dark_plus": "string: #CE9178",
22292229
"light_plus": "string: #A31515",
@@ -2234,7 +2234,7 @@
22342234
},
22352235
{
22362236
"c": " ",
2237-
"t": "source.js.jsx meta.tag.js.jsx",
2237+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx",
22382238
"r": {
22392239
"dark_plus": "default: #D4D4D4",
22402240
"light_plus": "default: #000000",
@@ -2245,7 +2245,7 @@
22452245
},
22462246
{
22472247
"c": "alt",
2248-
"t": "source.js.jsx meta.tag.js.jsx entity.other.attribute-name.js.jsx",
2248+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx entity.other.attribute-name.js.jsx",
22492249
"r": {
22502250
"dark_plus": "entity.other.attribute-name: #9CDCFE",
22512251
"light_plus": "entity.other.attribute-name: #FF0000",
@@ -2256,7 +2256,7 @@
22562256
},
22572257
{
22582258
"c": "=",
2259-
"t": "source.js.jsx meta.tag.js.jsx keyword.operator.assignment.js.jsx",
2259+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx keyword.operator.assignment.js.jsx",
22602260
"r": {
22612261
"dark_plus": "keyword.operator: #D4D4D4",
22622262
"light_plus": "keyword.operator: #000000",
@@ -2267,7 +2267,7 @@
22672267
},
22682268
{
22692269
"c": "\"",
2270-
"t": "source.js.jsx meta.tag.js.jsx string.quoted.double.js.jsx punctuation.definition.string.begin.js.jsx",
2270+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx string.quoted.double.js.jsx punctuation.definition.string.begin.js.jsx",
22712271
"r": {
22722272
"dark_plus": "string: #CE9178",
22732273
"light_plus": "string: #A31515",
@@ -2278,7 +2278,7 @@
22782278
},
22792279
{
22802280
"c": "Mars",
2281-
"t": "source.js.jsx meta.tag.js.jsx string.quoted.double.js.jsx",
2281+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx string.quoted.double.js.jsx",
22822282
"r": {
22832283
"dark_plus": "string: #CE9178",
22842284
"light_plus": "string: #A31515",
@@ -2289,7 +2289,7 @@
22892289
},
22902290
{
22912291
"c": "\"",
2292-
"t": "source.js.jsx meta.tag.js.jsx string.quoted.double.js.jsx punctuation.definition.string.end.js.jsx",
2292+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx string.quoted.double.js.jsx punctuation.definition.string.end.js.jsx",
22932293
"r": {
22942294
"dark_plus": "string: #CE9178",
22952295
"light_plus": "string: #A31515",
@@ -2300,7 +2300,7 @@
23002300
},
23012301
{
23022302
"c": " ",
2303-
"t": "source.js.jsx meta.tag.js.jsx",
2303+
"t": "source.js.jsx meta.tag.js.jsx meta.tag.attributes.js.jsx",
23042304
"r": {
23052305
"dark_plus": "default: #D4D4D4",
23062306
"light_plus": "default: #000000",

‎extensions/typescript/syntaxes/TypeScript.tmLanguage.json‎

Lines changed: 2 additions & 6 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/4109ddc9e27186afcf7263a448c86a59e9aa7d9e",
7+
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/f3a2069b99f45c34ac5cc7dc5f1dcb4e81486ab9",
88
"name": "TypeScript",
99
"scopeName": "source.ts",
1010
"fileTypes": [
@@ -1701,8 +1701,7 @@
17011701
"include": "#comment"
17021702
},
17031703
{
1704-
"comment": "(default|*|name) as alias",
1705-
"match": "(?x) (?: \\b(default)\\b | (\\*) | ([_$[:alpha:]][_$[:alnum:]]*)) \\s+\n (as) \\s+ (?: (\\b default \\b | \\*) | ([_$[:alpha:]][_$[:alnum:]]*))",
1704+
"match": "(?<!\\.|\\$)(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*))\\s+(as)\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*)",
17061705
"captures": {
17071706
"1": {
17081707
"name": "keyword.control.default.ts"
@@ -1717,9 +1716,6 @@
17171716
"name": "keyword.control.as.ts"
17181717
},
17191718
"5": {
1720-
"name": "invalid.illegal.ts"
1721-
},
1722-
"6": {
17231719
"name": "variable.other.readwrite.alias.ts"
17241720
}
17251721
}

‎extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json‎

Lines changed: 3 additions & 6 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/4109ddc9e27186afcf7263a448c86a59e9aa7d9e",
7+
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/824f47ea6e98590ac2e75db5bebdf6eff71421ad",
88
"name": "TypeScriptReact",
99
"scopeName": "source.tsx",
1010
"fileTypes": [
@@ -1704,8 +1704,7 @@
17041704
"include": "#comment"
17051705
},
17061706
{
1707-
"comment": "(default|*|name) as alias",
1708-
"match": "(?x) (?: \\b(default)\\b | (\\*) | ([_$[:alpha:]][_$[:alnum:]]*)) \\s+\n (as) \\s+ (?: (\\b default \\b | \\*) | ([_$[:alpha:]][_$[:alnum:]]*))",
1707+
"match": "(?<!\\.|\\$)(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*))\\s+(as)\\s+(\\b[_$[:alpha:]][_$[:alnum:]]*)",
17091708
"captures": {
17101709
"1": {
17111710
"name": "keyword.control.default.tsx"
@@ -1720,9 +1719,6 @@
17201719
"name": "keyword.control.as.tsx"
17211720
},
17221721
"5": {
1723-
"name": "invalid.illegal.tsx"
1724-
},
1725-
"6": {
17261722
"name": "variable.other.readwrite.alias.tsx"
17271723
}
17281724
}
@@ -4101,6 +4097,7 @@
41014097
}
41024098
},
41034099
"end": "(?=[/]?>)",
4100+
"contentName": "meta.tag.attributes.tsx",
41044101
"patterns": [
41054102
{
41064103
"include": "#comment"

0 commit comments

Comments
 (0)