feat: update language pack grammars

eclipse · Mar 25, 2024 · a13a348 · a13a348
1 parent b1552cc
commit a13a348
Show file tree

Hide file tree

Showing 29 changed files with 7,557 additions and 1,116 deletions.
diff --git a/org.eclipse.tm4e.language_pack/README.md b/org.eclipse.tm4e.language_pack/README.md
diff --git a/org.eclipse.tm4e.language_pack/about.html b/org.eclipse.tm4e.language_pack/about.html
diff --git a/org.eclipse.tm4e.language_pack/syntaxes/csharp/csharp.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/csharp/csharp.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/dotnet/csharp-tmLanguage/commit/6666eb1d5e6fb565a4110d6db645cc534fb3c6d2",
+	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/7a7482ffc72a6677a87eb1ed76005593a4f7f131",
 	"name": "C#",
 	"scopeName": "source.cs",
 	"patterns": [
@@ -164,6 +164,9 @@
 				{
 					"include": "#comment"
 				},
+				{
+					"include": "#storage-modifier"
+				},
 				{
 					"include": "#property-declaration"
 				},
@@ -176,6 +179,9 @@
 				{
 					"include": "#method-declaration"
 				},
+				{
+					"include": "#operator-declaration"
+				},
 				{
 					"include": "#attribute-section"
 				},
@@ -232,7 +238,7 @@
 					"include": "#try-statement"
 				},
 				{
-					"include": "#checked-unchecked-statement"
+					"include": "#expression-operator-expression"
 				},
 				{
 					"include": "#context-control-statement"
@@ -1050,6 +1056,18 @@
 					"name": "storage.type.struct.cs",
 					"match": "\\bstruct\\b"
 				},
