Fix R grammar for highlighting (#5017)

These changes fix a number of syntax higlighting issues caused by our TextMate grammar for R. Addresses #3688.
posit-dev · Oct 16, 2024 · d56e898 · d56e898
1 parent af3c808
commit d56e898
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 40 deletions.
diff --git a/extensions/positron-r/syntaxes/r.tmGrammar.gen.json b/extensions/positron-r/syntaxes/r.tmGrammar.gen.json
@@ -3,19 +3,15 @@
 	"comment": "https://macromates.com/manual/en/language_grammars",
 	"name": "R",
 	"scopeName": "source.r",
-	"fileTypes": [
-		"R",
-		"r",
-		"Rprofile"
-	],
+	"fileTypes": ["R", "r", "Rprofile"],
 	"foldingStartMarker": "\\{\\s*(?:#|$)",
 	"foldingStopMarker": "^\\s*\\}",
 	"variables": {
-		"bracket": "keyword.operator",
-		"identifier": "constant.other",
+		"bracket": "meta.bracket",
+		"identifier": "variable.object",
 		"latex": "keyword.other",
 		"operator": "keyword.operator",
-		"parameter": "entity.name.tag",
+		"parameter": "variable.parameter",
 		"roxygen-tag": "keyword.other"
 	},
 	"patterns": [
@@ -57,7 +53,7 @@
 		"brackets": {
 			"patterns": [
 				{
-					"name": "keyword.operator",
+					"name": "meta.bracket",
 					"begin": "\\{",
 					"end": "\\}",
 					"patterns": [
@@ -67,15 +63,15 @@
 					]
 				},
 				{
-					"name": "keyword.operator",
+					"name": "meta.bracket",
 					"begin": "\\[",
 					"end": "\\]",
 					"patterns": [
 						{
 							"match": "([\\w.]+)\\s*(?==[^=])",
 							"captures": {
 								"1": {
-									"name": "entity.name.tag"
+									"name": "variable.parameter"
 								}
 							}
 						},
@@ -85,15 +81,15 @@
 					]
 				},
 				{
-					"name": "keyword.operator",
+					"name": "meta.bracket",
 					"begin": "\\(",
 					"end": "\\)",
 					"patterns": [
 						{
 							"match": "([\\w.]+)\\s*(?==[^=])",
 							"captures": {
 								"1": {
-									"name": "entity.name.tag"
+									"name": "variable.parameter"
 								}
 							}
 						},
@@ -179,32 +175,35 @@
 			]
 		},
 		"function-call": {
-			"name": "entity.name.function",
-			"match": "([\\w.]+)(?=\\()"
+			"match": "([\\w.]+)(?=\\()",
+			"captures": {
+				"0": { "name": "meta.function-call" },
+				"1": { "name": "entity.name.function" }
+			}
 		},
 		"function-definition": {
-			"name": "keyword",
+			"name": "meta.function.definition",
 			"begin": "(function)\\s*(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword"
+					"name": "keyword.other"
 				},
 				"2": {
-					"name": "keyword.operator"
+					"name": "meta.bracket"
 				}
 			},
 			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "keyword.operator"
+					"name": "meta.bracket"
 				}
 			},
 			"patterns": [
 				{
 					"begin": "([\\w.]+)",
 					"beginCaptures": {
 						"1": {
-							"name": "entity.name.tag"
+							"name": "variable.parameter"
 						}
 					},
 					"end": "(?=[,)])",
@@ -230,11 +229,11 @@
 			]
 		},
 		"identifier-syntactic": {
-			"name": "constant.other",
+			"name": "variable.object",
 			"match": "[\\p{L}\\p{Nl}.][\\p{L}\\p{Nl}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}.]*"
 		},
 		"identifier-quoted": {
-			"name": "constant.other",
+			"name": "variable.object",
 			"begin": "`",
 			"end": "`",
 			"patterns": [
@@ -305,10 +304,10 @@
 					"match": "(\\[)(?:(\\w+)(:{2,3}))?(\\w+)(\\(\\))?(\\])",
 					"captures": {
 						"1": {
-							"name": "keyword.operator"
+							"name": "meta.bracket"
 						},
 						"2": {
-							"name": "constant.other"
+							"name": "variable.object"
 						},
 						"3": {
 							"name": "keyword.operator"
@@ -317,10 +316,10 @@
 							"name": "entity.name.function"
 						},
 						"5": {
-							"name": "keyword.operator"
+							"name": "meta.bracket"
 						},
 						"6": {
-							"name": "keyword.operator"
+							"name": "meta.bracket"
 						}
 					}
 				},
@@ -480,7 +479,7 @@
 					"match": "^\\s*#+'"
 				},
 				{
-					"name": "keyword.operator",
+					"name": "meta.bracket",
 					"match": "[\\[\\(\\{\\}\\)\\]]"
 				},
 				{
@@ -510,7 +509,7 @@
 					"end": "(?:\\s|$)",
 					"patterns": [
 						{
-							"name": "entity.name.tag",
+							"name": "variable.parameter",
 							"match": "([\\w.]+)"
 						},
 						{

diff --git a/extensions/positron-r/syntaxes/r.tmGrammar.src.json b/extensions/positron-r/syntaxes/r.tmGrammar.src.json
@@ -3,19 +3,15 @@
 	"comment": "https://macromates.com/manual/en/language_grammars",
 	"name": "R",
 	"scopeName": "source.r",
-	"fileTypes": [
-		"R",
-		"r",
-		"Rprofile"
-	],
+	"fileTypes": ["R", "r", "Rprofile"],
 	"foldingStartMarker": "\\{\\s*(?:#|$)",
 	"foldingStopMarker": "^\\s*\\}",
 	"variables": {
-		"bracket": "keyword.operator",
-		"identifier": "constant.other",
+		"bracket": "meta.bracket",
+		"identifier": "variable.object",
 		"latex": "keyword.other",
 		"operator": "keyword.operator",
-		"parameter": "entity.name.tag",
+		"parameter": "variable.parameter",
 		"roxygen-tag": "keyword.other"
 	},
 	"patterns": [
@@ -179,15 +175,18 @@
 			]
 		},
 		"function-call": {
-			"name": "entity.name.function",
-			"match": "([\\w.]+)(?=\\()"
+			"match": "([\\w.]+)(?=\\()",
+			"captures": {
+				"0": { "name": "meta.function-call" },
+				"1": { "name": "entity.name.function" }
+			}
 		},
 		"function-definition": {
-			"name": "keyword",
+			"name": "meta.function.definition",
 			"begin": "(function)\\s*(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword"
+					"name": "keyword.other"
 				},
 				"2": {
 					"name": "{{ bracket }}"