Updated Patch 0.0.45!

sheetalkamat · sheetalkamat · commit bfcab486432c · 2018-09-13T08:46:26.000-07:00
Updated TypeScriptReact.tmLanguage.json to microsoft/TypeScript-TmLanguage@c90418c (2018-09-10) Updated JavaScript.tmLanguage.json to microsoft/TypeScript-TmLanguage@c90418c (2018-09-10) Updated TypeScript.tmLanguage.json to microsoft/TypeScript-TmLanguage@c90418c (2018-09-10) Grammar diff: microsoft/TypeScript-TmLanguage@a9ad6eb...c90418c
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     },
     "icon": "logo.png",
     "publisher": "ms-vscode",
-    "version": "0.0.44",
+    "version": "0.0.45",
     "engines": {
         "vscode": "*"
     },
diff --git a/syntaxes/JavaScript.tmLanguage.json b/syntaxes/JavaScript.tmLanguage.json
@@ -1179,7 +1179,7 @@
 					"name": "meta.definition.function.js entity.name.function.js"
 				}
 			},
-			"end": "(?<=\\})",
+			"end": "(?=;)|(?<=\\})",
 			"patterns": [
 				{
 					"include": "#function-name"
@@ -2111,7 +2111,7 @@
 				},
 				{
 					"name": "meta.export.js",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?!\\s*:)((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b)))",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)\\b(?!(\\$)|(\\s*:))((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b)))",
 					"beginCaptures": {
 						"0": {
 							"name": "keyword.control.export.js"
@@ -2172,7 +2172,7 @@
 					"include": "#comment"
 				},
 				{
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*))\\s+(as)\\s+(?:(\\bdefault(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(\\b[_$[:alpha:]][_$[:alnum:]]*))",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*))",
 					"captures": {
 						"1": {
 							"name": "keyword.control.default.js"
@@ -5218,5 +5218,5 @@
 			"match": "\\S+"
 		}
 	},
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/a9ad6eb7b4d699117c959dbd02f7f3e2e14f1d02"
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/c90418c57af09ddc7bd6827895052a6276ef8a9f"
 }
diff --git a/syntaxes/TypeScript.tmLanguage.json b/syntaxes/TypeScript.tmLanguage.json
@@ -1175,7 +1175,7 @@
 					"name": "meta.definition.function.ts entity.name.function.ts"
 				}
 			},
-			"end": "(?<=\\})",
+			"end": "(?=;)|(?<=\\})",
 			"patterns": [
 				{
 					"include": "#function-name"
@@ -2107,7 +2107,7 @@
 				},
 				{
 					"name": "meta.export.ts",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?!\\s*:)((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b)))",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)\\b(?!(\\$)|(\\s*:))((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b)))",
 					"beginCaptures": {
 						"0": {
 							"name": "keyword.control.export.ts"
@@ -2168,7 +2168,7 @@
 					"include": "#comment"
 				},
 				{
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*))\\s+(as)\\s+(?:(\\bdefault(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(\\b[_$[:alpha:]][_$[:alnum:]]*))",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*))",
 					"captures": {
 						"1": {
 							"name": "keyword.control.default.ts"
@@ -4949,5 +4949,5 @@
 			]
 		}
 	},
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/a9ad6eb7b4d699117c959dbd02f7f3e2e14f1d02"
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/c90418c57af09ddc7bd6827895052a6276ef8a9f"
 }
diff --git a/syntaxes/TypeScriptReact.tmLanguage.json b/syntaxes/TypeScriptReact.tmLanguage.json
@@ -1178,7 +1178,7 @@
 					"name": "meta.definition.function.tsx entity.name.function.tsx"
 				}
 			},
-			"end": "(?<=\\})",
+			"end": "(?=;)|(?<=\\})",
 			"patterns": [
 				{
 					"include": "#function-name"
@@ -2110,7 +2110,7 @@
 				},
 				{
 					"name": "meta.export.tsx",
-					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?!\\s*:)((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b)))",
+					"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)\\b(?!(\\$)|(\\s*:))((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b)))",
 					"beginCaptures": {
 						"0": {
 							"name": "keyword.control.export.tsx"
@@ -2171,7 +2171,7 @@
 					"include": "#comment"
 				},
 				{
-					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*))\\s+(as)\\s+(?:(\\bdefault(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|(\\b[_$[:alpha:]][_$[:alnum:]]*))",
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|([_$[:alpha:]][_$[:alnum:]]*))",
 					"captures": {
 						"1": {
 							"name": "keyword.control.default.tsx"
@@ -5217,5 +5217,5 @@
 			"match": "\\S+"
 		}
 	},
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/a9ad6eb7b4d699117c959dbd02f7f3e2e14f1d02"
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/c90418c57af09ddc7bd6827895052a6276ef8a9f"
 }

