Skip to content

Commit abfdbf6

Browse files
aeschliaeschli
committed
[typescript] grammars: remove workaround for spaces in scope names
1 parent 3956be9 commit abfdbf6

18 files changed

Lines changed: 98 additions & 118 deletions

‎extensions/jade/test/colorize-results/test_jade.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@
672672
},
673673
{
674674
"c": "user",
675-
"t": "text.jade source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
675+
"t": "text.jade source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
676676
"r": {
677677
"dark_plus": "variable: #9CDCFE",
678678
"light_plus": "variable: #001080",

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n (=\\s*(\n (async\\s+) |\n (function\\s*[(<]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n ) |\n (:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n )))\n )\n)",
9999
"beginCaptures": {
100100
"1": {
101-
"name": "entity.name.function.js"
101+
"name": "meta.definition.variable.js entity.name.function.js"
102102
}
103103
},
104104
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -113,7 +113,7 @@
113113
"begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
114114
"beginCaptures": {
115115
"1": {
116-
"name": "variable.other.constant.js"
116+
"name": "meta.definition.variable.js variable.other.constant.js"
117117
}
118118
},
119119
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -128,7 +128,7 @@
128128
"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
129129
"beginCaptures": {
130130
"1": {
131-
"name": "variable.other.readwrite.js"
131+
"name": "meta.definition.variable.js variable.other.readwrite.js"
132132
}
133133
},
134134
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -267,7 +267,7 @@
267267
"name": "keyword.operator.rest.js"
268268
},
269269
"2": {
270-
"name": "variable.other.readwrite.js"
270+
"name": "meta.definition.variable.js variable.other.readwrite.js"
271271
}
272272
}
273273
},
@@ -1121,11 +1121,11 @@
11211121
"include": "#comment"
11221122
},
11231123
{
1124-
"name": "entity.name.function.js",
1124+
"name": "meta.definition.property.js entity.name.function.js",
11251125
"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n (=\\s*(\n (async\\s+) |\n (function\\s*[(<]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n ) |\n (:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n )))\n )\n)"
11261126
},
11271127
{
1128-
"name": "variable.object.property.js",
1128+
"name": "meta.definition.property.js variable.object.property.js",
11291129
"match": "[_$[:alpha:]][_$[:alnum:]]*"
11301130
},
11311131
{
@@ -1195,7 +1195,7 @@
11951195
"include": "#array-literal"
11961196
},
11971197
{
1198-
"name": "entity.name.function.js",
1198+
"name": "meta.definition.method.js entity.name.function.js",
11991199
"match": "[_$[:alpha:]][_$[:alnum:]]*"
12001200
},
12011201
{
@@ -1341,7 +1341,7 @@
13411341
"name": "keyword.generator.asterisk.js"
13421342
},
13431343
"5": {
1344-
"name": "entity.name.function.js"
1344+
"name": "meta.definition.function.js entity.name.function.js"
13451345
}
13461346
},
13471347
"end": "(?=$|;)|(?<=\\})",
@@ -1377,7 +1377,7 @@
13771377
"name": "keyword.generator.asterisk.js"
13781378
},
13791379
"4": {
1380-
"name": "entity.name.function.js"
1380+
"name": "meta.definition.function.js entity.name.function.js"
13811381
}
13821382
},
13831383
"end": "(?<=\\})",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
},
4646
{
4747
"c": "i",
48-
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
48+
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
4949
"r": {
5050
"dark_plus": "variable: #9CDCFE",
5151
"light_plus": "variable: #001080",
@@ -221,7 +221,7 @@
221221
},
222222
{
223223
"c": "j",
224-
"t": "source.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
224+
"t": "source.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
225225
"r": {
226226
"dark_plus": "variable: #9CDCFE",
227227
"light_plus": "variable: #001080",

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
},
9090
{
9191
"c": "gulp",
92-
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
92+
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
9393
"r": {
9494
"dark_plus": "variable: #9CDCFE",
9595
"light_plus": "variable: #001080",
@@ -232,7 +232,7 @@
232232
},
233233
{
234234
"c": "tsb",
235-
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
235+
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
236236
"r": {
237237
"dark_plus": "variable: #9CDCFE",
238238
"light_plus": "variable: #001080",
@@ -375,7 +375,7 @@
375375
},
376376
{
377377
"c": "util",
378-
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
378+
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
379379
"r": {
380380
"dark_plus": "variable: #9CDCFE",
381381
"light_plus": "variable: #001080",
@@ -518,7 +518,7 @@
518518
},
519519
{
520520
"c": "watcher",
521-
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
521+
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
522522
"r": {
523523
"dark_plus": "variable: #9CDCFE",
524524
"light_plus": "variable: #001080",
@@ -661,7 +661,7 @@
661661
},
662662
{
663663
"c": "assign",
664-
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
664+
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
665665
"r": {
666666
"dark_plus": "variable: #9CDCFE",
667667
"light_plus": "variable: #001080",
@@ -804,7 +804,7 @@
804804
},
805805
{
806806
"c": "compilation",
807-
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
807+
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
808808
"r": {
809809
"dark_plus": "variable: #9CDCFE",
810810
"light_plus": "variable: #001080",
@@ -1959,7 +1959,7 @@
19591959
},
19601960
{
19611961
"c": "src",
1962-
"t": "source.js meta.function.expression.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
1962+
"t": "source.js meta.function.expression.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
19631963
"r": {
19641964
"dark_plus": "variable: #9CDCFE",
19651965
"light_plus": "variable: #001080",
@@ -2971,7 +2971,7 @@
29712971
},
29722972
{
29732973
"c": "cloneArray",
2974-
"t": "source.js meta.function.js entity.name.function.js",
2974+
"t": "source.js meta.function.js meta.definition.function.js entity.name.function.js",
29752975
"r": {
29762976
"dark_plus": "entity.name.function: #DCDCAA",
29772977
"light_plus": "entity.name.function: #795E26",
@@ -3136,7 +3136,7 @@
31363136
},
31373137
{
31383138
"c": "r",
3139-
"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
3139+
"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
31403140
"r": {
31413141
"dark_plus": "variable: #9CDCFE",
31423142
"light_plus": "variable: #001080",
@@ -3268,7 +3268,7 @@
32683268
},
32693269
{
32703270
"c": "i",
3271-
"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
3271+
"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
32723272
"r": {
32733273
"dark_plus": "variable: #9CDCFE",
32743274
"light_plus": "variable: #001080",
@@ -3345,7 +3345,7 @@
33453345
},
33463346
{
33473347
"c": "len",
3348-
"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
3348+
"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
33493349
"r": {
33503350
"dark_plus": "variable: #9CDCFE",
33513351
"light_plus": "variable: #001080",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
{
2525
"c": "ToggleText",
26-
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
26+
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
2727
"r": {
2828
"dark_plus": "variable: #9CDCFE",
2929
"light_plus": "variable: #001080",
@@ -1090,7 +1090,7 @@
10901090
},
10911091
{
10921092
"c": "message",
1093-
"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
1093+
"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
10941094
"r": {
10951095
"dark_plus": "variable: #9CDCFE",
10961096
"light_plus": "variable: #001080",

‎extensions/typescript/build/update-grammars.js‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,6 @@ function adaptToJavaScript(grammar) {
1414
var fixScopeNames = function(rule) {
1515
if (typeof rule.name === 'string') {
1616
rule.name = rule.name.replace(/\.tsx/g, '.js');
17-
rule.name = rule.name.replace(/^\S+ (\S+)$/g, '$1');
18-
}
19-
for (var property in rule) {
20-
var value = rule[property];
21-
if (typeof value === 'object') {
22-
fixScopeNames(value);
23-
}
24-
}
25-
};
26-
27-
var repository = grammar.repository;
28-
for (var key in repository) {
29-
fixScopeNames(repository[key]);
30-
}
31-
}
32-
33-
function fixSpacesInNames(grammar) {
34-
var fixScopeNames = function(rule) {
35-
if (typeof rule.name === 'string') {
36-
rule.name = rule.name.replace(/^\S+ (\S+)$/g, '$1');
3717
}
3818
for (var property in rule) {
3919
var value = rule[property];
@@ -50,8 +30,8 @@ function fixSpacesInNames(grammar) {
5030
}
5131

5232
var tsGrammarRepo = 'Microsoft/TypeScript-TmLanguage';
53-
updateGrammar.update(tsGrammarRepo, 'TypeScript.tmLanguage', './syntaxes/TypeScript.tmLanguage.json', fixSpacesInNames);
54-
updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', './syntaxes/TypeScriptReact.tmLanguage.json', fixSpacesInNames);
33+
updateGrammar.update(tsGrammarRepo, 'TypeScript.tmLanguage', './syntaxes/TypeScript.tmLanguage.json');
34+
updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', './syntaxes/TypeScriptReact.tmLanguage.json');
5535
updateGrammar.update(tsGrammarRepo, 'TypeScriptReact.tmLanguage', '../javascript/syntaxes/JavaScript.tmLanguage.json', adaptToJavaScript);
5636

5737

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n (=\\s*(\n (async\\s+) |\n (function\\s*[(<]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n ) |\n (:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n )))\n )\n)",
9898
"beginCaptures": {
9999
"1": {
100-
"name": "entity.name.function.ts"
100+
"name": "meta.definition.variable.ts entity.name.function.ts"
101101
}
102102
},
103103
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -112,7 +112,7 @@
112112
"begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
113113
"beginCaptures": {
114114
"1": {
115-
"name": "variable.other.constant.ts"
115+
"name": "meta.definition.variable.ts variable.other.constant.ts"
116116
}
117117
},
118118
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -127,7 +127,7 @@
127127
"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
128128
"beginCaptures": {
129129
"1": {
130-
"name": "variable.other.readwrite.ts"
130+
"name": "meta.definition.variable.ts variable.other.readwrite.ts"
131131
}
132132
},
133133
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -266,7 +266,7 @@
266266
"name": "keyword.operator.rest.ts"
267267
},
268268
"2": {
269-
"name": "variable.other.readwrite.ts"
269+
"name": "meta.definition.variable.ts variable.other.readwrite.ts"
270270
}
271271
}
272272
},
@@ -1117,11 +1117,11 @@
11171117
"include": "#comment"
11181118
},
11191119
{
1120-
"name": "entity.name.function.ts",
1120+
"name": "meta.definition.property.ts entity.name.function.ts",
11211121
"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n (=\\s*(\n (async\\s+) |\n (function\\s*[(<]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>) |\n ([(]\\s*(([)]\\s*:)|([_$[:alpha:]][_$[:alnum:]]*\\s*:)|(\\.\\.\\.) )) |\n ([<]\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s*[^=>])|(\\s*[,]))) |\n ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))\n ) |\n (:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n )))\n )\n)"
11221122
},
11231123
{
1124-
"name": "variable.object.property.ts",
1124+
"name": "meta.definition.property.ts variable.object.property.ts",
11251125
"match": "[_$[:alpha:]][_$[:alnum:]]*"
11261126
},
11271127
{
@@ -1191,7 +1191,7 @@
11911191
"include": "#array-literal"
11921192
},
11931193
{
1194-
"name": "entity.name.function.ts",
1194+
"name": "meta.definition.method.ts entity.name.function.ts",
11951195
"match": "[_$[:alpha:]][_$[:alnum:]]*"
11961196
},
11971197
{
@@ -1337,7 +1337,7 @@
13371337
"name": "keyword.generator.asterisk.ts"
13381338
},
13391339
"5": {
1340-
"name": "entity.name.function.ts"
1340+
"name": "meta.definition.function.ts entity.name.function.ts"
13411341
}
13421342
},
13431343
"end": "(?=$|;)|(?<=\\})",
@@ -1373,7 +1373,7 @@
13731373
"name": "keyword.generator.asterisk.ts"
13741374
},
13751375
"4": {
1376-
"name": "entity.name.function.ts"
1376+
"name": "meta.definition.function.ts entity.name.function.ts"
13771377
}
13781378
},
13791379
"end": "(?<=\\})",

0 commit comments

Comments
 (0)