Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 12:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[typescript] grammars: remove workaround for spaces in scope names

Browse Source
This commit is contained in:
Martin Aeschlimann
2017-01-19 12:02:07 +01:00
parent 3956be9ba6
commit abfdbf6d46
18 changed files with 98 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/javascript/syntaxes/JavaScript.tmLanguage.json
View File

@@ -98,7 +98,7 @@
"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)",
"beginCaptures": {
"1": {
"name": "entity.name.function.js"
"name": "meta.definition.variable.js entity.name.function.js"
}
},
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -113,7 +113,7 @@
"begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
"beginCaptures": {
"1": {
"name": "variable.other.constant.js"
"name": "meta.definition.variable.js variable.other.constant.js"
}
},
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -128,7 +128,7 @@
"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
"beginCaptures": {
"1": {
"name": "variable.other.readwrite.js"
"name": "meta.definition.variable.js variable.other.readwrite.js"
}
},
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -267,7 +267,7 @@
"name": "keyword.operator.rest.js"
},
"2": {
"name": "variable.other.readwrite.js"
"name": "meta.definition.variable.js variable.other.readwrite.js"
}
}
},
@@ -1121,11 +1121,11 @@
"include": "#comment"
},
{
"name": "entity.name.function.js",
"name": "meta.definition.property.js entity.name.function.js",
"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)"
},
{
"name": "variable.object.property.js",
"name": "meta.definition.property.js variable.object.property.js",
"match": "[_$[:alpha:]][_$[:alnum:]]*"
},
{
@@ -1195,7 +1195,7 @@
"include": "#array-literal"
},
{
"name": "entity.name.function.js",
"name": "meta.definition.method.js entity.name.function.js",
"match": "[_$[:alpha:]][_$[:alnum:]]*"
},
{
@@ -1341,7 +1341,7 @@
"name": "keyword.generator.asterisk.js"
},
"5": {
"name": "entity.name.function.js"
"name": "meta.definition.function.js entity.name.function.js"
}
},
"end": "(?=$|;)|(?<=\\})",
@@ -1377,7 +1377,7 @@
"name": "keyword.generator.asterisk.js"
},
"4": {
"name": "entity.name.function.js"
"name": "meta.definition.function.js entity.name.function.js"
}
},
"end": "(?<=\\})",

4
extensions/javascript/test/colorize-results/test6916_js.json
View File

@@ -45,7 +45,7 @@
},
{
"c": "i",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -221,7 +221,7 @@
},
{
"c": "j",
"t": "source.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"t": "source.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",

22
extensions/javascript/test/colorize-results/test_js.json
View File

@@ -89,7 +89,7 @@
},
{
"c": "gulp",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -232,7 +232,7 @@
},
{
"c": "tsb",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -375,7 +375,7 @@
},
{
"c": "util",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -518,7 +518,7 @@
},
{
"c": "watcher",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -661,7 +661,7 @@
},
{
"c": "assign",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -804,7 +804,7 @@
},
{
"c": "compilation",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -1959,7 +1959,7 @@
},
{
"c": "src",
"t": "source.js meta.function.expression.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"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",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -2971,7 +2971,7 @@
},
{
"c": "cloneArray",
"t": "source.js meta.function.js entity.name.function.js",
"t": "source.js meta.function.js meta.definition.function.js entity.name.function.js",
"r": {
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
@@ -3136,7 +3136,7 @@
},
{
"c": "r",
"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"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",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -3268,7 +3268,7 @@
},
{
"c": "i",
"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"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",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -3345,7 +3345,7 @@
},
{
"c": "len",
"t": "source.js meta.function.js meta.block.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"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",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",

4
extensions/javascript/test/colorize-results/test_jsx.json
View File

@@ -23,7 +23,7 @@
},
{
"c": "ToggleText",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js variable.other.readwrite.js",
"t": "source.js meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.readwrite.js",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
@@ -1090,7 +1090,7 @@
},
{
"c": "message",
"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",
"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",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",