Skip to content
This repository was archived by the owner on Mar 14, 2023. It is now read-only.

Commit aafbf74

Browse files
sheetalkamatsheetalkamat
committed
Updated Patch 0.0.36!
Updated JavaScript.tmLanguage.json to microsoft/TypeScript-TmLanguage@bf14f62 (2018-03-12) Updated TypeScriptReact.tmLanguage.json to microsoft/TypeScript-TmLanguage@bf14f62 (2018-03-12) Updated TypeScript.tmLanguage.json to microsoft/TypeScript-TmLanguage@bf14f62 (2018-03-12) Grammar diff: microsoft/TypeScript-TmLanguage@a7fa5b5...bf14f62
1 parent 0c8b061 commit aafbf74

File tree

4 files changed

+127
-49
lines changed

4 files changed

+127
-49
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"icon": "logo.png",
1313
"publisher": "ms-vscode",
14-
"version": "0.0.35",
14+
"version": "0.0.36",
1515
"engines": {
1616
"vscode": "*"
1717
},

‎syntaxes/JavaScript.tmLanguage.json‎

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2095,9 +2095,9 @@
20952095
"name": "keyword.operator.ternary.js"
20962096
}
20972097
},
2098-
"end": "(:)",
2098+
"end": "\\s*(:)",
20992099
"endCaptures": {
2100-
"0": {
2100+
"1": {
21012101
"name": "keyword.operator.ternary.js"
21022102
}
21032103
},
@@ -2211,21 +2211,40 @@
22112211
"paren-expression-possibly-arrow": {
22122212
"patterns": [
22132213
{
2214-
"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
2214+
"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
22152215
"beginCaptures": {
22162216
"1": {
22172217
"name": "storage.modifier.async.js"
22182218
}
22192219
},
2220-
"end": "(?<=>)(?!<)",
2220+
"end": "(?<=\\))",
22212221
"patterns": [
22222222
{
22232223
"include": "#type-parameters"
2224+
},
2225+
{
2226+
"begin": "\\(",
2227+
"beginCaptures": {
2228+
"0": {
2229+
"name": "meta.brace.round.js"
2230+
}
2231+
},
2232+
"end": "\\)",
2233+
"endCaptures": {
2234+
"0": {
2235+
"name": "meta.brace.round.js"
2236+
}
2237+
},
2238+
"patterns": [
2239+
{
2240+
"include": "#expression-inside-possibly-arrow-parens"
2241+
}
2242+
]
22242243
}
22252244
]
22262245
},
22272246
{
2228-
"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\\s*)?(\\()(?=\\s*$)",
2247+
"begin": "(?<=[(=,]|=>)\\s*(async)?\\s*(\\()(?=\\s*$)",
22292248
"beginCaptures": {
22302249
"1": {
22312250
"name": "storage.modifier.async.js"
@@ -2242,16 +2261,7 @@
22422261
},
22432262
"patterns": [
22442263
{
2245-
"include": "#expressionWithoutIdentifiers"
2246-
},
2247-
{
2248-
"include": "#function-parameters-body"
2249-
},
2250-
{
2251-
"include": "#identifiers"
2252-
},
2253-
{
2254-
"include": "#expressionPunctuations"
2264+
"include": "#expression-inside-possibly-arrow-parens"
22552265
}
22562266
]
22572267
},
@@ -2260,6 +2270,22 @@
22602270
}
22612271
]
22622272
},
2273+
"expression-inside-possibly-arrow-parens": {
2274+
"patterns": [
2275+
{
2276+
"include": "#expressionWithoutIdentifiers"
2277+
},
2278+
{
2279+
"include": "#function-parameters-body"
2280+
},
2281+
{
2282+
"include": "#identifiers"
2283+
},
2284+
{
2285+
"include": "#expressionPunctuations"
2286+
}
2287+
]
2288+
},
22632289
"paren-expression": {
22642290
"begin": "\\(",
22652291
"beginCaptures": {
@@ -4540,5 +4566,5 @@
45404566
"match": "\\S+"
45414567
}
45424568
},
4543-
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/a7fa5b585a07a83d2743aaa9600e6a28e8e0d3c9"
4569+
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/bf14f623174cf50e0b0426c3a1cda8dea1511aa5"
45444570
}

