enh(php) named arguments and fix php constants (#3459)

* enh(php) named arguments * fix(php) PHP constants
highlightjs · Jan 12, 2022 · 112135f · 112135f
1 parent 8a8835b
commit 112135f
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 18 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,12 @@
+## Version 11.4.1
+
+Grammars:
+
+- enh(php) named arguments [Wojciech Kania][]
+- fix(php) PHP constants [Wojciech Kania][]
+
+[Wojciech Kania]: https://github.com/wkania
+
 ## Version 11.4.0
 
 New Language:

diff --git a/src/languages/php.js b/src/languages/php.js
@@ -328,21 +328,6 @@ export default function(hljs) {
     ]
   };
 
-  const FUNCTION_INVOKE = {
-    relevance: 0,
-    match: [
-      /\b/,
-      // to prevent keywords from being confused as the function title
-      regex.concat("(?!fn\\b|function\\b|", normalizeKeywords(KWS).join("\\b|"), "|", normalizeKeywords(BUILT_INS).join("\\b|"), "\\b)"),
-      IDENT_RE,
-      regex.concat(WHITESPACE, "*"),
-      regex.lookahead(/(?=\()/)
-    ],
-    scope: {
-      3: "title.function.invoke",
-    }
-  };
-
   const CONSTANT_REFERENCE = regex.concat(IDENT_RE, "\\b(?!\\()");
 
   const LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON = {
@@ -368,6 +353,20 @@ export default function(hljs) {
           2: "variable.language",
         },
       },
+      {
+        match: [
+          PASCAL_CASE_CLASS_NAME_RE,
+          regex.concat(
+            /::/,
+            regex.lookahead(/(?!class\b)/)
+          ),
+          CONSTANT_REFERENCE,
+        ],
+        scope: {
+          1: "title.class",
+          3: "variable.constant",
+        },
+      },
       {
         match: [
           PASCAL_CASE_CLASS_NAME_RE,
@@ -394,6 +393,44 @@ export default function(hljs) {
     ]
   };
 
+  const NAMED_ARGUMENT = {
+    scope: 'attr',
+    match: regex.concat(IDENT_RE, regex.lookahead(':'), regex.lookahead(/(?!::)/)),
+  };
+  const PARAMS_MODE = {
+    relevance: 0,
+    begin: /\(/,
+    end: /\)/,
+    keywords: KEYWORDS,
+    contains: [
+      NAMED_ARGUMENT,
+      VARIABLE,
+      LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON,
+      hljs.C_BLOCK_COMMENT_MODE,
+      STRING,
+      NUMBER,
+      CONSTRUCTOR_CALL,
+    ],
+  };
+  const FUNCTION_INVOKE = {
+    relevance: 0,
+    match: [
+      /\b/,
+      // to prevent keywords from being confused as the function title
+      regex.concat("(?!fn\\b|function\\b|", normalizeKeywords(KWS).join("\\b|"), "|", normalizeKeywords(BUILT_INS).join("\\b|"), "\\b)"),
+      IDENT_RE,
+      regex.concat(WHITESPACE, "*"),
+      regex.lookahead(/(?=\()/)
+    ],
+    scope: {
+      3: "title.function.invoke",
+    },
+    contains: [
+      PARAMS_MODE
+    ]
+  };
+  PARAMS_MODE.contains.push(FUNCTION_INVOKE);
+
   return {
     case_insensitive: false,
     keywords: KEYWORDS,
@@ -440,7 +477,6 @@ export default function(hljs) {
           /const/,
           /\s/,
           IDENT_RE,
-          /\s*=/,
         ],
         scope: {
           1: "keyword",
@@ -476,7 +512,7 @@ export default function(hljs) {
               STRING,
               NUMBER
             ]
-          }
+          },
         ]
       },
       {
@@ -520,7 +556,7 @@ export default function(hljs) {
         ]
       },
       STRING,
-      NUMBER
+      NUMBER,
     ]
   };
 }
diff --git a/test/markup/php/functions.expect.txt b/test/markup/php/functions.expect.txt
@@ -41,3 +41,11 @@
  */</span>
 <span class="hljs-variable">$fun</span> = <span class="hljs-title function_ invoke__">mb_strlen</span>();
 <span class="hljs-variable">$fun</span>();
+
+<span class="hljs-comment">/**
+ * Named arguments
+ */</span>
+<span class="hljs-title function_ invoke__">setAlarm</span>(
+    <span class="hljs-attr">label</span>: <span class="hljs-string">&#x27;foo&#x27;</span>,
+    <span class="hljs-attr">time</span>:<span class="hljs-title function_ invoke__">time</span>() + <span class="hljs-keyword">array</span>(<span class="hljs-number">5</span>)[<span class="hljs-number">0</span>] + <span class="hljs-title class_">Foo</span>::<span class="hljs-variable constant_">HOUR</span>,
+);
diff --git a/test/markup/php/functions.txt b/test/markup/php/functions.txt
@@ -41,3 +41,11 @@ function testMe(string|int $name): int
  */
 $fun = mb_strlen();
 $fun();
+
+/**
+ * Named arguments
+ */
+setAlarm(
+    label: 'foo',
+    time:time() + array(5)[0] + Foo::HOUR,
+);