@codingame/monaco-editor-wrapper 3.9.2 → 3.9.3

package/dist/Scala.tmLanguage.js

@@ -106,19 +106,24 @@ var repository = {
 	},
 	exports: {
 		end: "(?<=[\\n;])",
-		begin: "\\b(export)\\s+(given\\s+)?",
+		begin: "\\b(export)\\s+",
 		beginCaptures: {
 			"1": {
 				name: "keyword.other.export.scala"
-			},
-			"2": {
-				name: "keyword.other.export.given.scala"
 			}
 		},
 		patterns: [
 			{
 				include: "#comments"
 			},
+			{
+				match: "\\b(given)\\b",
+				name: "keyword.other.export.given.scala"
+			},
+			{
+				match: "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?",
+				name: "entity.name.class.export.scala"
+			},
 			{
 				match: "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+))",
 				name: "entity.name.export.scala"
@@ -137,22 +142,45 @@ var repository = {
 				},
 				patterns: [
 					{
-						match: "(?x)\\s*(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+))\\s*(=>)\\s*(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+))\\s*",
+						match: "(?x)(given\\s)?\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*(=>)\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*",
 						captures: {
 							"1": {
-								name: "entity.name.export.renamed-from.scala"
+								name: "keyword.other.export.given.scala"
 							},
 							"2": {
-								name: "keyword.other.arrow.scala"
+								name: "entity.name.class.export.renamed-from.scala"
 							},
 							"3": {
+								name: "entity.name.export.renamed-from.scala"
+							},
+							"4": {
+								name: "keyword.other.arrow.scala"
+							},
+							"5": {
+								name: "entity.name.class.export.renamed-to.scala"
+							},
+							"6": {
 								name: "entity.name.export.renamed-to.scala"
 							}
 						}
 					},
 					{
-						match: "([^\\s.,}]+)",
-						name: "entity.name.export.scala"
+						match: "\\b(given)\\b",
+						name: "keyword.other.export.given.scala"
+					},
+					{
+						match: "(given\\s+)?(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)))",
+						captures: {
+							"1": {
+								name: "keyword.other.export.given.scala"
+							},
+							"2": {
+								name: "entity.name.class.export.scala"
+							},
+							"3": {
+								name: "entity.name.export.scala"
+							}
+						}
 					}
 				],
 				endCaptures: {
@@ -245,9 +273,6 @@ var repository = {
 			{
 				include: "#constants"
 			},
-			{
-				include: "#scala-symbol"
-			},
 			{
 				include: "#singleton-type"
 			},
@@ -255,7 +280,7 @@ var repository = {
 				include: "#inline"
 			},
 			{
-				include: "#scala-quoted"
+				include: "#scala-quoted-or-symbol"
 			},
 			{
 				include: "#char-literal"
@@ -664,15 +689,30 @@ var repository = {
 			}
 		]
 	},
-	"scala-quoted": {
+	"scala-quoted-or-symbol": {
 		patterns: [
 			{
-				match: "['$]\\{(?!')",
-				name: "punctuation.section.block.begin.scala"
+				match: "(')((?>(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)))(?!')",
+				captures: {
+					"1": {
+						name: "keyword.control.flow.staging.scala constant.other.symbol.scala"
+					},
+					"2": {
+						name: "constant.other.symbol.scala"
+					}
+				}
 			},
 			{
-				match: "'\\[(?!')",
-				name: "meta.bracket.scala"
+				match: "'(?=\\s*\\{(?!'))",
+				name: "keyword.control.flow.staging.scala"
+			},
+			{
+				match: "'(?=\\s*\\[(?!'))",
+				name: "keyword.control.flow.staging.scala"
+			},
+			{
+				match: "\\$(?=\\s*\\{)",
+				name: "keyword.control.flow.staging.scala"
 			}
 		]
 	},
@@ -757,27 +797,24 @@ var repository = {
 				}
 			},
 			{
-				match: "\\b(?:(val)|(var))\\b\\s*(?!//|/\\*)(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?=\\s*,)",
+				match: "\\b(val)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?",
 				captures: {
 					"1": {
 						name: "keyword.declaration.stable.scala"
 					},
 					"2": {
-						name: "keyword.declaration.volatile.scala"
+						name: "variable.stable.declaration.scala"
 					}
 				}
 			},
 			{
-				match: "\\b(?:(val)|(var))\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?",
+				match: "\\b(var)\\b\\s*(?!//|/\\*)((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?",
 				captures: {
 					"1": {
-						name: "keyword.declaration.stable.scala"
-					},
-					"2": {
 						name: "keyword.declaration.volatile.scala"
 					},
-					"3": {
-						name: "variable.other.declaration.scala"
+					"2": {
+						name: "variable.volatile.declaration.scala"
 					}
 				}
 			},
@@ -872,10 +909,6 @@ var repository = {
 			}
 		}
 	},
-	"scala-symbol": {
-		match: "(?>'(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+))(?!')",
-		name: "constant.other.symbol.scala"
-	},
 	"curly-braces": {
 		begin: "\\{",
 		end: "\\}",