+				{
+					"name": "keyword.other.constraint.default.cs",
+					"match": "\\bdefault\\b"
+				},
+				{
+					"name": "keyword.other.constraint.notnull.cs",
+					"match": "\\bnotnull\\b"
+				},
+				{
+					"name": "keyword.other.constraint.unmanaged.cs",
+					"match": "\\bunmanaged\\b"
+				},
 				{
 					"match": "(new)\\s*(\\()\\s*(\\))",
 					"captures": {
@@ -2632,7 +2650,7 @@
 					},
 					"patterns": [
 						{
-							"begin": "\\G",
+							"begin": "(?=[^;\\)])",
 							"end": "(?=;|\\))",
 							"patterns": [
 								{
@@ -2695,22 +2713,25 @@
 							"include": "#intrusive"
 						},
 						{
-							"match": "(?x)\n(?:\n  (\\bvar\\b)|\n  (?<type_name>\n    (?:\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*\\?\\s*)? # nullable suffix?\n      (?:\\s* # array suffix?\n        \\[\n          (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n        \\]\n        \\s*\n        (?:\\?)? # arrays can be nullable reference types\n        \\s*\n      )*\n    )\n  )\n)\\s+\n(\\g<identifier>)\\s+\n\\b(in)\\b",
+							"match": "(?x)\n(?:\n  (?:(\\bref)\\s+)?(\\bvar\\b)| # ref local\n  (?<type_name>\n    (?:\n      (?:ref\\s+)?   # ref local\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*\\?\\s*)? # nullable suffix?\n      (?:\\s* # array suffix?\n        \\[\n          (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n        \\]\n        \\s*\n        (?:\\?)? # arrays can be nullable reference types\n        \\s*\n      )*\n    )\n  )\n)\\s+\n(\\g<identifier>)\\s+\n\\b(in)\\b",
 							"captures": {
 								"1": {
-									"name": "storage.type.var.cs"
+									"name": "storage.modifier.ref.cs"
 								},
 								"2": {
+									"name": "storage.type.var.cs"
+								},
+								"3": {
 									"patterns": [
 										{
 											"include": "#type"
 										}
 									]
 								},
-								"7": {
+								"8": {
 									"name": "entity.name.variable.local.cs"
 								},
-								"8": {
+								"9": {
 									"name": "keyword.control.loop.in.cs"
 								}
 							}
@@ -3824,7 +3845,7 @@
 		},
 		"char-character-escape": {
 			"name": "constant.character.escape.cs",
-			"match": "\\\\(['\"\\\\0abfnrtv]|x[0-9a-fA-F]{1,4}|u[0-9a-fA-F]{4})"
+			"match": "\\\\(x[0-9a-fA-F]{1,4}|u[0-9a-fA-F]{4}|.)"
 		},
 		"string-literal": {
 			"name": "string.quoted.double.cs",
@@ -3851,7 +3872,7 @@
 		},
 		"string-character-escape": {
 			"name": "constant.character.escape.cs",
-			"match": "\\\\(['\"\\\\0abfnrtv]|x[0-9a-fA-F]{1,4}|U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4})"
+			"match": "\\\\(x[0-9a-fA-F]{1,4}|U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4}|.)"
 		},
 		"verbatim-string-literal": {
 			"name": "string.quoted.double.cs",

diff --git a/org.eclipse.tm4e.language_pack/syntaxes/dart/dart.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/dart/dart.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/dart-lang/dart-syntax-highlight/commit/bd0079ba7ca85cdd6400a8a467e532b539d0f285",
+	"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/0a6648177bdbb91a4e1a38c16e57ede0ccba4f18",
 	"name": "Dart",
 	"scopeName": "source.dart",
 	"patterns": [
@@ -90,15 +90,7 @@
 					"end": "```"
 				},
 				{
-					"match": "(`.*?`)",
-					"captures": {
-						"0": {
-							"name": "variable.other.source.dart"
-						}
-					}
-				},
-				{
-					"match": "(`.*?`)",
+					"match": "(`[^`]+?`)",
 					"captures": {
 						"0": {
 							"name": "variable.other.source.dart"
@@ -395,6 +387,7 @@
 		"string-interp": {
 			"patterns": [
 				{
+					"name": "string.interpolated.expression.dart",
 					"match": "\\$([a-zA-Z0-9_]+)",
 					"captures": {
 						"1": {
@@ -408,8 +401,7 @@
 					"end": "\\}",
 					"patterns": [
 						{
-							"include": "#constants-and-special-vars",
-							"name": "variable.parameter.dart"
+							"include": "#constants-and-special-vars"
 						},
 						{
 							"include": "#strings"

diff --git a/org.eclipse.tm4e.language_pack/syntaxes/fsharp/fsharp.tmLanguage.json b/org.eclipse.tm4e.language_pack/syntaxes/fsharp/fsharp.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/ionide/ionide-fsgrammar/commit/078bbf85225b82de3ae4c2db7ee74d9239b249ce",
+	"version": "https://github.com/ionide/ionide-fsgrammar/commit/7d029a46f17637228b2ee85dd02e511c3e8039b3",
 	"name": "fsharp",
 	"scopeName": "source.fsharp",
 	"patterns": [
@@ -574,6 +574,11 @@
 							"name": "fast-capture.comment.line.double-slash.fsharp",
 							"match": "//"
 						},
+						{
+							"comments": "Capture (*) when inside of (* *) so that it doesn't prematurely end the comment block.",
+							"name": "fast-capture.comment.line.mul-operator.fsharp",
+							"match": "\\(\\*\\)"
+						},
 						{
 							"include": "#comments"
 						}
@@ -600,7 +605,7 @@
 				},
 				{
 					"name": "comment.line.double-slash.fsharp",
-					"match": "(?<![!%&+-.<=>?@^|/])//(?![!%&+-.<=>?@^|]).*$"
+					"match": "(?<![!%&+-.<=>?@^|/])//(.*$)"
 				}
 			]
 		},
@@ -630,7 +635,7 @@
 		},
 		"abstract_definition": {
 			"name": "abstract.definition.fsharp",
-			"begin": "\\b(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(:)",
+			"begin": "\\b(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(<)?",
 			"end": "\\s*(with)\\b|=|$",
 			"beginCaptures": {
 				"1": {
@@ -676,7 +681,7 @@
 					}
 				},
 				{
-					"match": "(?!with|get|set\\b)\\b([\\w0-9'`^._]+)",
+					"match": "(?!with|get|set\\b)\\s*([\\w0-9'`^._]+)",
 					"comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
 					"captures": {
 						"1": {

diff --git a/org.eclipse.tm4e.language_pack/syntaxes/git-base/git-commit.language-configuration.json b/org.eclipse.tm4e.language_pack/syntaxes/git-base/git-commit.language-configuration.json
@@ -7,5 +7,14 @@
 		["{", "}"],
 		["[", "]"],
 		["(", ")"]
+	],
+	"autoClosingPairs": [
+		{ "open": "{", "close": "}" },
+		{ "open": "[", "close": "]" },
+		{ "open": "(", "close": ")" },
+		{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
+		{ "open": "\"", "close": "\"", "notIn": ["string"] },
+		{ "open": "`", "close": "`", "notIn": ["string", "comment"] },
+		{ "open": "/**", "close": " */", "notIn": ["string"] }
 	]
-}
+}
diff --git a/org.eclipse.tm4e.language_pack/syntaxes/git-base/git-rebase.language-configuration.json b/org.eclipse.tm4e.language_pack/syntaxes/git-base/git-rebase.language-configuration.json
@@ -7,5 +7,14 @@
 		["{", "}"],
 		["[", "]"],
 		["(", ")"]
+	],
+	"autoClosingPairs": [
+		{ "open": "{", "close": "}" },
+		{ "open": "[", "close": "]" },
+		{ "open": "(", "close": ")" },
+		{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
+		{ "open": "\"", "close": "\"", "notIn": ["string"] },
+		{ "open": "`", "close": "`", "notIn": ["string", "comment"] },
+		{ "open": "/**", "close": " */", "notIn": ["string"] }
 	]
-}
+}
diff --git a/org.eclipse.tm4e.language_pack/syntaxes/git-base/ignore.language-configuration.json b/org.eclipse.tm4e.language_pack/syntaxes/git-base/ignore.language-configuration.json
@@ -1,5 +1,14 @@
 {
 	"comments": {
 		"lineComment": "#",
-	}
+	},
+	"autoClosingPairs": [
+		{ "open": "{", "close": "}" },
+		{ "open": "[", "close": "]" },
+		{ "open": "(", "close": ")" },
+		{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
+		{ "open": "\"", "close": "\"", "notIn": ["string"] },
+		{ "open": "`", "close": "`", "notIn": ["string", "comment"] },
+		{ "open": "/**", "close": " */", "notIn": ["string"] }
+	]
 }