PHP: Improved constant support for PHP 8.1 enums (#2770)

This improves the highlighting of PHP 8.1 enums and class constants.

Author: TomPavelec

components/prism-php.js

@@ -12,8 +12,18 @@
 			pattern: /\b(?:false|true)\b/i,
 			alias: 'boolean'
 		},
-		/\b[A-Z_][A-Z0-9_]*\b(?!\s*\()/,
+		{
+			pattern: /(::\s*)\b[a-z_]\w*\b(?!\s*\()/i,
+			greedy: true,
+			lookbehind: true,
+		},
+		{
+			pattern: /(\b(?:case|const)\s+)\b[a-z_]\w*(?=\s*[;=])/i,
+			greedy: true,
+			lookbehind: true,
+		},
 		/\b(?:null)\b/i,
+		/\b[A-Z_][A-Z0-9_]*\b(?!\s*\()/,
 	];
 	var number = /\b0b[01]+(?:_[01]+)*\b|\b0o[0-7]+(?:_[0-7]+)*\b|\b0x[\da-f]+(?:_[\da-f]+)*\b|(?:\b\d+(?:_\d+)*\.?(?:\d+(?:_\d+)*)?|\B\.\d+)(?:e[+-]?\d+)?/i;
 	var operator = /<?=>|\?\?=?|\.{3}|\??->|[!=]=?=?|::|\*\*=?|--|\+\+|&&|\|\||<<|>>|[?~]|[/^|%*&<>.+-]=?/;
@@ -87,7 +97,10 @@
 			},
 			/\b(?:__halt_compiler|abstract|and|array|as|break|callable|case|catch|class|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|enum|eval|exit|extends|final|finally|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|insteadof|interface|isset|list|namespace|match|new|or|parent|print|private|protected|public|require|require_once|return|self|static|switch|throw|trait|try|unset|use|var|while|xor|yield)\b/i
 		],
-		'argument-name': /\b[a-z_]\w*(?=\s*:(?!:))/i,
+		'argument-name': {
+			pattern: /([(,]\s+)\b[a-z_]\w*(?=\s*:(?!:))/i,
+			lookbehind: true
+		},
 		'class-name': [
 			{
 				pattern: /(\b(?:extends|implements|instanceof|new(?!\s+self|\s+static))\s+|\bcatch\s*\()\b[a-z_]\w*(?!\\)\b/i,

components/prism-php.min.js

@@ -15,7 +15,7 @@
 	["tag", [["tag", [["punctuation", "<"], "a"]],
 	["attr-name", ["href"]], ["attr-value", [["punctuation", "="], ["punctuation", "\""],
 	["latte", [["ld", [["punctuation", "{"], ["tag", "link"]]],
-	["php", [["argument-name", "Post"], ["punctuation", ":"], ["class-name", "show"], ["variable", "$post"], ["operator", "->"], ["property", "id"]]],
+	["php", ["Post", ["punctuation", ":"], ["class-name", "show"], ["variable", "$post"], ["operator", "->"], ["property", "id"]]],
 	["rd", [["punctuation", "}"]]]]],
 	["punctuation", "\""]]], ["punctuation", ">"]]],
 	["latte", [["ld", [["punctuation", "{"]]], ["php", [["variable", "$post"], ["operator", "->"], ["property", "title"]]], ["rd", [["punctuation", "}"]]]]],

tests/languages/latte/html_feature.test

@@ -9,13 +9,13 @@
 [
 	["tag", [["tag", [["punctuation", "<"], "a"]],
 	["n-attr", [["attr-name", "n:href"],
-		["attr-value", [["punctuation", "="], ["punctuation", "\""], ["php", [["argument-name", "Post"], ["punctuation", ":"], ["class-name", "show"], ["variable", "$post"], ["operator", "->"], ["property", "id"]]], ["punctuation", "\""]]]]],
+		["attr-value", [["punctuation", "="], ["punctuation", "\""], ["php", ["Post", ["punctuation", ":"], ["class-name", "show"], ["variable", "$post"], ["operator", "->"], ["property", "id"]]], ["punctuation", "\""]]]]],
 	["punctuation", ">"]]],
 	"link", ["tag", [["tag", [["punctuation", "</"], "a"]], ["punctuation", ">"]]],
 
 	["tag", [["tag", [["punctuation", "<"], "a"]],
 	["n-attr", [["attr-name", "n:href"],
-		["attr-value", [["punctuation", "="], ["punctuation", "\""], ["php", [["argument-name", "Post"], ["punctuation", ":"], ["class-name", "show"], ["variable", "$post"], ["operator", "->"], ["property", "id"]]], ["punctuation", "\""]]]]],
+		["attr-value", [["punctuation", "="], ["punctuation", "\""], ["php", ["Post", ["punctuation", ":"], ["class-name", "show"], ["variable", "$post"], ["operator", "->"], ["property", "id"]]], ["punctuation", "\""]]]]],
 	["punctuation", ">"]]],
 	"link", ["tag", [["tag", [["punctuation", "</"], "a"]], ["punctuation", ">"]]],
 

tests/languages/latte/n-attr_feature.test

@@ -22,8 +22,6 @@ class Foo extends Bar implements Baz {}
 
 class Foo extends \Package\Bar implements App\Baz {}
 
-enum Foo implements Bar {}
-
 ----------------------------------------------------
 
 [
@@ -196,13 +194,6 @@ enum Foo implements Bar {}
 		"Baz"
 	]],
 	["punctuation", "{"],
