From 8d2621e952b5ba223dcae6e47b869f228e0e9d32 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Tue, 6 Oct 2020 11:20:42 +0200
Subject: [PATCH] Update grammars

---
 extensions/java/cgmanifest.json               |  4 +--
 extensions/java/syntaxes/java.tmLanguage.json | 34 ++++++++++++++-----
 extensions/typescript-basics/cgmanifest.json  |  2 +-
 .../syntaxes/TypeScript.tmLanguage.json       |  2 +-
 .../syntaxes/TypeScriptReact.tmLanguage.json  |  2 +-
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/extensions/java/cgmanifest.json b/extensions/java/cgmanifest.json
index 68e15fac2df..88521b95258 100644
--- a/extensions/java/cgmanifest.json
+++ b/extensions/java/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "atom/language-java",
 					"repositoryUrl": "https://github.com/atom/language-java",
-					"commitHash": "f631536a4137d65b622f01cebeac72345f9e6f70"
+					"commitHash": "2bd3e55a72b08e171f811a2445343e2df9d89b71"
 				}
 			},
 			"license": "MIT",
-			"version": "0.31.5"
+			"version": "0.32.0"
 		}
 	],
 	"version": 1
diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json
index 11b6cf50a93..91716ded5f8 100644
--- a/extensions/java/syntaxes/java.tmLanguage.json
+++ b/extensions/java/syntaxes/java.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/atom/language-java/commit/f631536a4137d65b622f01cebeac72345f9e6f70",
+	"version": "https://github.com/atom/language-java/commit/2bd3e55a72b08e171f811a2445343e2df9d89b71",
 	"name": "Java",
 	"scopeName": "source.java",
 	"patterns": [
@@ -40,7 +40,7 @@
 					"name": "invalid.deprecated.package_name_not_lowercase.java"
 				},
 				{
-					"match": "(?x)\\b(?<!\\$)\n(abstract|assert|boolean|break|byte|case|catch|char|class|\nconst|continue|default|do|double|else|enum|extends|final|\nfinally|float|for|goto|if|implements|import|instanceof|int|\ninterface|long|native|new|package|private|protected|public|\nreturn|short|static|strictfp|super|switch|syncronized|this|\nthrow|throws|transient|try|void|volatile|while|\ntrue|false|null)\\b",
+					"match": "(?x)\\b(?<!\\$)\n(abstract|assert|boolean|break|byte|case|catch|char|class|\nconst|continue|default|do|double|else|enum|extends|final|\nfinally|float|for|goto|if|implements|import|instanceof|int|\ninterface|long|native|new|non-sealed|package|permits|private|protected|public|\nreturn|sealed|short|static|strictfp|super|switch|syncronized|this|\nthrow|throws|transient|try|void|volatile|while|yield|\ntrue|false|null)\\b",
 					"name": "invalid.illegal.character_not_allowed_here.java"
 				},
 				{
@@ -84,7 +84,7 @@
 					"name": "invalid.illegal.character_not_allowed_here.java"
 				},
 				{
-					"match": "(?x)\\b(?<!\\$)\n(abstract|assert|boolean|break|byte|case|catch|char|class|\nconst|continue|default|do|double|else|enum|extends|final|\nfinally|float|for|goto|if|implements|import|instanceof|int|\ninterface|long|native|new|package|private|protected|public|\nreturn|short|static|strictfp|super|switch|syncronized|this|\nthrow|throws|transient|try|void|volatile|while|\ntrue|false|null)\\b",
+					"match": "(?x)\\b(?<!\\$)\n(abstract|assert|boolean|break|byte|case|catch|char|class|\nconst|continue|default|do|double|else|enum|extends|final|\nfinally|float|for|goto|if|implements|import|instanceof|int|\ninterface|long|native|new|non-sealed|package|permits|private|protected|public|\nreturn|sealed|short|static|strictfp|super|switch|syncronized|this|\nthrow|throws|transient|try|void|volatile|while|yield|\ntrue|false|null)\\b",
 					"name": "invalid.illegal.character_not_allowed_here.java"
 				},
 				{
@@ -307,7 +307,7 @@
 			]
 		},
 		"class": {
-			"begin": "(?=\\w?[\\w\\s]*\\b(?:class|(?<!@)interface|enum)\\s+[\\w$]+)",
+			"begin": "(?=\\w?[\\w\\s-]*\\b(?:class|(?<!@)interface|enum)\\s+[\\w$]+)",
 			"end": "}",
 			"endCaptures": {
 				"0": {
@@ -344,7 +344,7 @@
 							"name": "storage.modifier.extends.java"
 						}
 					},
-					"end": "(?={|implements)",
+					"end": "(?={|implements|permits)",
 					"name": "meta.definition.class.inherited.classes.java",
 					"patterns": [
 						{
@@ -362,7 +362,7 @@
 							"name": "storage.modifier.implements.java"
 						}
 					},
-					"end": "(?=\\s*extends|\\{)",
+					"end": "(?=\\s*extends|permits|\\{)",
 					"name": "meta.definition.class.implemented.interfaces.java",
 					"patterns": [
 						{
@@ -373,6 +373,24 @@
 						}
 					]
 				},
+				{
+					"begin": "(permits)\\s",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.permits.java"
+						}
+					},
+					"end": "(?=\\s*extends|implements|\\{)",
+					"name": "meta.definition.class.permits.classes.java",
+					"patterns": [
+						{
+							"include": "#object-types-inherited"
+						},
+						{
+							"include": "#comments"
+						}
+					]
+				},
 				{
 					"begin": "{",
 					"beginCaptures": {
@@ -899,7 +917,7 @@
 					"name": "keyword.control.ternary.java"
 				},
 				{
-					"match": "\\b(return|break|case|continue|default|do|while|for|switch|if|else)\\b",
+					"match": "\\b(return|yield|break|case|continue|default|do|while|for|switch|if|else)\\b",
 					"name": "keyword.control.java"
 				},
 				{
@@ -1542,7 +1560,7 @@
 			]
 		},
 		"storage-modifiers": {
-			"match": "\\b(public|private|protected|static|final|native|synchronized|abstract|threadsafe|transient|volatile|default|strictfp)\\b",
+			"match": "\\b(public|private|protected|static|final|native|synchronized|abstract|threadsafe|transient|volatile|default|strictfp|sealed|non-sealed)\\b",
 			"name": "storage.modifier.java"
 		},
 		"strings": {
diff --git a/extensions/typescript-basics/cgmanifest.json b/extensions/typescript-basics/cgmanifest.json
index 752a8371552..3a42696ad71 100644
--- a/extensions/typescript-basics/cgmanifest.json
+++ b/extensions/typescript-basics/cgmanifest.json
@@ -15,4 +15,4 @@
 		}
 	],
 	"version": 1
-}
+}
\ No newline at end of file
diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
index e81346faced..f22ebbf2041 100644
--- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
@@ -5484,4 +5484,4 @@
 			]
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
index 249236f4363..3a6fd84e934 100644
--- a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
@@ -5737,4 +5737,4 @@
 			"match": "\\S+"
 		}
 	}
-}
+}
\ No newline at end of file