‎syntaxes/TypeScript.tmLanguage.json‎

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2091,9 +2091,9 @@
20912091
"name": "keyword.operator.ternary.ts"
20922092
}
20932093
},
2094-
"end": "(:)",
2094+
"end": "\\s*(:)",
20952095
"endCaptures": {
2096-
"0": {
2096+
"1": {
20972097
"name": "keyword.operator.ternary.ts"
20982098
}
20992099
},
@@ -2207,21 +2207,40 @@
22072207
"paren-expression-possibly-arrow": {
22082208
"patterns": [
22092209
{
2210-
"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
2210+
"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
22112211
"beginCaptures": {
22122212
"1": {
22132213
"name": "storage.modifier.async.ts"
22142214
}
22152215
},
2216-
"end": "(?<=>)(?!<)",
2216+
"end": "(?<=\\))",
22172217
"patterns": [
22182218
{
22192219
"include": "#type-parameters"
2220+
},
2221+
{
2222+
"begin": "\\(",
2223+
"beginCaptures": {
2224+
"0": {
2225+
"name": "meta.brace.round.ts"
2226+
}
2227+
},
2228+
"end": "\\)",
2229+
"endCaptures": {
2230+
"0": {
2231+
"name": "meta.brace.round.ts"
2232+
}
2233+
},
2234+
"patterns": [
2235+
{
2236+
"include": "#expression-inside-possibly-arrow-parens"
2237+
}
2238+
]
22202239
}
22212240
]
22222241
},
22232242
{
2224-
"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\\s*)?(\\()(?=\\s*$)",
2243+
"begin": "(?<=[(=,]|=>)\\s*(async)?\\s*(\\()(?=\\s*$)",
22252244
"beginCaptures": {
22262245
"1": {
22272246
"name": "storage.modifier.async.ts"
@@ -2238,16 +2257,7 @@
22382257
},
22392258
"patterns": [
22402259
{
2241-
"include": "#expressionWithoutIdentifiers"
2242-
},
2243-
{
2244-
"include": "#function-parameters-body"
2245-
},
2246-
{
2247-
"include": "#identifiers"
2248-
},
2249-
{
2250-
"include": "#expressionPunctuations"
2260+
"include": "#expression-inside-possibly-arrow-parens"
22512261
}
22522262
]
22532263
},
@@ -2256,6 +2266,22 @@
22562266
}
22572267
]
22582268
},
2269+
"expression-inside-possibly-arrow-parens": {
2270+
"patterns": [
2271+
{
2272+
"include": "#expressionWithoutIdentifiers"
2273+
},
2274+
{
2275+
"include": "#function-parameters-body"
2276+
},
2277+
{
2278+
"include": "#identifiers"
2279+
},
2280+
{
2281+
"include": "#expressionPunctuations"
2282+
}
2283+
]
2284+
},
22592285
"paren-expression": {
22602286
"begin": "\\(",
22612287
"beginCaptures": {
@@ -4241,5 +4267,5 @@
42414267
]
42424268
}
42434269
},
4244-
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/a7fa5b585a07a83d2743aaa9600e6a28e8e0d3c9"
4270+
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/bf14f623174cf50e0b0426c3a1cda8dea1511aa5"
42454271
}

‎syntaxes/TypeScriptReact.tmLanguage.json‎

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,9 +2094,9 @@
20942094
"name": "keyword.operator.ternary.tsx"
20952095
}
20962096
},
2097-
"end": "(:)",
2097+
"end": "\\s*(:)",
20982098
"endCaptures": {
2099-
"0": {
2099+
"1": {
21002100
"name": "keyword.operator.ternary.tsx"
21012101
}
21022102
},
@@ -2210,21 +2210,40 @@
22102210
"paren-expression-possibly-arrow": {
22112211
"patterns": [
22122212
{
2213-
"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync))?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
2213+
"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
22142214
"beginCaptures": {
22152215
"1": {
22162216
"name": "storage.modifier.async.tsx"
22172217
}
22182218
},
2219-
"end": "(?<=>)(?!<)",
2219+
"end": "(?<=\\))",
22202220
"patterns": [
22212221
{
22222222
"include": "#type-parameters"
2223+
},
2224+
{
2225+
"begin": "\\(",
2226+
"beginCaptures": {
2227+
"0": {
2228+
"name": "meta.brace.round.tsx"
2229+
}
2230+
},
2231+
"end": "\\)",
2232+
"endCaptures": {
2233+
"0": {
2234+
"name": "meta.brace.round.tsx"
2235+
}
2236+
},
2237+
"patterns": [
2238+
{
2239+
"include": "#expression-inside-possibly-arrow-parens"
2240+
}
2241+
]
22232242
}
22242243
]
22252244
},
22262245
{
2227-
"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\\s*)?(\\()(?=\\s*$)",
2246+
"begin": "(?<=[(=,]|=>)\\s*(async)?\\s*(\\()(?=\\s*$)",
22282247
"beginCaptures": {
22292248
"1": {
22302249
"name": "storage.modifier.async.tsx"
@@ -2241,16 +2260,7 @@
22412260
},
22422261
"patterns": [
22432262
{
2244-
"include": "#expressionWithoutIdentifiers"
2245-
},
2246-
{
2247-
"include": "#function-parameters-body"
2248-
},
2249-
{
2250-
"include": "#identifiers"
2251-
},
2252-
{
2253-
"include": "#expressionPunctuations"
2263+
"include": "#expression-inside-possibly-arrow-parens"
22542264
}
22552265
]
22562266
},
@@ -2259,6 +2269,22 @@
22592269
}
22602270
]
22612271
},
2272+
"expression-inside-possibly-arrow-parens": {
2273+
"patterns": [
2274+
{
2275+
"include": "#expressionWithoutIdentifiers"
2276+
},
2277+
{
2278+
"include": "#function-parameters-body"
2279+
},
2280+
{
2281+
"include": "#identifiers"
2282+
},
2283+
{
2284+
"include": "#expressionPunctuations"
2285+
}
2286+
]
2287+
},
22622288
"paren-expression": {
22632289
"begin": "\\(",
22642290
"beginCaptures": {
@@ -4539,5 +4565,5 @@
45394565
"match": "\\S+"
45404566
}
45414567
},
4542-
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/a7fa5b585a07a83d2743aaa9600e6a28e8e0d3c9"
4568+
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/bf14f623174cf50e0b0426c3a1cda8dea1511aa5"
45434569
}

0 commit comments

Comments
 (0)