From 86a9e31ccc0cc5e59a2c033fda20e1ad15d9ba84 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 10 Jun 2020 12:11:28 -0700
Subject: [PATCH] Update JS/TS grammars

---
 .../syntaxes/JavaScript.tmLanguage.json       | 20 ++++++++++++++++++-
 .../syntaxes/JavaScriptReact.tmLanguage.json  | 20 ++++++++++++++++++-
 extensions/typescript-basics/cgmanifest.json  |  2 +-
 .../syntaxes/TypeScript.tmLanguage.json       | 20 ++++++++++++++++++-
 .../syntaxes/TypeScriptReact.tmLanguage.json  | 20 ++++++++++++++++++-
 5 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index 40c0a9b33c1..8feedabc25a 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.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/84422d92e164c379ed817ef8e1d6c35b61de233e",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/fa4e0d3a918db0eab8e5c5be952f3bd649968456",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js",
 	"patterns": [
@@ -4039,6 +4039,24 @@
 				}
 			},
 			"patterns": [
+				{
+					"name": "keyword.operator.rest.js",
+					"match": "\\.\\.\\."
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?)?\\s*(:)",
+					"captures": {
+						"1": {
+							"name": "entity.name.label.js"
+						},
+						"2": {
+							"name": "keyword.operator.optional.js"
+						},
+						"3": {
+							"name": "punctuation.separator.label.js"
+						}
+					}
+				},
 				{
 					"include": "#type"
 				},
diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
index ccffc56a2d2..58b37c96aae 100644
--- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScriptReact.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/84422d92e164c379ed817ef8e1d6c35b61de233e",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/fa4e0d3a918db0eab8e5c5be952f3bd649968456",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js.jsx",
 	"patterns": [
@@ -4039,6 +4039,24 @@
 				}
 			},
 			"patterns": [
+				{
+					"name": "keyword.operator.rest.js.jsx",
+					"match": "\\.\\.\\."
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?)?\\s*(:)",
+					"captures": {
+						"1": {
+							"name": "entity.name.label.js.jsx"
+						},
+						"2": {
+							"name": "keyword.operator.optional.js.jsx"
+						},
+						"3": {
+							"name": "punctuation.separator.label.js.jsx"
+						}
+					}
+				},
 				{
 					"include": "#type"
 				},
diff --git a/extensions/typescript-basics/cgmanifest.json b/extensions/typescript-basics/cgmanifest.json
index d95b4a54e7d..623873b2ce4 100644
--- a/extensions/typescript-basics/cgmanifest.json
+++ b/extensions/typescript-basics/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "TypeScript-TmLanguage",
 					"repositoryUrl": "https://github.com/Microsoft/TypeScript-TmLanguage",
-					"commitHash": "84422d92e164c379ed817ef8e1d6c35b61de233e"
+					"commitHash": "fa4e0d3a918db0eab8e5c5be952f3bd649968456"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
index d4489999f40..6277d414777 100644
--- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScript.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/84422d92e164c379ed817ef8e1d6c35b61de233e",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/fa4e0d3a918db0eab8e5c5be952f3bd649968456",
 	"name": "TypeScript",
 	"scopeName": "source.ts",
 	"patterns": [
@@ -4088,6 +4088,24 @@
 				}
 			},
 			"patterns": [
+				{
+					"name": "keyword.operator.rest.ts",
+					"match": "\\.\\.\\."
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?)?\\s*(:)",
+					"captures": {
+						"1": {
+							"name": "entity.name.label.ts"
+						},
+						"2": {
+							"name": "keyword.operator.optional.ts"
+						},
+						"3": {
+							"name": "punctuation.separator.label.ts"
+						}
+					}
+				},
 				{
 					"include": "#type"
 				},
diff --git a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
index 663ab7d94c0..ad5ff2156fb 100644
--- a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript-basics/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/84422d92e164c379ed817ef8e1d6c35b61de233e",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/fa4e0d3a918db0eab8e5c5be952f3bd649968456",
 	"name": "TypeScriptReact",
 	"scopeName": "source.tsx",
 	"patterns": [
@@ -4039,6 +4039,24 @@
 				}
 			},
 			"patterns": [
+				{
+					"name": "keyword.operator.rest.tsx",
+					"match": "\\.\\.\\."
+				},
+				{
+					"match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?)?\\s*(:)",
+					"captures": {
+						"1": {
+							"name": "entity.name.label.tsx"
+						},
+						"2": {
+							"name": "keyword.operator.optional.tsx"
+						},
+						"3": {
+							"name": "punctuation.separator.label.tsx"
+						}
+					}
+				},
 				{
 					"include": "#type"
 				},