diff --git a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json index 58ece2fd762..ee7d17a560d 100644 --- a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json +++ b/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json @@ -4,7 +4,7 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/06831946d0a23cb56be0c1ead7cab10be01306cd", + "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/1d2625adfc812f02e7dd5e7b06a859b9ef2a2de2", "name": "TypeScriptReact", "scopeName": "source.tsx", "fileTypes": [ @@ -140,6 +140,19 @@ ] }, "expression": { + "patterns": [ + { + "include": "#expressionWithoutIdentifiers" + }, + { + "include": "#identifiers" + }, + { + "include": "#expressionPunctuations" + } + ] + }, + "expressionWithoutIdentifiers": { "patterns": [ { "include": "#jsx" @@ -189,12 +202,13 @@ { "include": "#support-objects" }, - { - "include": "#identifiers" - }, { "include": "#paren-expression" - }, + } + ] + }, + "expressionPunctuations": { + "patterns": [ { "include": "#punctuation-comma" }, @@ -1247,11 +1261,6 @@ } }, "end": "(?=\\{)", - "endCaptures": { - "1": { - "name": "punctuation.definition.block.tsx" - } - }, "patterns": [ { "include": "#comment" @@ -1263,7 +1272,10 @@ "include": "#type-parameters" }, { - "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\.)(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*([,<{]|extends|implements|//|/\\*))", + "include": "#expressionWithoutIdentifiers" + }, + { + "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\.)(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)", "captures": { "1": { "name": "entity.name.type.module.tsx" @@ -1274,7 +1286,7 @@ } }, { - "match": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*([,<{]|extends|implements|//|/\\*))", + "match": "([_$[:alpha:]][_$[:alnum:]]*)", "captures": { "1": { "name": "entity.other.inherited-class.tsx" @@ -1282,7 +1294,7 @@ } }, { - "include": "#expression" + "include": "#expressionPunctuations" } ] },