From bfcab486432cea6422d1ea361d8ab01e3cab37e9 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 13 Sep 2018 08:45:59 -0700
Subject: [PATCH] Updated Patch 0.0.45! 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: https://github.com/Microsoft/TypeScript-TmLanguage/compare/a9ad6eb7b4d699117c959dbd02f7f3e2e14f1d02...c90418c57af09ddc7bd6827895052a6276ef8a9f
---
 package.json                             | 2 +-
 syntaxes/JavaScript.tmLanguage.json      | 8 ++++----
 syntaxes/TypeScript.tmLanguage.json      | 8 ++++----
 syntaxes/TypeScriptReact.tmLanguage.json | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index c2a075a..673b663 100644
--- 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
index 773beb6..7dc32c9 100644
--- 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"
 }
\ No newline at end of file
diff --git a/syntaxes/TypeScript.tmLanguage.json b/syntaxes/TypeScript.tmLanguage.json
index 9c29b83..234c964 100644
--- 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"
 }
\ No newline at end of file
diff --git a/syntaxes/TypeScriptReact.tmLanguage.json b/syntaxes/TypeScriptReact.tmLanguage.json
index 5038d53..fdd021a 100644
--- 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"
 }
\ No newline at end of file