Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ts] update grammar

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-10-27 16:39:21 +02:00
parent 2f8c5c1189
commit 47a79e95c4
12 changed files with 598 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
extensions/typescript/syntaxes/TypeScript.tmLanguage.json
View File

@@ -491,8 +491,8 @@
},
"enum-declaration": {
"name": "meta.enum.declaration.ts",
"match": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
"captures": {
"begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
"beginCaptures": {
"1": {
"name": "keyword.control.export.ts"
},
@@ -505,7 +505,67 @@
"4": {
"name": "entity.name.type.enum.ts"
}
}
},
"end": "(?<=\\})",
"patterns": [
{
"include": "#comment"
},
{
"begin": "\\{",
"beginCaptures": {
"0": {
"name": "punctuation.definition.block.ts"
}
},
"end": "\\}",
"endCaptures": {
"0": {
"name": "punctuation.definition.block.ts"
}
},
"patterns": [
{
"include": "#comment"
},
{
"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
"beginCaptures": {
"0": {
"name": "variable.other.enummember.ts"
}
},
"end": "(?=,|\\}|$)",
"patterns": [
{
"include": "#comment"
},
{
"include": "#variable-initializer"
}
]
},
{
"begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")))",
"end": "(?=,|\\}|$)",
"patterns": [
{
"include": "#string"
},
{
"include": "#comment"
},
{
"include": "#variable-initializer"
}
]
},
{
"include": "#punctuation-comma"
}
]
}
]
},
"namespace-declaration": {
"name": "meta.namespace.declaration.ts",
@@ -1219,7 +1279,7 @@
}
},
"object-literal": {
"name": "meta.object-literal.ts",
"name": "meta.objectliteral.ts",
"begin": "\\{",
"beginCaptures": {
"0": {
@@ -1259,7 +1319,7 @@
]
},
"after-operator-block": {
"name": "meta.object-literal.ts",
"name": "meta.objectliteral.ts",
"begin": "(?<=[=(,\\[?+!]|await|return|yield|throw|in|of|typeof|&&|\\|\\||\\*)\\s*(\\{)",
"beginCaptures": {
"1": {
@@ -1507,7 +1567,7 @@
]
},
"type-predicate-operator": {
"name": "keyword.operator.is.ts",
"name": "keyword.operator.expression.is.ts",
"match": "(?<!\\.|\\$)\\bis\\b(?!\\$)"
},
"type-annotation": {
@@ -2112,7 +2172,7 @@
"name": "entity.name.function.ts"
}
},
"end": "(?=\\()",
"end": "(?<=\\))",
"patterns": [
{
"include": "#comment"
@@ -2139,6 +2199,9 @@
"include": "#punctuation-comma"
}
]
},
{
"include": "#paren-expression"
}
]
},
@@ -2163,7 +2226,7 @@
}
},
{
"match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
"match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s*[(<])|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
"captures": {
"1": {
"name": "punctuation.accessor.ts"
@@ -2244,8 +2307,11 @@
"name": "keyword.operator.new.ts"
}
},
"end": "(?=[(;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
"end": "(?<=\\))|(?=[;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
"patterns": [
{
"include": "#paren-expression"
},
{
"include": "#type"
}
@@ -2289,7 +2355,7 @@
},
{
"name": "meta.object.member.ts",
"begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
"begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s*[(<])|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
"beginCaptures": {
"0": {
"name": "meta.object-literal.key.ts"
@@ -2362,19 +2428,19 @@
"match": "(?<!\\.|\\$)\\b(await)\\b(?!\\$)"
},
{
"name": "keyword.operator.delete.ts",
"name": "keyword.operator.expression.delete.ts",
"match": "(?<!\\.|\\$)\\bdelete\\b(?!\\$)"
},
{
"name": "keyword.operator.in.ts",
"name": "keyword.operator.expression.in.ts",
"match": "(?<!\\.|\\$)\\bin\\b(?!\\$)"
},
{
"name": "keyword.operator.of.ts",
"name": "keyword.operator.expression.of.ts",
"match": "(?<!\\.|\\$)\\bof\\b(?!\\$)"
},
{
"name": "keyword.operator.instanceof.ts",
"name": "keyword.operator.expression.instanceof.ts",
"match": "(?<!\\.|\\$)\\binstanceof\\b(?!\\$)"
},
{
@@ -2385,7 +2451,7 @@
"include": "#typeof-operator"
},
{
"name": "keyword.operator.void.ts",
"name": "keyword.operator.expression.void.ts",
"match": "(?<!\\.|\\$)\\bvoid\\b(?!\\$)"
},
{
@@ -2453,7 +2519,7 @@
]
},
"typeof-operator": {
"name": "keyword.operator.typeof.ts",
"name": "keyword.operator.expression.typeof.ts",
"match": "(?<!\\.|\\$)\\btypeof\\b(?!\\$)"
},
"arrow-function": {
@@ -3101,5 +3167,5 @@
]
}
},
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/fea3b25eb632f689a02057a1715faab29343dda2"
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/578dd5db70333e3b6826ff529276f32916a2c81b"
}

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