Original file line number	Diff line number	Diff line change
`@@ -1179,7 +1179,7 @@`
`1179`	`1179`	`"name": "meta.definition.function.js entity.name.function.js"`
`1180`	`1180`	`}`
`1181`	`1181`	`},`
`1182`		`- "end": "(?<=\\})",`
	`1182`	`+ "end": "(?=;)\|(?<=\\})",`
`1183`	`1183`	`"patterns": [`
`1184`	`1184`	`{`
`1185`	`1185`	`"include": "#function-name"`
`@@ -2111,7 +2111,7 @@`
`2111`	`2111`	`},`
`2112`	`2112`	`{`
`2113`	`2113`	`"name": "meta.export.js",`
`2114`		`- "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(export)(?!\\s:)((?=\\s[\\{])\|((?=\\s[_$[:alpha:]][_$[:alnum:]](\\s\|,))(?!\\s(?:abstract\|async\|class\|const\|declare\|enum\|export\|function\|import\|interface\|let\|module\|namespace\|return\|type\|var)\\b)))",`
	`2114`	`+ "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(export)\\b(?!(\\$)\|(\\s:))((?=\\s[\\{])\|((?=\\s[_$[:alpha:]][_$[:alnum:]](\\s\|,))(?!\\s(?:abstract\|async\|class\|const\|declare\|enum\|export\|function\|import\|interface\|let\|module\|namespace\|return\|type\|var)\\b)))",`
`2115`	`2115`	`"beginCaptures": {`
`2116`	`2116`	`"0": {`
`2117`	`2117`	`"name": "keyword.control.export.js"`
`@@ -2172,7 +2172,7 @@`
`2172`	`2172`	`"include": "#comment"`
`2173`	`2173`	`},`
`2174`	`2174`	`{`
`2175`		`- "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(?:(\\bdefault)\|(\\)\|(\\b[_$[:alpha:]][_$[:alnum:]]))\\s+(as)\\s+(?:(\\bdefault(?![_$[:alnum:]])(?:(?=\\.\\.\\.)\|(?!\\.)))\|(\\b[_$[:alpha:]][_$[:alnum:]]*))",`
	`2175`	`+ "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(?:(\\bdefault)\|(\\)\|(\\b[_$[:alpha:]][_$[:alnum:]]))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)\|(?!\\.)))\|([_$[:alpha:]][_$[:alnum:]]*))",`
`2176`	`2176`	`"captures": {`
`2177`	`2177`	`"1": {`
`2178`	`2178`	`"name": "keyword.control.default.js"`
`@@ -5218,5 +5218,5 @@`
`5218`	`5218`	`"match": "\\S+"`
`5219`	`5219`	`}`
`5220`	`5220`	`},`
`5221`		`- "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/a9ad6eb7b4d699117c959dbd02f7f3e2e14f1d02"`
	`5221`	`+ "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/c90418c57af09ddc7bd6827895052a6276ef8a9f"`
`5222`	`5222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1175,7 +1175,7 @@`
`1175`	`1175`	`"name": "meta.definition.function.ts entity.name.function.ts"`
`1176`	`1176`	`}`
`1177`	`1177`	`},`
`1178`		`- "end": "(?<=\\})",`
	`1178`	`+ "end": "(?=;)\|(?<=\\})",`
`1179`	`1179`	`"patterns": [`
`1180`	`1180`	`{`
`1181`	`1181`	`"include": "#function-name"`
`@@ -2107,7 +2107,7 @@`
`2107`	`2107`	`},`
`2108`	`2108`	`{`
`2109`	`2109`	`"name": "meta.export.ts",`
`2110`		`- "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(export)(?!\\s:)((?=\\s[\\{])\|((?=\\s[_$[:alpha:]][_$[:alnum:]](\\s\|,))(?!\\s(?:abstract\|async\|class\|const\|declare\|enum\|export\|function\|import\|interface\|let\|module\|namespace\|return\|type\|var)\\b)))",`
	`2110`	`+ "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(export)\\b(?!(\\$)\|(\\s:))((?=\\s[\\{])\|((?=\\s[_$[:alpha:]][_$[:alnum:]](\\s\|,))(?!\\s(?:abstract\|async\|class\|const\|declare\|enum\|export\|function\|import\|interface\|let\|module\|namespace\|return\|type\|var)\\b)))",`