-	["punctuation", "}"],
-
-	["keyword", "enum"],
-	["class-name-definition", "Foo"],
-	["keyword", "implements"],
-	["class-name", "Bar"],
-	["punctuation", "{"],
 	["punctuation", "}"]
 ]
 

tests/languages/php/class-name_feature.test

@@ -5,6 +5,22 @@ AZ
 PRISM
 FOOBAR_42
 
+class Foo{
+	const BAR = 1;
+	const baz = 2;
+}
+
+Foo::BAR;
+Foo::baz;
+
+
+switch ($i) {
+	case NULL:
+		break;
+	case X:
+		break;
+}
+
 ----------------------------------------------------
 
 [
@@ -13,7 +29,43 @@ FOOBAR_42
 	["constant", "X"],
 	["constant", "AZ"],
 	["constant", "PRISM"],
-	["constant", "FOOBAR_42"]
+	["constant", "FOOBAR_42"],
+
+	["keyword", "class"],
+	["class-name-definition", "Foo"],
+	["punctuation", "{"],
+	["keyword", "const"],
+	["constant", "BAR"],
+	["operator", "="],
+	["number", "1"],
+	["punctuation", ";"],
+	["keyword", "const"],
+	["constant", "baz"],
+	["operator", "="],
+	["number", "2"],
+	["punctuation", ";"],
+	["punctuation", "}"],
+
+	["class-name", "Foo"], ["operator", "::"], ["constant", "BAR"], ["punctuation", ";"],
+	["class-name", "Foo"], ["operator", "::"], ["constant", "baz"], ["punctuation", ";"],
+
+	["keyword", "switch"],
+	["punctuation", "("],
+	["variable", "$i"],
+	["punctuation", ")"],
+	["punctuation", "{"],
+	["keyword", "case"],
+	["constant", "NULL"],
+	["punctuation", ":"],
+	["keyword", "break"],
+	["punctuation", ";"],
+	["keyword", "case"],
+	["constant", "X"],
+	["punctuation", ":"],
+	["keyword", "break"],
+	["punctuation", ";"],
+	["punctuation", "}"]
+
 ]
 
 ----------------------------------------------------

tests/languages/php/constant_feature.test

@@ -0,0 +1,52 @@
+enum Foo implements Bar {}
+
+enum Suit {
+	case Hearts;
+	case Diamonds = 'D';
+}
+
+$val = Suit::Diamonds;
+
+Suit::Spades->name;
+
+----------------------------------------------------
+
+[
+	["keyword", "enum"],
+	["class-name-definition", "Foo"],
+	["keyword", "implements"],
+	["class-name", "Bar"],
+	["punctuation", "{"],
+	["punctuation", "}"],
+
+	["keyword", "enum"],
+	["class-name-definition", "Suit"],
+	["punctuation", "{"],
+	["keyword", "case"],
+	["constant", "Hearts"],
+	["punctuation", ";"],
+	["keyword", "case"],
+	["constant", "Diamonds"],
+	["operator", "="],
+	["string", "'D'"],
+	["punctuation", ";"],
+	["punctuation", "}"],
+
+	["variable", "$val"],
+	["operator", "="],
+	["class-name", "Suit"],
+	["operator", "::"],
+	["constant", "Diamonds"],
+	["punctuation", ";"],
+
+	["class-name", "Suit"],
+	["operator", "::"],
+	["constant", "Spades"],
+	["operator", "->"],
+	["property", "name"],
+	["punctuation", ";"]
+]
+
+----------------------------------------------------
+
+Checks for enums.