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

[ts] update grammar

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-10-18 11:56:52 +02:00
parent 7a8905a29c
commit 117f6bba76
3 changed files with 138 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2395,7 +2395,7 @@
"name": "keyword.control.as.ts"
}
},
"end": "(?=$|[;,})\\]])",
"end": "(?=$|[;,:})\\]])",
"patterns": [
{
"include": "#type"
@@ -2617,25 +2617,52 @@
]
},
"regex": {
"name": "string.regex.ts",
"begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(/)(?![/*+?])(?=.*/)",
"beginCaptures": {
"1": {
"name": "punctuation.definition.string.begin.ts"
}
},
"end": "(/)([gimuy]*)",
"endCaptures": {
"1": {
"name": "punctuation.definition.string.end.ts"
},
"2": {
"name": "keyword.other.ts"
}
},
"patterns": [
{
"include": "#regexp"
"name": "string.regex.ts",
"begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(/)(?![/*+?])(?=.*/)",
"beginCaptures": {
"1": {
"name": "punctuation.definition.string.begin.ts"
}
},
"end": "(/)([gimuy]*)",
"endCaptures": {
"1": {
"name": "punctuation.definition.string.end.ts"
},
"2": {
"name": "keyword.other.ts"
}
},
"patterns": [
{
"include": "#regexp"
}
]
},
{
"name": "string.regex.ts",
"begin": "/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
"beginCaptures": {
"0": {
"name": "punctuation.definition.string.begin.ts"
}
},
"end": "(/)([gimuy]*)",
"endCaptures": {
"1": {
"name": "punctuation.definition.string.end.ts"
},
"2": {
"name": "keyword.other.ts"
}
},
"patterns": [
{
"include": "#regexp"
}
]
}
]
},
@@ -3074,5 +3101,5 @@
]
}
},
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/d3b73efa6a26a86aa31f8ab49e9d74db8e7c1651"
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/fea3b25eb632f689a02057a1715faab29343dda2"
}

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

@@ -2385,7 +2385,7 @@
"name": "keyword.control.as.tsx"
}
},
"end": "(?=$|[;,})\\]])",
"end": "(?=$|[;,:})\\]])",
"patterns": [
{
"include": "#type"
@@ -2607,25 +2607,52 @@
]
},
"regex": {
"name": "string.regex.tsx",
"begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(/)(?![/*+?])(?=.*/)",
"beginCaptures": {
"1": {
"name": "punctuation.definition.string.begin.tsx"
}
},
"end": "(/)([gimuy]*)",
"endCaptures": {
"1": {
"name": "punctuation.definition.string.end.tsx"
},
"2": {
"name": "keyword.other.tsx"
}
},
"patterns": [
{
"include": "#regexp"
"name": "string.regex.tsx",
"begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(/)(?![/*+?])(?=.*/)",
"beginCaptures": {
"1": {
"name": "punctuation.definition.string.begin.tsx"
}
},
"end": "(/)([gimuy]*)",
"endCaptures": {
"1": {
"name": "punctuation.definition.string.end.tsx"
},
"2": {
"name": "keyword.other.tsx"
}
},
"patterns": [
{
"include": "#regexp"
}
]
},
{
"name": "string.regex.tsx",
"begin": "/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
"beginCaptures": {
"0": {
"name": "punctuation.definition.string.begin.tsx"
}
},
"end": "(/)([gimuy]*)",
"endCaptures": {
"1": {
"name": "punctuation.definition.string.end.tsx"
},
"2": {
"name": "keyword.other.tsx"
}
},
"patterns": [
{
"include": "#regexp"
}
]
}
]
},
@@ -3366,5 +3393,5 @@
]
}
},
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/d3b73efa6a26a86aa31f8ab49e9d74db8e7c1651"
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/fea3b25eb632f689a02057a1715faab29343dda2"
}