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. Fixes #19403

Browse Source
This commit is contained in:
Martin Aeschlimann
2017-01-30 11:58:08 +01:00
parent 0ef15636e9
commit 2c55fde0da
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1807,7 +1807,7 @@
},
"type-builtin-literals": {
"name": "support.type.builtin.ts",
"match": "(?<!\\.|\\$)\\b(this|true|false|undefined|null)\\b(?!\\$)"
"match": "(?<!\\.|\\$)\\b(this|true|false|undefined|null|object)\\b(?!\\$)"
},
"type-paren-or-function-parameters": {
"name": "meta.type.paren.cover.ts",
@@ -1990,6 +1990,10 @@
"name": "storage.modifier.ts",
"match": "(?<!\\.|\\$)\\b(extends)\\b(?!\\$)"
},
{
"name": "keyword.operator.assignment.ts",
"match": "\\=(?!>)"
},
{
"include": "#type"
},
@@ -2246,10 +2250,6 @@
"name": "support.class.node.ts",
"match": "(?x)(?<!\\.|\\$)\\b(Buffer|EventEmitter|Server|Pipe|Socket|REPLServer|ReadStream|WriteStream|Stream\n |Inflate|Deflate|InflateRaw|DeflateRaw|GZip|GUnzip|Unzip|Zip)\\b(?!\\$)"
},
{
"name": "support.module.node.ts",
"match": "(?x)(?<!\\.|\\$)\\b(assert|buffer|child_process|cluster|constants|crypto|dgram|dns|domain|events|fs|http|https|net\n |os|path|punycode|querystring|readline|repl|stream|string_decoder|timers|tls|tty|url|util|vm|zlib)\\b(?!\\$)"
},
{
"match": "(?x)(?<!\\.|\\$)\\b(process)(?:(\\.)(?:\n (arch|argv|config|connected|env|execArgv|execPath|exitCode|mainModule|pid|platform|release|stderr|stdin|stdout|title|version|versions)\n |\n (abort|chdir|cwd|disconnect|exit|[sg]ete?[gu]id|send|[sg]etgroups|initgroups|kill|memoryUsage|nextTick|umask|uptime|hrtime)\n))?\\b(?!\\$)",
"captures": {
@@ -2883,7 +2883,7 @@
"regex": {
"patterns": [
{
"name": "string.regex.ts",
"name": "string.regexp.ts",
"begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(/)(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
"beginCaptures": {
"1": {
@@ -2906,7 +2906,7 @@
]
},
{
"name": "string.regex.ts",
"name": "string.regexp.ts",
"begin": "(?<![_$[:alnum:]])/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
"beginCaptures": {
"0": {
@@ -3434,5 +3434,5 @@
]
}
},
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/e47681d06a4db46d286c53b14ab0a5ab17e71cd8"
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/5c16c3ce4ede362f39fca054d7b25d85b25ecc68"
}

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

@@ -1810,7 +1810,7 @@
},
"type-builtin-literals": {
"name": "support.type.builtin.tsx",
"match": "(?<!\\.|\\$)\\b(this|true|false|undefined|null)\\b(?!\\$)"
"match": "(?<!\\.|\\$)\\b(this|true|false|undefined|null|object)\\b(?!\\$)"
},
"type-paren-or-function-parameters": {
"name": "meta.type.paren.cover.tsx",
@@ -1993,6 +1993,10 @@
"name": "storage.modifier.tsx",
"match": "(?<!\\.|\\$)\\b(extends)\\b(?!\\$)"
},
{
"name": "keyword.operator.assignment.tsx",
"match": "\\=(?!>)"
},
{
"include": "#type"
},
@@ -2249,10 +2253,6 @@
"name": "support.class.node.tsx",
"match": "(?x)(?<!\\.|\\$)\\b(Buffer|EventEmitter|Server|Pipe|Socket|REPLServer|ReadStream|WriteStream|Stream\n |Inflate|Deflate|InflateRaw|DeflateRaw|GZip|GUnzip|Unzip|Zip)\\b(?!\\$)"
},
{
"name": "support.module.node.tsx",
"match": "(?x)(?<!\\.|\\$)\\b(assert|buffer|child_process|cluster|constants|crypto|dgram|dns|domain|events|fs|http|https|net\n |os|path|punycode|querystring|readline|repl|stream|string_decoder|timers|tls|tty|url|util|vm|zlib)\\b(?!\\$)"
},
{
"match": "(?x)(?<!\\.|\\$)\\b(process)(?:(\\.)(?:\n (arch|argv|config|connected|env|execArgv|execPath|exitCode|mainModule|pid|platform|release|stderr|stdin|stdout|title|version|versions)\n |\n (abort|chdir|cwd|disconnect|exit|[sg]ete?[gu]id|send|[sg]etgroups|initgroups|kill|memoryUsage|nextTick|umask|uptime|hrtime)\n))?\\b(?!\\$)",
"captures": {
@@ -2873,7 +2873,7 @@
"regex": {
"patterns": [
{
"name": "string.regex.tsx",
"name": "string.regexp.tsx",
"begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(/)(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
"beginCaptures": {
"1": {
@@ -2896,7 +2896,7 @@
]
},
{
"name": "string.regex.tsx",
"name": "string.regexp.tsx",
"begin": "(?<![_$[:alnum:]])/(?![/*])(?=(?:[^/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+/(?![/*])[gimy]*(?!\\s*[a-zA-Z0-9_$]))",
"beginCaptures": {
"0": {
@@ -3705,5 +3705,5 @@
]
}
},
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/e47681d06a4db46d286c53b14ab0a5ab17e71cd8"
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/5c16c3ce4ede362f39fca054d7b25d85b25ecc68"
}