From 152703a401938373f05b767312b835f05054b774 Mon Sep 17 00:00:00 2001
From: sebastiaanspeck <shem.speck@gmail.com>
Date: Mon, 13 Apr 2026 14:52:20 +0200
Subject: [PATCH 01/17] Apply fixes for Magik language

---
 src/languages/magik.js                        | 35 +++++++++--------
 tests/languages/magik/constant_feature.test   | 28 ++++++-------
 .../languages/magik/declaration_feature.test  |  8 ++--
 tests/languages/magik/function_feature.test   |  2 +
 .../magik/global-reference_feature.test       |  6 +--
 .../magik/keyword-variable_feature.test       | 11 ++++++
 tests/languages/magik/keyword_feature.test    |  2 -
 tests/languages/magik/pragma.test             | 39 -------------------
 tests/languages/magik/pragma_feature.test     | 13 +++++++
 tests/languages/magik/slot_feature.test       |  5 ++-
 tests/languages/magik/symbol_feature.test     |  2 +
 tests/languages/magik/unset_feature.test      |  4 +-
 tests/languages/magik/variable_feature.test   |  4 +-
 13 files changed, 76 insertions(+), 83 deletions(-)
 create mode 100644 tests/languages/magik/keyword-variable_feature.test
 delete mode 100644 tests/languages/magik/pragma.test
 create mode 100644 tests/languages/magik/pragma_feature.test

diff --git a/src/languages/magik.js b/src/languages/magik.js
index 3e86314a05..2b5e3860e7 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -22,28 +22,18 @@ export default {
 			greedy: true
 		},
 
-		'declaration': [
-			{ pattern: /(\b_package\s+).*/i, lookbehind: true },
-			{ pattern: /(\b_global\s+)(?!_)\w+/i, lookbehind: true },
-			{ pattern: /(\b_constant\s+)[a-z_]+/i, lookbehind: true }
-		],
-
 		'pragma': {
 			pattern: /_pragma.*/,
-			alias: 'prolog',
-			inside: {
-				'modifier': /classify_level|topic|usage/,
-				'pragma-punctuation': { pattern: /[={},]/ }
-			}
+			alias: 'prolog'
 		},
 
-		'number': /\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b/i,
-
 		'symbol': {
 			pattern: /(^|\W):(?:\|[^|]*\||\\.|[\w?!])+/,
 			lookbehind: true
 		},
 
