From 336108d9565db36dfa7e72b898e13f93a8ac0aea Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Mon, 30 Sep 2024 17:07:23 +0200
Subject: [PATCH] chore: mess about

---
 .gitignore                        |  3 ++-
 syntaxes/muscript.tmLanguage.json | 30 +++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 67dfeb3..919c87c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
-*.vsix
\ No newline at end of file
+*.vsix
+/.idea
\ No newline at end of file
diff --git a/syntaxes/muscript.tmLanguage.json b/syntaxes/muscript.tmLanguage.json
index 999d0e6..6304f28 100644
--- a/syntaxes/muscript.tmLanguage.json
+++ b/syntaxes/muscript.tmLanguage.json
@@ -4,7 +4,7 @@
 	"name": "muScript",
 	"patterns": [
 		{
-			"name": "meta.preprocessor",
+			"name": "meta.preprocessor.include.muscript",
 			"match": "^\\s*#\\w+"
 		},
 		{
@@ -48,9 +48,14 @@
 							"name": "variable.other.muscript"
 						}
 					},
-					"name": "meta.literals",
+					"name": "variable.name",
 					"match": "\\b([a-zA-Z_$][a-zA-Z0-9_$]*)\\b"
 				},
+				{
+					"name": "variable.name",
+					"begin": "`",
+					"end": "`"
+				},
 				{
 					"captures": {
 						"0": {
@@ -116,19 +121,22 @@
 			"patterns": [
 				{
 					"name": "meta.function.muscript",
-					"begin": "\\{\\s*(?:([a-zA-Z_$][a-zA-Z0-9_$]*)(?:, )?)*\\s*->",
-					"beginCaptures": {
-						"1": {
-							"name": "variable.parameter"
-						}
-					},
-					"end": "\\}",
+					"begin": "\\{",
+					"end": "->",
 					"patterns": [
 						{
-							"include": "#identifiers"
+							"captures": {
+								"0": {
+									"name": "variable.other.muscript"
+								}
+							},
+							"name": "variable.parameter.muscript",
+							"match": "\\b([a-zA-Z_$][a-zA-Z0-9_$]*)\\b"
 						},
 						{
-							"include": "#expressions"
+							"name": "variable.parameter.muscript",
+							"begin": "`",
+							"end": "`"
 						}
 					]
 				}