@@ -494,8 +494,8 @@
},
"enum-declaration": {
"name": "meta.enum.declaration.tsx",
"match": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
"captures": {
"begin": "(?<!\\.|\\$)(?:(\\bexport)\\s+)?(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
"beginCaptures": {
"1": {
"name": "keyword.control.export.tsx"
},
@@ -508,7 +508,67 @@
"4": {
"name": "entity.name.type.enum.tsx"
}
}
},
"end": "(?<=\\})",
"patterns": [
{
"include": "#comment"
},
{
"begin": "\\{",
"beginCaptures": {
"0": {
"name": "punctuation.definition.block.tsx"
}
},
"end": "\\}",
"endCaptures": {
"0": {
"name": "punctuation.definition.block.tsx"
}
},
"patterns": [
{
"include": "#comment"
},
{
"begin": "([_$[:alpha:]][_$[:alnum:]]*)",
"beginCaptures": {
"0": {
"name": "variable.other.enummember.tsx"
}
},
"end": "(?=,|\\}|$)",
"patterns": [
{
"include": "#comment"
},
{
"include": "#variable-initializer"
}
]
},
{
"begin": "(?=(?:(?:\\'[^']*\\')|(?:\\\"[^\"]*\\\")))",
"end": "(?=,|\\}|$)",
"patterns": [
{
"include": "#string"
},
{
"include": "#comment"
},
{
"include": "#variable-initializer"
}
]
},
{
"include": "#punctuation-comma"
}
]
}
]
},
"namespace-declaration": {
"name": "meta.namespace.declaration.tsx",
@@ -1222,7 +1282,7 @@
}
},
"object-literal": {
"name": "meta.object-literal.tsx",
"name": "meta.objectliteral.tsx",
"begin": "\\{",
"beginCaptures": {
"0": {
@@ -1262,7 +1322,7 @@
]
},
"after-operator-block": {
"name": "meta.object-literal.tsx",
"name": "meta.objectliteral.tsx",
"begin": "(?<=[=(,\\[?+!]|await|return|yield|throw|in|of|typeof|&&|\\|\\||\\*)\\s*(\\{)",
"beginCaptures": {
"1": {
@@ -1510,7 +1570,7 @@
]
},
"type-predicate-operator": {
"name": "keyword.operator.is.tsx",
"name": "keyword.operator.expression.is.tsx",
"match": "(?<!\\.|\\$)\\bis\\b(?!\\$)"
},
"type-annotation": {
@@ -2115,7 +2175,7 @@
"name": "entity.name.function.tsx"
}
},
"end": "(?=\\()",
"end": "(?<=\\))",
"patterns": [
{
"include": "#comment"
@@ -2142,6 +2202,9 @@
"include": "#punctuation-comma"
}
]
},
{
"include": "#paren-expression"
}
]
},
@@ -2166,7 +2229,7 @@
}
},
{
"match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
"match": "(?x)(?:(\\.)\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*( (async\\s+)|(function\\s*[(<])|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>)))",
"captures": {
"1": {
"name": "punctuation.accessor.tsx"
@@ -2234,8 +2297,11 @@
"name": "keyword.operator.new.tsx"
}
},
"end": "(?=[(;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
"end": "(?<=\\))|(?=[;),]|$|((?<!\\.|\\$)\\bnew\\b(?!\\$)))",
"patterns": [
{
"include": "#paren-expression"
},
{
"include": "#type"
}
@@ -2279,7 +2345,7 @@
},
{
"name": "meta.object.member.tsx",
"begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
"begin": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(:)(?=\\s*( (async\\s+)|(function\\s*[(<])|(function\\s+)| ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)| ((<([^<>]|\\<[^<>]+\\>)+>\\s*)?\\(([^()]|\\([^()]*\\))*\\)(\\s*:\\s*(.)*)?\\s*=>))))",
"beginCaptures": {
"0": {
"name": "meta.object-literal.key.tsx"
@@ -2352,19 +2418,19 @@
"match": "(?<!\\.|\\$)\\b(await)\\b(?!\\$)"
},
{
"name": "keyword.operator.delete.tsx",
"name": "keyword.operator.expression.delete.tsx",
"match": "(?<!\\.|\\$)\\bdelete\\b(?!\\$)"
},
{
"name": "keyword.operator.in.tsx",
"name": "keyword.operator.expression.in.tsx",
"match": "(?<!\\.|\\$)\\bin\\b(?!\\$)"
},
{
"name": "keyword.operator.of.tsx",
"name": "keyword.operator.expression.of.tsx",
"match": "(?<!\\.|\\$)\\bof\\b(?!\\$)"
},
{
"name": "keyword.operator.instanceof.tsx",
"name": "keyword.operator.expression.instanceof.tsx",
"match": "(?<!\\.|\\$)\\binstanceof\\b(?!\\$)"
},
{
@@ -2375,7 +2441,7 @@
"include": "#typeof-operator"
},
{
"name": "keyword.operator.void.tsx",
"name": "keyword.operator.expression.void.tsx",
"match": "(?<!\\.|\\$)\\bvoid\\b(?!\\$)"
},
{
@@ -2443,7 +2509,7 @@
]
},
"typeof-operator": {
"name": "keyword.operator.typeof.tsx",
"name": "keyword.operator.expression.typeof.tsx",
"match": "(?<!\\.|\\$)\\btypeof\\b(?!\\$)"
},
"arrow-function": {
@@ -3393,5 +3459,5 @@
]
}
},
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/fea3b25eb632f689a02057a1715faab29343dda2"
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/578dd5db70333e3b6826ff529276f32916a2c81b"
}