Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 10:38:59 +01: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/typescript/syntaxes/TypeScript.tmLanguage.json
View File

@@ -97,7 +97,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.ts"
"name": "meta.definition.variable.ts entity.name.function.ts"
}
},
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -112,7 +112,7 @@
"begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
"beginCaptures": {
"1": {
"name": "variable.other.constant.ts"
"name": "meta.definition.variable.ts variable.other.constant.ts"
}
},
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -127,7 +127,7 @@
"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
"beginCaptures": {
"1": {
"name": "variable.other.readwrite.ts"
"name": "meta.definition.variable.ts variable.other.readwrite.ts"
}
},
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -266,7 +266,7 @@
"name": "keyword.operator.rest.ts"
},
"2": {
"name": "variable.other.readwrite.ts"
"name": "meta.definition.variable.ts variable.other.readwrite.ts"
}
}
},
@@ -1117,11 +1117,11 @@
"include": "#comment"
},
{
"name": "entity.name.function.ts",
"name": "meta.definition.property.ts entity.name.function.ts",
"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.ts",
"name": "meta.definition.property.ts variable.object.property.ts",
"match": "[_$[:alpha:]][_$[:alnum:]]*"
},
{
@@ -1191,7 +1191,7 @@
"include": "#array-literal"
},
{
"name": "entity.name.function.ts",
"name": "meta.definition.method.ts entity.name.function.ts",
"match": "[_$[:alpha:]][_$[:alnum:]]*"
},
{
@@ -1337,7 +1337,7 @@
"name": "keyword.generator.asterisk.ts"
},
"5": {
"name": "entity.name.function.ts"
"name": "meta.definition.function.ts entity.name.function.ts"
}
},
"end": "(?=$|;)|(?<=\\})",
@@ -1373,7 +1373,7 @@
"name": "keyword.generator.asterisk.ts"
},
"4": {
"name": "entity.name.function.ts"
"name": "meta.definition.function.ts entity.name.function.ts"
}
},
"end": "(?<=\\})",

18
extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json
View File

@@ -97,7 +97,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.tsx"
"name": "meta.definition.variable.tsx entity.name.function.tsx"
}
},
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -112,7 +112,7 @@
"begin": "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])",
"beginCaptures": {
"1": {
"name": "variable.other.constant.tsx"
"name": "meta.definition.variable.tsx variable.other.constant.tsx"
}
},
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -127,7 +127,7 @@
"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
"beginCaptures": {
"1": {
"name": "variable.other.readwrite.tsx"
"name": "meta.definition.variable.tsx variable.other.readwrite.tsx"
}
},
"end": "(?=$|[;,=}]|(\\s+(of|in)\\s+))",
@@ -266,7 +266,7 @@
"name": "keyword.operator.rest.tsx"
},
"2": {
"name": "variable.other.readwrite.tsx"
"name": "meta.definition.variable.tsx variable.other.readwrite.tsx"
}
}
},
@@ -1120,11 +1120,11 @@
"include": "#comment"
},
{
"name": "entity.name.function.tsx",
"name": "meta.definition.property.tsx entity.name.function.tsx",
"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.tsx",
"name": "meta.definition.property.tsx variable.object.property.tsx",
"match": "[_$[:alpha:]][_$[:alnum:]]*"
},
{
@@ -1194,7 +1194,7 @@
"include": "#array-literal"
},
{
"name": "entity.name.function.tsx",
"name": "meta.definition.method.tsx entity.name.function.tsx",
"match": "[_$[:alpha:]][_$[:alnum:]]*"
},
{
@@ -1340,7 +1340,7 @@
"name": "keyword.generator.asterisk.tsx"
},
"5": {
"name": "entity.name.function.tsx"
"name": "meta.definition.function.tsx entity.name.function.tsx"
}
},
"end": "(?=$|;)|(?<=\\})",
@@ -1376,7 +1376,7 @@
"name": "keyword.generator.asterisk.tsx"
},
"4": {
"name": "entity.name.function.tsx"
"name": "meta.definition.function.tsx entity.name.function.tsx"
}
},
"end": "(?<=\\})",