`2111`	`2111`	`"beginCaptures": {`
`2112`	`2112`	`"0": {`
`2113`	`2113`	`"name": "keyword.control.export.ts"`
`@@ -2168,7 +2168,7 @@`
`2168`	`2168`	`"include": "#comment"`
`2169`	`2169`	`},`
`2170`	`2170`	`{`
`2171`		`- "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(?:(\\bdefault)\|(\\)\|(\\b[_$[:alpha:]][_$[:alnum:]]))\\s+(as)\\s+(?:(\\bdefault(?![_$[:alnum:]])(?:(?=\\.\\.\\.)\|(?!\\.)))\|(\\b[_$[:alpha:]][_$[:alnum:]]*))",`
	`2171`	`+ "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(?:(\\bdefault)\|(\\)\|(\\b[_$[:alpha:]][_$[:alnum:]]))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)\|(?!\\.)))\|([_$[:alpha:]][_$[:alnum:]]*))",`
`2172`	`2172`	`"captures": {`
`2173`	`2173`	`"1": {`
`2174`	`2174`	`"name": "keyword.control.default.ts"`
`@@ -4949,5 +4949,5 @@`
`4949`	`4949`	`]`
`4950`	`4950`	`}`
`4951`	`4951`	`},`
`4952`		`- "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/a9ad6eb7b4d699117c959dbd02f7f3e2e14f1d02"`
	`4952`	`+ "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/c90418c57af09ddc7bd6827895052a6276ef8a9f"`
`4953`	`4953`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1178,7 +1178,7 @@`
`1178`	`1178`	`"name": "meta.definition.function.tsx entity.name.function.tsx"`
`1179`	`1179`	`}`
`1180`	`1180`	`},`
`1181`		`- "end": "(?<=\\})",`
	`1181`	`+ "end": "(?=;)\|(?<=\\})",`
`1182`	`1182`	`"patterns": [`
`1183`	`1183`	`{`
`1184`	`1184`	`"include": "#function-name"`
`@@ -2110,7 +2110,7 @@`
`2110`	`2110`	`},`
`2111`	`2111`	`{`
`2112`	`2112`	`"name": "meta.export.tsx",`
`2113`		`- "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(export)(?!\\s:)((?=\\s[\\{])\|((?=\\s[_$[:alpha:]][_$[:alnum:]](\\s\|,))(?!\\s(?:abstract\|async\|class\|const\|declare\|enum\|export\|function\|import\|interface\|let\|module\|namespace\|return\|type\|var)\\b)))",`
	`2113`	`+ "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(export)\\b(?!(\\$)\|(\\s:))((?=\\s[\\{])\|((?=\\s[_$[:alpha:]][_$[:alnum:]](\\s\|,))(?!\\s(?:abstract\|async\|class\|const\|declare\|enum\|export\|function\|import\|interface\|let\|module\|namespace\|return\|type\|var)\\b)))",`
`2114`	`2114`	`"beginCaptures": {`
`2115`	`2115`	`"0": {`
`2116`	`2116`	`"name": "keyword.control.export.tsx"`
`@@ -2171,7 +2171,7 @@`
`2171`	`2171`	`"include": "#comment"`
`2172`	`2172`	`},`
`2173`	`2173`	`{`
`2174`		`- "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(?:(\\bdefault)\|(\\)\|(\\b[_$[:alpha:]][_$[:alnum:]]))\\s+(as)\\s+(?:(\\bdefault(?![_$[:alnum:]])(?:(?=\\.\\.\\.)\|(?!\\.)))\|(\\b[_$[:alpha:]][_$[:alnum:]]*))",`
	`2174`	`+ "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)\|(?<!\\.))(?:(\\bdefault)\|(\\)\|(\\b[_$[:alpha:]][_$[:alnum:]]))\\s+(as)\\s+(?:(default(?![_$[:alnum:]])(?:(?=\\.\\.\\.)\|(?!\\.)))\|([_$[:alpha:]][_$[:alnum:]]*))",`
`2175`	`2175`	`"captures": {`
`2176`	`2176`	`"1": {`
`2177`	`2177`	`"name": "keyword.control.default.tsx"`
`@@ -5217,5 +5217,5 @@`
`5217`	`5217`	`"match": "\\S+"`
`5218`	`5218`	`}`
`5219`	`5219`	`},`
`5220`		`- "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/a9ad6eb7b4d699117c959dbd02f7f3e2e14f1d02"`
	`5220`	`+ "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/c90418c57af09ddc7bd6827895052a6276ef8a9f"`
`5221`	`5221`	`}`