+		'number': /\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b/i,
+
 		'operator': [
 			/_(?:and|andif|or|orif|xor)<</i, /(?:\*\*\^?|\*\^?|\/\^?|_mod\^?|_div\^?|-\^?|\+\^?)<</i, /\^?<</, // assignment operators
 			/<>/, />=/, /<=/, /</, /~=/, /=/, // relational operators
@@ -56,8 +46,19 @@ export default {
 			{ pattern: /\b_(?:div|mod)\b/i, alias: 'keyword' } // math
 		],
 
+		'declaration': [
+			{ pattern: /(\b_package\s+).*/i, lookbehind: true },
+			{ pattern: /(\b_global\s+)(?!_)\w+/i, lookbehind: true },
+			{ pattern: /(\b_constant\s+)(?!_)\w+/i, lookbehind: true },
+			{ pattern: /(\b_local\s+)(?!_)\w+/i, lookbehind: true }
+		],
+
+		'keyword-variable': {
+			pattern: /\b_(?:class|dynamic|global|import|local)\b/i,
+			alias: 'keyword'
+		},
+
 		'keyword': [
-			/\b_(?:class|dynamic|global|import|local)\b/i, // variables
 			/\b_(?:block|endblock)\b/i, // block
 			/\b_(?:elif|else|endif|if|then)\b/i, // if
 			/\b_(?:and|andif|not|or|orif|xor)\b/i, // logical operators
@@ -75,7 +76,7 @@ export default {
 		],
 
 		'slot': {
-			pattern: /(^|[\s({])\.\s*[a-z_]+/i,
+			pattern: /(^|[\s({])\.\s*[a-z][\w?!]+/i,
 			lookbehind: true
 		},
 
@@ -111,8 +112,8 @@ export default {
 		'function': [
 			/\b_(?:abstract|endmethod|iter|method|private)\b/i, // method keywords
 			/\b_(?:endproc|proc)\b/i, // procedure
-			{ pattern: /(\.)\s*\|[a-z_]\w*[!?]?\|/, lookbehind: true }, // encased |methodNames|
-			{ pattern: /(\.)\s*[a-z_]\w*[!?]?/, lookbehind: true }, // methods
+			{ pattern: /(\.)\s*\|[a-z][\w?!]*\|/, lookbehind: true }, // encased |methodNames|
+			{ pattern: /(\.)\s*[a-z][\w?!]*/, lookbehind: true }, // methods
 		],
 
 		'variable': [
diff --git a/tests/languages/magik/constant_feature.test b/tests/languages/magik/constant_feature.test
index 85f803cfd7..b577aa8fc0 100644
--- a/tests/languages/magik/constant_feature.test
+++ b/tests/languages/magik/constant_feature.test
@@ -1,21 +1,23 @@
-_constant something
-_global _constant something
-_global _constant gis_program_manager << _unset
+_block
+	_constant something << _unset
+	_constant max_size << 1
+	_constant _local max_size << 1
+	_local _constant max_size << 1
+_endblock
 _global _constant !current_view! << _unset
-_constant max_size << 1
-_constant _local max_size << 1
-_local _constant max_size << 1
+_global _constant gis_program_manager << _unset
 
 ----------------------------------------------------
 
 [
-	["constant", "_constant"], ["declaration", "something"],
-    ["keyword", "_global"], ["constant", "_constant"], ["declaration", "something"],
-	["keyword", "_global"], ["constant", "_constant"], ["declaration", "gis_program_manager"], ["operator", "<<"], ["unset", "_unset"],
-	["keyword", "_global"], ["constant", "_constant"], ["variable", "!current_view!"], ["operator", "<<"], ["unset", "_unset"],
-	["constant", "_constant"], ["declaration", "max_size"], ["operator", "<<"], ["number", "1"],
-	["constant", "_constant"], ["declaration", "_local"], ["variable", "max_size"], ["operator", "<<"], ["number", "1"],
-	["keyword", "_local"], ["constant", "_constant"], ["declaration", "max_size"], ["operator", "<<"], ["number", "1"]
+	["keyword", "_block"],
+		["constant", "_constant"], ["declaration", "something"], ["operator", "<<"], ["unset", "_unset"],
+		["constant", "_constant"], ["declaration", "max_size"], ["operator", "<<"], ["number", "1"],
+		["constant", "_constant"], ["keyword-variable", "_local"], ["declaration", "max_size"], ["operator", "<<"], ["number", "1"],
+		["keyword-variable", "_local"], ["constant", "_constant"], ["declaration", "max_size"], ["operator", "<<"], ["number", "1"],
+	["keyword", "_endblock"],
+	["keyword-variable", "_global"], ["constant", "_constant"], ["variable", "!current_view!"], ["operator", "<<"], ["unset", "_unset"],
+	["keyword-variable", "_global"], ["constant", "_constant"], ["declaration", "gis_program_manager"], ["operator", "<<"], ["unset", "_unset"]
 ]
 
 ----------------------------------------------------
diff --git a/tests/languages/magik/declaration_feature.test b/tests/languages/magik/declaration_feature.test
index e8ad36922d..6db4f1afcb 100644
--- a/tests/languages/magik/declaration_feature.test
+++ b/tests/languages/magik/declaration_feature.test
@@ -1,4 +1,5 @@
 _package user
+_global some_var
 _global some_var; some_var << 1
 _constant yippie << 2
 _global _constant !done_meas_follow_nodes! << _unset
@@ -7,9 +8,10 @@ _global _constant !done_meas_follow_nodes! << _unset
 
 [
 	["builtin", "_package"], ["declaration", "user"],
-    ["keyword", "_global"], ["declaration", "some_var"], ["punctuation", ";"], ["variable", "some_var"], ["operator", "<<"], ["number", "1"],
-    ["constant", "_constant"], ["declaration", "yippie"], ["operator", "<<"], ["number", "2"],
-    ["keyword", "_global"], ["constant", "_constant"], ["variable", "!done_meas_follow_nodes!"], ["operator", "<<"], ["unset", "_unset"]
+	["keyword-variable", "_global"], ["declaration", "some_var"],
+	["keyword-variable", "_global"], ["declaration", "some_var"], ["punctuation", ";"], ["variable", "some_var"], ["operator", "<<"], ["number", "1"],
+	["constant", "_constant"], ["declaration", "yippie"], ["operator", "<<"], ["number", "2"],
+	["keyword-variable", "_global"], ["constant", "_constant"], ["variable", "!done_meas_follow_nodes!"], ["operator", "<<"], ["unset", "_unset"]
 ]
 
 ----------------------------------------------------
diff --git a/tests/languages/magik/function_feature.test b/tests/languages/magik/function_feature.test
index 03e1a6ad73..1844126f20 100644
--- a/tests/languages/magik/function_feature.test
+++ b/tests/languages/magik/function_feature.test
@@ -6,6 +6,7 @@ variable.method_name?
 variable.method_name()
 variable.|methodName|()
 object.method
+object.int!method
 object.getName
 object.|getName|
 object.method<< _unset
@@ -26,6 +27,7 @@ _clone.init()
 	["variable", "variable"], ".", ["function", "method_name"], ["punctuation", "("], ["punctuation", ")"],
 	["variable", "variable"], ".", ["function", "|methodName|"], ["punctuation", "("], ["punctuation", ")"],
 	["variable", "object"], ".", ["function", "method"],
+	["variable", "object"], ".", ["function", "int!method"],
 	["variable", "object"], ".", ["function", "getName"],
 	["variable", "object"], ".", ["function", "|getName|"],
 	["variable", "object"], ".", ["function", "method"], ["operator", "<<"], ["unset", "_unset"],
diff --git a/tests/languages/magik/global-reference_feature.test b/tests/languages/magik/global-reference_feature.test
index 3f6ff002af..65510e5021 100644
--- a/tests/languages/magik/global-reference_feature.test
+++ b/tests/languages/magik/global-reference_feature.test
@@ -7,9 +7,9 @@
 
 [
 	["global-reference", "@gis_program_manager"],
-    ["punctuation", "("], ["global-reference", "@gis_program_manager"], ["punctuation", ")"],
-    ["punctuation", "{"], ["global-reference", "@gis_program_manager"], ["punctuation", "}"],
-    ["punctuation", ","], ["global-reference", "@gis_program_manager"]
+	["punctuation", "("], ["global-reference", "@gis_program_manager"], ["punctuation", ")"],
+	["punctuation", "{"], ["global-reference", "@gis_program_manager"], ["punctuation", "}"],
+	["punctuation", ","], ["global-reference", "@gis_program_manager"]
 ]
 
 ----------------------------------------------------
diff --git a/tests/languages/magik/keyword-variable_feature.test b/tests/languages/magik/keyword-variable_feature.test
new file mode 100644
index 0000000000..363ecab2a3
--- /dev/null
+++ b/tests/languages/magik/keyword-variable_feature.test
@@ -0,0 +1,11 @@
+_class _dynamic _global _import _local
+
+----------------------------------------------------
+
+[
+	["keyword-variable", "_class"], ["keyword-variable", "_dynamic"], ["keyword-variable", "_global"], ["keyword-variable", "_import"], ["keyword-variable", "_local"]
+]
+
+----------------------------------------------------
+
+Checks for keyword variables.
diff --git a/tests/languages/magik/keyword_feature.test b/tests/languages/magik/keyword_feature.test
index caaa6600af..b7d0272536 100644
--- a/tests/languages/magik/keyword_feature.test
+++ b/tests/languages/magik/keyword_feature.test
@@ -1,4 +1,3 @@
-_class _dynamic _global _import _local
 _block _endblock
 _elif _else _endif _if _then
 _and _andif _not _or _orif _xor
@@ -17,7 +16,6 @@ _allresults _gather _optional _scatter
 ----------------------------------------------------
 
 [
-	["keyword", "_class"], ["keyword", "_dynamic"], ["keyword", "_global"], ["keyword", "_import"], ["keyword", "_local"],
 	["keyword", "_block"], ["keyword", "_endblock"],
  	["keyword", "_elif"], ["keyword", "_else"], ["keyword", "_endif"], ["keyword", "_if"], ["keyword", "_then"],
  	["keyword", "_and"], ["keyword", "_andif"], ["keyword", "_not"], ["keyword", "_or"], ["keyword", "_orif"], ["keyword", "_xor"],
diff --git a/tests/languages/magik/pragma.test b/tests/languages/magik/pragma.test
deleted file mode 100644
index 6d2674ab8f..0000000000
--- a/tests/languages/magik/pragma.test
+++ /dev/null
@@ -1,39 +0,0 @@
-_pragma(classify_level=basic, usage=restricted, topic=prism)
-_pragma(classify_level=advanced, usage=unrestricted, topic=different_prism)
-
-----------------------------------------------------
-
-[
-	["pragma", [
-		"_pragma(",
-		["modifier", "classify_level"],
-		["pragma-punctuation", "="],
-		"basic",
-		["pragma-punctuation", ","],
-		["modifier", "usage"],
-		["pragma-punctuation", "="],
-		"restricted",
-		["pragma-punctuation", ","],
-		["modifier", "topic"],
-		["pragma-punctuation", "="],
-		"prism)"
-	]],
-	["pragma", [
-		"_pragma(",
-		["modifier", "classify_level"],
-		["pragma-punctuation", "="],
-		"advanced",
-		["pragma-punctuation", ","],
-		["modifier", "usage"],
-		["pragma-punctuation", "="],
-		"unrestricted",
-		["pragma-punctuation", ","],
-		["modifier", "topic"],
-		["pragma-punctuation", "="],
-		"different_prism)"
-	]]
-]
-
-----------------------------------------------------
-
-Checks for pragmas.
diff --git a/tests/languages/magik/pragma_feature.test b/tests/languages/magik/pragma_feature.test
new file mode 100644
index 0000000000..685d22e9cc
--- /dev/null
+++ b/tests/languages/magik/pragma_feature.test
@@ -0,0 +1,13 @@
+_pragma(classify_level=basic, usage=restricted, topic=prism)
+_pragma(classify_level=advanced, usage=unrestricted, topic=different_prism)
+
+----------------------------------------------------
+
+[
+	["pragma", "_pragma(classify_level=basic, usage=restricted, topic=prism)"],
+	["pragma", "_pragma(classify_level=advanced, usage=unrestricted, topic=different_prism)"]
+]
+
+----------------------------------------------------
+
+Checks for pragmas.
diff --git a/tests/languages/magik/slot_feature.test b/tests/languages/magik/slot_feature.test
index a2c3a44e0f..db26e377a5 100644
--- a/tests/languages/magik/slot_feature.test
+++ b/tests/languages/magik/slot_feature.test
@@ -1,4 +1,5 @@
 .slot_name
+.embedded?
 some_class.some_method(.slot_name)
 some_class.some_method(_optional .slot_name, .another_slot_name)
 {.slot_name, some_other_variable, .another_slot_name}
@@ -8,11 +9,11 @@ _global some_variable; some_variable << .slot_name
 
 [
 	["slot", ".slot_name"],
+	["slot", ".embedded?"],
 	["variable", "some_class"], ".", ["function", "some_method"], ["punctuation", "("], ["slot", ".slot_name"], ["punctuation", ")"],
 	["variable", "some_class"], ".", ["function", "some_method"], ["punctuation", "("], ["keyword", "_optional"], ["slot", ".slot_name"], ["punctuation", ","], ["slot", ".another_slot_name"], ["punctuation", ")"],
 	["punctuation", "{"], ["slot", ".slot_name"], ["punctuation", ","], ["variable", "some_other_variable"], ["punctuation", ","], ["slot", ".another_slot_name"], ["punctuation", "}"],
-	["keyword", "_global"], ["declaration", "some_variable"], ["punctuation", ";"], ["variable", "some_variable"], ["operator", "<<"], ["slot", ".slot_name"]
-	
+	["keyword-variable", "_global"], ["declaration", "some_variable"], ["punctuation", ";"], ["variable", "some_variable"], ["operator", "<<"], ["slot", ".slot_name"]
 ]
 
 ----------------------------------------------------
diff --git a/tests/languages/magik/symbol_feature.test b/tests/languages/magik/symbol_feature.test
index d6c11a743f..9e50aaee66 100644
--- a/tests/languages/magik/symbol_feature.test
+++ b/tests/languages/magik/symbol_feature.test
@@ -3,6 +3,7 @@
 :kleenean??
 :int!internal
 :|piped|
+:|123|
 :int|!|internal
 :new|()|
 :|A|b|c ||()|
@@ -24,6 +25,7 @@
 	["symbol", ":kleenean??"],
 	["symbol", ":int!internal"],
 	["symbol", ":|piped|"],
+	["symbol", ":|123|"],
 	["symbol", ":int|!|internal"],
 	["symbol", ":new|()|"],
 	["symbol", ":|A|b|c ||()|"],
diff --git a/tests/languages/magik/unset_feature.test b/tests/languages/magik/unset_feature.test
index e57fb2b9bc..e03e1ea5e2 100644
--- a/tests/languages/magik/unset_feature.test
+++ b/tests/languages/magik/unset_feature.test
@@ -8,8 +8,8 @@ _UnseT
 [
 	["unset", "_unset"],
 	["unset", "_UnseT"],
-    ["punctuation", "("], ["unset", "_unset"], ["punctuation", ")"],
-    ["punctuation", "{"], ["unset", "_unset"], ["punctuation", ","], ["unset", "_unset"], ["punctuation", "}"]
+	["punctuation", "("], ["unset", "_unset"], ["punctuation", ")"],
+	["punctuation", "{"], ["unset", "_unset"], ["punctuation", ","], ["unset", "_unset"], ["punctuation", "}"]
 ]
 
 ----------------------------------------------------
diff --git a/tests/languages/magik/variable_feature.test b/tests/languages/magik/variable_feature.test
index 492453997c..ad374d8350 100644
--- a/tests/languages/magik/variable_feature.test
+++ b/tests/languages/magik/variable_feature.test
@@ -21,8 +21,8 @@ coords3d_rope.new_with(coordinate3d.new(0, 0, 0), coordinate3d.new(10, 10, 10))
 	["variable", "a_name"],
 	["variable", "anotherName"],
 	["variable", "some_var"],
-	["variable", "coords3d_rope"], ".", ["function", "new_with"], ["punctuation", "("], 
-	    ["variable", "coordinate3d"], ".", ["function", "new"], ["punctuation", "("], ["number", "0"], ["punctuation", ","], ["number", "0"], ["punctuation", ","], ["number", "0"], ["punctuation", ")"], ["punctuation", ","], 
+	["variable", "coords3d_rope"], ".", ["function", "new_with"], ["punctuation", "("],
+		["variable", "coordinate3d"], ".", ["function", "new"], ["punctuation", "("], ["number", "0"], ["punctuation", ","], ["number", "0"], ["punctuation", ","], ["number", "0"], ["punctuation", ")"], ["punctuation", ","],
 		["variable", "coordinate3d"], ".", ["function", "new"], ["punctuation", "("], ["number", "10"], ["punctuation", ","], ["number", "10"], ["punctuation", ","], ["number", "10"], ["punctuation", ")"], ["punctuation", ")"]
 ]
 

From 56e52e08530f831362240eed3069cd8217cc04cd Mon Sep 17 00:00:00 2001
From: sebastiaanspeck <shem.speck@gmail.com>
Date: Mon, 13 Apr 2026 15:47:21 +0200
Subject: [PATCH 02/17] Add support for pipe-enclosed variables

---
 src/languages/magik.js                      | 3 ++-
 tests/languages/magik/variable_feature.test | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index 2b5e3860e7..546d3d8816 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -32,7 +32,7 @@ export default {
 			lookbehind: true
 		},
 
-		'number': /\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b/i,
+		'number': /(?<!\|)\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b/i,
 
 		'operator': [
 			/_(?:and|andif|or|orif|xor)<</i, /(?:\*\*\^?|\*\^?|\/\^?|_mod\^?|_div\^?|-\^?|\+\^?)<</i, /\^?<</, // assignment operators
@@ -121,6 +121,7 @@ export default {
 			/\|![\w?!]+\|!/, // variable encased like |!var|!
 			/!\|[\w?!]+\|!/, // variable encased like !|var!|
 			/!\|\|!/, // empty variable !||!
+			/\|[\w?!]+\|/, // variable encased like |var|, |0|, |123|
 			/![a-z][\w?!]*!/, // variable encased like !var!
 			/\b[a-z_]+:\w+\b/i, // variable with a prefix like sw:gis_program_manager
 			{ pattern: /(^|[^.])\b[a-z]\w*\b/i, lookbehind: true }
diff --git a/tests/languages/magik/variable_feature.test b/tests/languages/magik/variable_feature.test
index ad374d8350..452ab86231 100644
--- a/tests/languages/magik/variable_feature.test
+++ b/tests/languages/magik/variable_feature.test
@@ -7,6 +7,10 @@ sw:gis_program_manager
 a_name
 anotherName
 some_var
+|0|
+|123|
+|a|
+|aBc|
 coords3d_rope.new_with(coordinate3d.new(0, 0, 0), coordinate3d.new(10, 10, 10))
 
 ----------------------------------------------------
@@ -21,6 +25,10 @@ coords3d_rope.new_with(coordinate3d.new(0, 0, 0), coordinate3d.new(10, 10, 10))
 	["variable", "a_name"],
 	["variable", "anotherName"],
 	["variable", "some_var"],
+	["variable", "|0|"],
+	["variable", "|123|"],
+	["variable", "|a|"],
+	["variable", "|aBc|"],
 	["variable", "coords3d_rope"], ".", ["function", "new_with"], ["punctuation", "("],
 		["variable", "coordinate3d"], ".", ["function", "new"], ["punctuation", "("], ["number", "0"], ["punctuation", ","], ["number", "0"], ["punctuation", ","], ["number", "0"], ["punctuation", ")"], ["punctuation", ","],
 		["variable", "coordinate3d"], ".", ["function", "new"], ["punctuation", "("], ["number", "10"], ["punctuation", ","], ["number", "10"], ["punctuation", ","], ["number", "10"], ["punctuation", ")"], ["punctuation", ")"]

From 84d7ff9595184ce40486ef9c9d3026365acea27a Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <shem.speck@gmail.com>
Date: Mon, 13 Apr 2026 22:06:51 +0200
Subject: [PATCH 03/17] Split (and fix) the different variable types

---
 src/languages/magik.js                        | 46 +++++++++++--------
 tests/languages/magik/constant_feature.test   |  2 +-
 .../languages/magik/declaration_feature.test  |  2 +-
 .../magik/dynamic-variable_feature.test       | 21 +++++++++
 .../magik/global-reference_feature.test       | 12 ++---
 .../magik/global-variable_feature.test        | 13 ++++++
 tests/languages/magik/variable_feature.test   | 12 -----
 7 files changed, 69 insertions(+), 39 deletions(-)
 create mode 100644 tests/languages/magik/dynamic-variable_feature.test
 create mode 100644 tests/languages/magik/global-variable_feature.test

diff --git a/src/languages/magik.js b/src/languages/magik.js
index 546d3d8816..d367cf5759 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -32,6 +32,32 @@ export default {
 			lookbehind: true
 		},
 
+		'global-reference': [
+			{ pattern: /@(?:[a-z_]\w*:)?\|[^|]*\|/i, alias: 'symbol' }, // @|name| or @prefix:|name|
+			{ pattern: /@(?:[a-z_]\w*:)?[a-z_]\w*/i, alias: 'symbol' }, // @name or @prefix:name
+		],
+
+		'dynamic-variable': [
+			{ pattern: /\|![\w?!]+!\|/, alias: 'variable' }, // variable encased like |!var!|
+			{ pattern: /\|![\w?!]+\|!/, alias: 'variable' }, // variable encased like |!var|!
+			{ pattern: /!\|[\w?!]+\|!/, alias: 'variable' }, // variable encased like !|var!|
+			{ pattern: /!\|\|!/, alias: 'variable' }, // empty variable !||!
+			{ pattern: /[a-z_]+:![a-z][\w?!]*!/, alias: 'variable' }, // variable with a prefix like sw:!var!
+			{ pattern: /![a-z][\w?!]*!/, alias: 'variable' }, // variable encased like !var!
+		],
+
+		'global-variable': [
+			{ pattern: /\b[a-z_]+:\w+\b/i, alias: 'variable' }, // variable with a prefix like sw:gis_program_manager
+			{ pattern: /[a-z_]+:\|\w+\|/i, alias: 'variable' }, // variable with a prefix like sw:|gis_program_manager|
+		],
+
+		'declaration': [
+			{ pattern: /(\b_package\s+).*/i, lookbehind: true },
+			{ pattern: /(\b_global\s+)(?!_)\w+/i, lookbehind: true },
+			{ pattern: /(\b_constant\s+)(?!_)\w+/i, lookbehind: true },
+			{ pattern: /(\b_local\s+)(?!_)\w+/i, lookbehind: true }
+		],
+
 		'number': /(?<!\|)\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b/i,
 
 		'operator': [
@@ -46,13 +72,6 @@ export default {
 			{ pattern: /\b_(?:div|mod)\b/i, alias: 'keyword' } // math
 		],
 
-		'declaration': [
-			{ pattern: /(\b_package\s+).*/i, lookbehind: true },
-			{ pattern: /(\b_global\s+)(?!_)\w+/i, lookbehind: true },
-			{ pattern: /(\b_constant\s+)(?!_)\w+/i, lookbehind: true },
-			{ pattern: /(\b_local\s+)(?!_)\w+/i, lookbehind: true }
-		],
-
 		'keyword-variable': {
 			pattern: /\b_(?:class|dynamic|global|import|local)\b/i,
 			alias: 'keyword'
@@ -96,11 +115,6 @@ export default {
 			alias: 'symbol'
 		},
 
-		'global-reference': {
-			pattern: /@(?:[a-z_]\w*:)?[a-z_]\w*/i,
-			alias: 'symbol'
-		},
-
 		'self': [
 			{
 				pattern: /(\b_method\s+)\S+(?=\.)/,
@@ -117,14 +131,8 @@ export default {
 		],
 
 		'variable': [
-			/\|![\w?!]+!\|/, // variable encased like |!var!|
-			/\|![\w?!]+\|!/, // variable encased like |!var|!
-			/!\|[\w?!]+\|!/, // variable encased like !|var!|
-			/!\|\|!/, // empty variable !||!
 			/\|[\w?!]+\|/, // variable encased like |var|, |0|, |123|
-			/![a-z][\w?!]*!/, // variable encased like !var!
-			/\b[a-z_]+:\w+\b/i, // variable with a prefix like sw:gis_program_manager
 			{ pattern: /(^|[^.])\b[a-z]\w*\b/i, lookbehind: true }
-		],
+		]
 	}
 };
diff --git a/tests/languages/magik/constant_feature.test b/tests/languages/magik/constant_feature.test
index b577aa8fc0..058aaf67ac 100644
--- a/tests/languages/magik/constant_feature.test
+++ b/tests/languages/magik/constant_feature.test
@@ -16,7 +16,7 @@ _global _constant gis_program_manager << _unset
 		["constant", "_constant"], ["keyword-variable", "_local"], ["declaration", "max_size"], ["operator", "<<"], ["number", "1"],
 		["keyword-variable", "_local"], ["constant", "_constant"], ["declaration", "max_size"], ["operator", "<<"], ["number", "1"],
 	["keyword", "_endblock"],
-	["keyword-variable", "_global"], ["constant", "_constant"], ["variable", "!current_view!"], ["operator", "<<"], ["unset", "_unset"],
+	["keyword-variable", "_global"], ["constant", "_constant"], ["dynamic-variable", "!current_view!"], ["operator", "<<"], ["unset", "_unset"],
 	["keyword-variable", "_global"], ["constant", "_constant"], ["declaration", "gis_program_manager"], ["operator", "<<"], ["unset", "_unset"]
 ]
 
diff --git a/tests/languages/magik/declaration_feature.test b/tests/languages/magik/declaration_feature.test
index 6db4f1afcb..5d49129d3b 100644
--- a/tests/languages/magik/declaration_feature.test
+++ b/tests/languages/magik/declaration_feature.test
@@ -11,7 +11,7 @@ _global _constant !done_meas_follow_nodes! << _unset
 	["keyword-variable", "_global"], ["declaration", "some_var"],
 	["keyword-variable", "_global"], ["declaration", "some_var"], ["punctuation", ";"], ["variable", "some_var"], ["operator", "<<"], ["number", "1"],
 	["constant", "_constant"], ["declaration", "yippie"], ["operator", "<<"], ["number", "2"],
-	["keyword-variable", "_global"], ["constant", "_constant"], ["variable", "!done_meas_follow_nodes!"], ["operator", "<<"], ["unset", "_unset"]
+	["keyword-variable", "_global"], ["constant", "_constant"], ["dynamic-variable", "!done_meas_follow_nodes!"], ["operator", "<<"], ["unset", "_unset"]
 ]
 
 ----------------------------------------------------
diff --git a/tests/languages/magik/dynamic-variable_feature.test b/tests/languages/magik/dynamic-variable_feature.test
new file mode 100644
index 0000000000..da949da50f
--- /dev/null
+++ b/tests/languages/magik/dynamic-variable_feature.test
@@ -0,0 +1,21 @@
+!terminal!
+sw:!terminal!
+|!terminal!|
+|!terminal|!
+!|terminal|!
+!||!
+
+----------------------------------------------------
+
+[
+	["dynamic-variable", "!terminal!"],
+	["dynamic-variable", "sw:!terminal!"],
+	["dynamic-variable", "|!terminal!|"],
+	["dynamic-variable", "|!terminal|!"],
+	["dynamic-variable", "!|terminal|!"],
+	["dynamic-variable", "!||!"]
+]
+
+----------------------------------------------------
+
+Checks for dynamic variables.
diff --git a/tests/languages/magik/global-reference_feature.test b/tests/languages/magik/global-reference_feature.test
index 65510e5021..45510fbe75 100644
--- a/tests/languages/magik/global-reference_feature.test
+++ b/tests/languages/magik/global-reference_feature.test
@@ -1,15 +1,15 @@
 @gis_program_manager
-(@gis_program_manager)
-{@gis_program_manager}
-,@gis_program_manager
+@|gis_program_manager|
+@sw:gis_program_manager
+@sw:|gis_program_manager|
 
 ----------------------------------------------------
 
 [
 	["global-reference", "@gis_program_manager"],
-	["punctuation", "("], ["global-reference", "@gis_program_manager"], ["punctuation", ")"],
-	["punctuation", "{"], ["global-reference", "@gis_program_manager"], ["punctuation", "}"],
-	["punctuation", ","], ["global-reference", "@gis_program_manager"]
+	["global-reference", "@|gis_program_manager|"],
+	["global-reference", "@sw:gis_program_manager"],
+	["global-reference", "@sw:|gis_program_manager|"]
 ]
 
 ----------------------------------------------------
diff --git a/tests/languages/magik/global-variable_feature.test b/tests/languages/magik/global-variable_feature.test
new file mode 100644
index 0000000000..0d301cb19f
--- /dev/null
+++ b/tests/languages/magik/global-variable_feature.test
@@ -0,0 +1,13 @@
+sw:gis_program_manager
+sw:|gis_program_manager|
+
+----------------------------------------------------
+
+[
+	["global-variable", "sw:gis_program_manager"],
+	["global-variable", "sw:|gis_program_manager|"]
+]
+
+----------------------------------------------------
+
+Checks for global variables.
diff --git a/tests/languages/magik/variable_feature.test b/tests/languages/magik/variable_feature.test
index 452ab86231..cf53ecf7c2 100644
--- a/tests/languages/magik/variable_feature.test
+++ b/tests/languages/magik/variable_feature.test
@@ -1,9 +1,3 @@
-!terminal!
-|!terminal!|
-|!terminal|!
-!|terminal|!
-!||!
-sw:gis_program_manager
 a_name
 anotherName
 some_var
@@ -16,12 +10,6 @@ coords3d_rope.new_with(coordinate3d.new(0, 0, 0), coordinate3d.new(10, 10, 10))
 ----------------------------------------------------
 
 [
-	["variable", "!terminal!"],
-	["variable", "|!terminal!|"],
-	["variable", "|!terminal|!"],
-	["variable", "!|terminal|!"],
-	["variable", "!||!"],
-	["variable", "sw:gis_program_manager"],
 	["variable", "a_name"],
 	["variable", "anotherName"],
 	["variable", "some_var"],

From 9f95a5314b10861ecf76c0f7ffb2c01b65574f16 Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Tue, 14 Apr 2026 14:38:36 +0200
Subject: [PATCH 04/17] Add test case for slot

---
 tests/languages/magik/slot_feature.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/languages/magik/slot_feature.test b/tests/languages/magik/slot_feature.test
index db26e377a5..ea516b3adc 100644
--- a/tests/languages/magik/slot_feature.test
+++ b/tests/languages/magik/slot_feature.test
@@ -1,5 +1,6 @@
 .slot_name
 .embedded?
+.slot_name.some_method
 some_class.some_method(.slot_name)
 some_class.some_method(_optional .slot_name, .another_slot_name)
 {.slot_name, some_other_variable, .another_slot_name}
@@ -10,6 +11,7 @@ _global some_variable; some_variable << .slot_name
 [
 	["slot", ".slot_name"],
 	["slot", ".embedded?"],
+	["slot", ".slot_name"], ".", ["function", "some_method"],
 	["variable", "some_class"], ".", ["function", "some_method"], ["punctuation", "("], ["slot", ".slot_name"], ["punctuation", ")"],
 	["variable", "some_class"], ".", ["function", "some_method"], ["punctuation", "("], ["keyword", "_optional"], ["slot", ".slot_name"], ["punctuation", ","], ["slot", ".another_slot_name"], ["punctuation", ")"],
 	["punctuation", "{"], ["slot", ".slot_name"], ["punctuation", ","], ["variable", "some_other_variable"], ["punctuation", ","], ["slot", ".another_slot_name"], ["punctuation", "}"],

From 4efc0ef4fcd957065ad550c1b7543364cb56a7e8 Mon Sep 17 00:00:00 2001
From: sebastiaanspeck <shem.speck@gmail.com>
Date: Tue, 14 Apr 2026 17:32:36 +0200
Subject: [PATCH 05/17] Fix slot test

---
 src/languages/magik.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index d367cf5759..2afbef77e6 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -22,6 +22,12 @@ export default {
 			greedy: true
 		},
 
+		'slot': {
+			pattern: /(^|[\s({])\.\s*[a-z][\w?!]+/i,
+			lookbehind: true,
+			greedy: true
+		},
+
 		'pragma': {
 			pattern: /_pragma.*/,
 			alias: 'prolog'
@@ -94,11 +100,6 @@ export default {
 			/\b_(?:allresults|gather|optional|scatter)\b/i // parameter options
 		],
 
-		'slot': {
-			pattern: /(^|[\s({])\.\s*[a-z][\w?!]+/i,
-			lookbehind: true
-		},
-
 		'builtin': /\b_(?:clone|package|super|thisthread)\b/i,
 
 		'boolean': /\b_(?:false|maybe|true)\b/i,

From 8a5cfbd6aac3c5e440c33dbb880c7f5c2e1c2113 Mon Sep 17 00:00:00 2001
From: sebastiaanspeck <shem.speck@gmail.com>
Date: Tue, 14 Apr 2026 17:41:37 +0200
Subject: [PATCH 06/17] Fix import

---
 src/languages/magik.js                         | 3 ++-
 tests/languages/magik/declaration_feature.test | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index 2afbef77e6..d00eefc671 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -61,7 +61,8 @@ export default {
 			{ pattern: /(\b_package\s+).*/i, lookbehind: true },
 			{ pattern: /(\b_global\s+)(?!_)\w+/i, lookbehind: true },
 			{ pattern: /(\b_constant\s+)(?!_)\w+/i, lookbehind: true },
-			{ pattern: /(\b_local\s+)(?!_)\w+/i, lookbehind: true }
+			{ pattern: /(\b_local\s+)(?!_)\w+/i, lookbehind: true },
+			{ pattern: /(\b_import\s+)(?!_)\w+/i, lookbehind: true }
 		],
 
 		'number': /(?<!\|)\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b/i,
diff --git a/tests/languages/magik/declaration_feature.test b/tests/languages/magik/declaration_feature.test
index 5d49129d3b..9097c2aee9 100644
--- a/tests/languages/magik/declaration_feature.test
+++ b/tests/languages/magik/declaration_feature.test
@@ -3,6 +3,7 @@ _global some_var
 _global some_var; some_var << 1
 _constant yippie << 2
 _global _constant !done_meas_follow_nodes! << _unset
+_import some_var
 
 ----------------------------------------------------
 
@@ -11,7 +12,8 @@ _global _constant !done_meas_follow_nodes! << _unset
 	["keyword-variable", "_global"], ["declaration", "some_var"],
 	["keyword-variable", "_global"], ["declaration", "some_var"], ["punctuation", ";"], ["variable", "some_var"], ["operator", "<<"], ["number", "1"],
 	["constant", "_constant"], ["declaration", "yippie"], ["operator", "<<"], ["number", "2"],
-	["keyword-variable", "_global"], ["constant", "_constant"], ["dynamic-variable", "!done_meas_follow_nodes!"], ["operator", "<<"], ["unset", "_unset"]
+	["keyword-variable", "_global"], ["constant", "_constant"], ["dynamic-variable", "!done_meas_follow_nodes!"], ["operator", "<<"], ["unset", "_unset"],
+	["keyword-variable", "_import"], ["declaration", "some_var"]
 ]
 
 ----------------------------------------------------

From fbcaab9eb275170f3d7765b7b053e24d43fb6afa Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Tue, 14 Apr 2026 18:04:30 +0200
Subject: [PATCH 07/17] Simplify regex

---
 src/languages/magik.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index d00eefc671..4f47a6f032 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -59,10 +59,7 @@ export default {
 
 		'declaration': [
 			{ pattern: /(\b_package\s+).*/i, lookbehind: true },
-			{ pattern: /(\b_global\s+)(?!_)\w+/i, lookbehind: true },
-			{ pattern: /(\b_constant\s+)(?!_)\w+/i, lookbehind: true },
-			{ pattern: /(\b_local\s+)(?!_)\w+/i, lookbehind: true },
-			{ pattern: /(\b_import\s+)(?!_)\w+/i, lookbehind: true }
+			{ pattern: /(\b_(?:constant|global|import|local)\s+)(?!_)\w+/i, lookbehind: true },
 		],
 
 		'number': /(?<!\|)\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b/i,

From 356a13b816816f37c7660ddf69b093b10779bfb5 Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Fri, 17 Apr 2026 20:35:17 +0200
Subject: [PATCH 08/17] Apply some fixes after code review

---
 src/languages/magik.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index 4f47a6f032..b5fff5764c 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -23,7 +23,7 @@ export default {
 		},
 
 		'slot': {
-			pattern: /(^|[\s({])\.\s*[a-z][\w?!]+/i,
+			pattern: /(^|[\s({])\.\s*[a-z][\w?!]*/i,
 			lookbehind: true,
 			greedy: true
 		},
@@ -44,12 +44,12 @@ export default {
 		],
 
 		'dynamic-variable': [
-			{ pattern: /\|![\w?!]+!\|/, alias: 'variable' }, // variable encased like |!var!|
-			{ pattern: /\|![\w?!]+\|!/, alias: 'variable' }, // variable encased like |!var|!
-			{ pattern: /!\|[\w?!]+\|!/, alias: 'variable' }, // variable encased like !|var!|
+			{ pattern: /\|![\w?!]+!\|/i, alias: 'variable' }, // variable encased like |!var!|
+			{ pattern: /\|![\w?!]+\|!/i, alias: 'variable' }, // variable encased like |!var|!
+			{ pattern: /!\|[\w?!]+\|!/i, alias: 'variable' }, // variable encased like !|var!|
 			{ pattern: /!\|\|!/, alias: 'variable' }, // empty variable !||!
-			{ pattern: /[a-z_]+:![a-z][\w?!]*!/, alias: 'variable' }, // variable with a prefix like sw:!var!
-			{ pattern: /![a-z][\w?!]*!/, alias: 'variable' }, // variable encased like !var!
+			{ pattern: /[a-z_]+:![a-z][\w?!]*!/i, alias: 'variable' }, // variable with a prefix like sw:!var!
+			{ pattern: /![a-z][\w?!]*!/i, alias: 'variable' }, // variable encased like !var!
 		],
 
 		'global-variable': [
@@ -58,7 +58,7 @@ export default {
 		],
 
 		'declaration': [
-			{ pattern: /(\b_package\s+).*/i, lookbehind: true },
+			{ pattern: /(\b_package\s+)\w+/i, lookbehind: true },
 			{ pattern: /(\b_(?:constant|global|import|local)\s+)(?!_)\w+/i, lookbehind: true },
 		],
 

From c3490a02e8da2c2554d3436f32f6d2af43eafabe Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Fri, 17 Apr 2026 20:39:24 +0200
Subject: [PATCH 09/17] Fix lint issue

---
 src/languages/magik.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index b5fff5764c..2050714cc4 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -44,9 +44,9 @@ export default {
 		],
 
 		'dynamic-variable': [
-			{ pattern: /\|![\w?!]+!\|/i, alias: 'variable' }, // variable encased like |!var!|
-			{ pattern: /\|![\w?!]+\|!/i, alias: 'variable' }, // variable encased like |!var|!
-			{ pattern: /!\|[\w?!]+\|!/i, alias: 'variable' }, // variable encased like !|var!|
+			{ pattern: /\|![\w?!]+!\|/, alias: 'variable' }, // variable encased like |!var!|
+			{ pattern: /\|![\w?!]+\|!/, alias: 'variable' }, // variable encased like |!var|!
+			{ pattern: /!\|[\w?!]+\|!/, alias: 'variable' }, // variable encased like !|var!|
 			{ pattern: /!\|\|!/, alias: 'variable' }, // empty variable !||!
 			{ pattern: /[a-z_]+:![a-z][\w?!]*!/i, alias: 'variable' }, // variable with a prefix like sw:!var!
 			{ pattern: /![a-z][\w?!]*!/i, alias: 'variable' }, // variable encased like !var!

From f24130eeabba0870d0a52656f9691ae7304f5a24 Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Sun, 19 Apr 2026 02:19:22 +0000
Subject: [PATCH 10/17] Revert change

---
 src/languages/magik.js                    |  6 ++++-
 tests/languages/magik/pragma_feature.test | 30 +++++++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index 2050714cc4..cf28f979aa 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -30,7 +30,11 @@ export default {
 
 		'pragma': {
 			pattern: /_pragma.*/,
-			alias: 'prolog'
+			alias: 'prolog',
+			inside: {
+				'modifier': /classify_level|topic|usage/,
+				'pragma-punctuation': { pattern: /[={},]/ }
+			}
 		},
 
 		'symbol': {
diff --git a/tests/languages/magik/pragma_feature.test b/tests/languages/magik/pragma_feature.test
index 685d22e9cc..6d2674ab8f 100644
--- a/tests/languages/magik/pragma_feature.test
+++ b/tests/languages/magik/pragma_feature.test
@@ -4,8 +4,34 @@ _pragma(classify_level=advanced, usage=unrestricted, topic=different_prism)
 ----------------------------------------------------
 
 [
-	["pragma", "_pragma(classify_level=basic, usage=restricted, topic=prism)"],
-	["pragma", "_pragma(classify_level=advanced, usage=unrestricted, topic=different_prism)"]
+	["pragma", [
+		"_pragma(",
+		["modifier", "classify_level"],
+		["pragma-punctuation", "="],
+		"basic",
+		["pragma-punctuation", ","],
+		["modifier", "usage"],
+		["pragma-punctuation", "="],
+		"restricted",
+		["pragma-punctuation", ","],
+		["modifier", "topic"],
+		["pragma-punctuation", "="],
+		"prism)"
+	]],
+	["pragma", [
+		"_pragma(",
+		["modifier", "classify_level"],
+		["pragma-punctuation", "="],
+		"advanced",
+		["pragma-punctuation", ","],
+		["modifier", "usage"],
+		["pragma-punctuation", "="],
+		"unrestricted",
+		["pragma-punctuation", ","],
+		["modifier", "topic"],
+		["pragma-punctuation", "="],
+		"different_prism)"
+	]]
 ]
 
 ----------------------------------------------------

From 1407d3e874e1e1d323b3b0eb7ca4c62411063f2c Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Sun, 19 Apr 2026 04:03:09 +0200
Subject: [PATCH 11/17] Apply suggestion from review and fix flags

---
 src/languages/magik.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index cf28f979aa..108b82acc5 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -57,13 +57,13 @@ export default {
 		],
 
 		'global-variable': [
-			{ pattern: /\b[a-z_]+:\w+\b/i, alias: 'variable' }, // variable with a prefix like sw:gis_program_manager
-			{ pattern: /[a-z_]+:\|\w+\|/i, alias: 'variable' }, // variable with a prefix like sw:|gis_program_manager|
+			{ pattern: /\b[a-z_]+:[\w?!]+\b/i, alias: 'variable' }, // variable with a prefix like sw:gis_program_manager
+			{ pattern: /[a-z_]+:\|[\w?!]+\|/i, alias: 'variable' }, // variable with a prefix like sw:|gis_program_manager|
 		],
 
 		'declaration': [
-			{ pattern: /(\b_package\s+)\w+/i, lookbehind: true },
-			{ pattern: /(\b_(?:constant|global|import|local)\s+)(?!_)\w+/i, lookbehind: true },
+			{ pattern: /(\b_package\s+)\w+\b/i, lookbehind: true },
+			{ pattern: /(\b_(?:constant|global|import|local)\s+)(?!_)\w+\b/i, lookbehind: true },
 		],
 
 		'number': /(?<!\|)\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b/i,

From f07235bb72e9c81619fff5a90788ef57ef3369f9 Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Sun, 19 Apr 2026 04:09:12 +0200
Subject: [PATCH 12/17] Add tests for global variables with `?` and `!`

---
 tests/languages/magik/global-variable_feature.test | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/languages/magik/global-variable_feature.test b/tests/languages/magik/global-variable_feature.test
index 0d301cb19f..10f3cc356e 100644
--- a/tests/languages/magik/global-variable_feature.test
+++ b/tests/languages/magik/global-variable_feature.test
@@ -1,11 +1,19 @@
 sw:gis_program_manager
 sw:|gis_program_manager|
+sw:question?
+sw:|question?|
+sw:sys!system
+sw:|sys!system|
 
 ----------------------------------------------------
 
 [
 	["global-variable", "sw:gis_program_manager"],
-	["global-variable", "sw:|gis_program_manager|"]
+	["global-variable", "sw:|gis_program_manager|"],
+	["global-variable", "sw:question?"],
+	["global-variable", "sw:|question?|"],
+	["global-variable", "sw:sys!system"],
+	["global-variable", "sw:|sys!system|"]
 ]
 
 ----------------------------------------------------

From 89b96c829df426bcf58c6b85a9edebd1215c325f Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Sun, 19 Apr 2026 04:12:02 +0200
Subject: [PATCH 13/17] Remove word boundary

Co-authored-by: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
---
 src/languages/magik.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index 108b82acc5..129eae6a4a 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -57,7 +57,7 @@ export default {
 		],
 
 		'global-variable': [
-			{ pattern: /\b[a-z_]+:[\w?!]+\b/i, alias: 'variable' }, // variable with a prefix like sw:gis_program_manager
+			{ pattern: /[a-z_]+:[\w?!]+/i, alias: 'variable' }, // variable with a prefix like sw:gis_program_manager
 			{ pattern: /[a-z_]+:\|[\w?!]+\|/i, alias: 'variable' }, // variable with a prefix like sw:|gis_program_manager|
 		],
 

From 64deafe383782219c98a510e33b3f7845e47fd10 Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Tue, 21 Apr 2026 15:28:06 +0200
Subject: [PATCH 14/17] Use keyword as alias for `_unset`/`_constant`

---
 src/languages/magik.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index 129eae6a4a..6396233c19 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -110,12 +110,12 @@ export default {
 
 		'unset': {
 			pattern: /\b_unset\b/i,
-			alias: 'symbol'
+			alias: 'keyword'
 		},
 
 		'constant': {
 			pattern: /\b_constant\b/i,
-			alias: 'symbol'
+			alias: 'keyword'
 		},
 
 		'self': [

From 1215b98d2e5036a0f1717232bb2610d41b420090 Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Tue, 21 Apr 2026 15:47:07 +0200
Subject: [PATCH 15/17] Update src/languages/magik.js

Co-authored-by: Dmitry Sharabin <dmitrysharabin@gmail.com>
---
 src/languages/magik.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index 6396233c19..091d793470 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -66,7 +66,7 @@ export default {
 			{ pattern: /(\b_(?:constant|global|import|local)\s+)(?!_)\w+\b/i, lookbehind: true },
 		],
 
-		'number': /(?<!\|)\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b/i,
+		'number': /(?<!\|)(?:\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b)/i,
 
 		'operator': [
 			/_(?:and|andif|or|orif|xor)<</i, /(?:\*\*\^?|\*\^?|\/\^?|_mod\^?|_div\^?|-\^?|\+\^?)<</i, /\^?<</, // assignment operators

From 822f87118fd636e4cf1c4975d2f55955826afd66 Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Tue, 21 Apr 2026 15:47:46 +0200
Subject: [PATCH 16/17] Update variable_feature.test

---
 tests/languages/magik/variable_feature.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/languages/magik/variable_feature.test b/tests/languages/magik/variable_feature.test
index cf53ecf7c2..92f64afc71 100644
--- a/tests/languages/magik/variable_feature.test
+++ b/tests/languages/magik/variable_feature.test
@@ -5,6 +5,7 @@ some_var
 |123|
 |a|
 |aBc|
+|16r0000FFFF|
 coords3d_rope.new_with(coordinate3d.new(0, 0, 0), coordinate3d.new(10, 10, 10))
 
 ----------------------------------------------------
@@ -17,6 +18,7 @@ coords3d_rope.new_with(coordinate3d.new(0, 0, 0), coordinate3d.new(10, 10, 10))
 	["variable", "|123|"],
 	["variable", "|a|"],
 	["variable", "|aBc|"],
+    ["variable", "|16r0000FFFF|"],
 	["variable", "coords3d_rope"], ".", ["function", "new_with"], ["punctuation", "("],
 		["variable", "coordinate3d"], ".", ["function", "new"], ["punctuation", "("], ["number", "0"], ["punctuation", ","], ["number", "0"], ["punctuation", ","], ["number", "0"], ["punctuation", ")"], ["punctuation", ","],
 		["variable", "coordinate3d"], ".", ["function", "new"], ["punctuation", "("], ["number", "10"], ["punctuation", ","], ["number", "10"], ["punctuation", ","], ["number", "10"], ["punctuation", ")"], ["punctuation", ")"]

From 0c9ed13d5030e63f5c29b5104748fa36b9767477 Mon Sep 17 00:00:00 2001
From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com>
Date: Tue, 21 Apr 2026 18:41:02 +0000
Subject: [PATCH 17/17] Run prettier

---
 src/languages/magik.js | 59 ++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/languages/magik.js b/src/languages/magik.js
index 091d793470..c76c5690e5 100644
--- a/src/languages/magik.js
+++ b/src/languages/magik.js
@@ -9,23 +9,23 @@ export default {
 
 		'char': {
 			pattern: /%(?:[a-z][\w?!]*|.)/i,
-			greedy: true
+			greedy: true,
 		},
 
 		'string': {
 			pattern: /"(?:\\.|[^"\\\r\n])*"|'(?:\\.|[^'\\\r\n])*'/,
-			greedy: true
+			greedy: true,
 		},
 
 		'regex': {
 			pattern: /\/(?:(?:\\.|[^\\/\r\n])+\/[qisdlmucx]*|\/)/,
-			greedy: true
+			greedy: true,
 		},
 
 		'slot': {
 			pattern: /(^|[\s({])\.\s*[a-z][\w?!]*/i,
 			lookbehind: true,
-			greedy: true
+			greedy: true,
 		},
 
 		'pragma': {
@@ -33,13 +33,13 @@ export default {
 			alias: 'prolog',
 			inside: {
 				'modifier': /classify_level|topic|usage/,
-				'pragma-punctuation': { pattern: /[={},]/ }
-			}
+				'pragma-punctuation': { pattern: /[={},]/ },
+			},
 		},
 
 		'symbol': {
 			pattern: /(^|\W):(?:\|[^|]*\||\\.|[\w?!])+/,
-			lookbehind: true
+			lookbehind: true,
 		},
 
 		'global-reference': [
@@ -66,23 +66,35 @@ export default {
 			{ pattern: /(\b_(?:constant|global|import|local)\s+)(?!_)\w+\b/i, lookbehind: true },
 		],
 
-		'number': /(?<!\|)(?:\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b)/i,
+		'number':
+			/(?<!\|)(?:\b\d+(?:\.\d+)?(?:[e&][+-]?\d+)?\b|\b(?:[2-9]|[12]\d|3[0-6])r[a-z0-9]+\b)/i,
 
 		'operator': [
-			/_(?:and|andif|or|orif|xor)<</i, /(?:\*\*\^?|\*\^?|\/\^?|_mod\^?|_div\^?|-\^?|\+\^?)<</i, /\^?<</, // assignment operators
-			/<>/, />=/, /<=/, /</, /~=/, /=/, // relational operators
-			/\*\*/, /\*/, /\//, // arithmetic operators
-			/\+/, /-/, /~/, // unary operators
+			/_(?:and|andif|or|orif|xor)<</i,
+			/(?:\*\*\^?|\*\^?|\/\^?|_mod\^?|_div\^?|-\^?|\+\^?)<</i,
+			/\^?<</,
+			/<>/,
+			/>=/,
+			/<=/,
+			/</,
+			/~=/,
+			/=/,
+			/\*\*/,
+			/\*/,
+			/\//,
+			/\+/,
+			/-/,
+			/~/,
 		],
 
 		'keyword-operator': [
 			{ pattern: /\b_(?:cf|is|isnt)\b/i, alias: 'keyword' }, // comparison
-			{ pattern: /\b_(?:div|mod)\b/i, alias: 'keyword' } // math
+			{ pattern: /\b_(?:div|mod)\b/i, alias: 'keyword' }, // math
 		],
 
 		'keyword-variable': {
 			pattern: /\b_(?:class|dynamic|global|import|local)\b/i,
-			alias: 'keyword'
+			alias: 'keyword',
 		},
 
 		'keyword': [
@@ -93,13 +105,14 @@ export default {
 			/\b_(?:default|handling)\b/i, // handling
 			/\b_(?:catch|endcatch)\b/i, // catch
 			/\b_throw\b/i, // throw
-			/>>/, /\b_return\b/i, // return
+			/>>/,
+			/\b_return\b/i,
 			/\b_primitive\b/i, // primitive
 			/\b_(?:endtry|try|when)\b/i, // try
 			/\b_(?:endprotect|locking|protect|protection)\b/i, // protect
 			/\b_(?:endlock|lock)\b/i, // lock
 			/\b_with\b/i, // standalone since _finally, _handling, _throw, _try, _leave and _continue all can have this
-			/\b_(?:allresults|gather|optional|scatter)\b/i // parameter options
+			/\b_(?:allresults|gather|optional|scatter)\b/i, // parameter options
 		],
 
 		'builtin': /\b_(?:clone|package|super|thisthread)\b/i,
@@ -110,20 +123,20 @@ export default {
 
 		'unset': {
 			pattern: /\b_unset\b/i,
-			alias: 'keyword'
+			alias: 'keyword',
 		},
 
 		'constant': {
 			pattern: /\b_constant\b/i,
-			alias: 'keyword'
+			alias: 'keyword',
 		},
 
 		'self': [
 			{
 				pattern: /(\b_method\s+)\S+(?=\.)/,
-				lookbehind: true
+				lookbehind: true,
 			},
-			/\b_self\b/i
+			/\b_self\b/i,
 		],
 
 		'function': [
@@ -135,7 +148,7 @@ export default {
 
 		'variable': [
 			/\|[\w?!]+\|/, // variable encased like |var|, |0|, |123|
-			{ pattern: /(^|[^.])\b[a-z]\w*\b/i, lookbehind: true }
-		]
-	}
+			{ pattern: /(^|[^.])\b[a-z]\w*\b/i, lookbehind: true },
+		],
+	},
 };