Add support for arrow functions

Author: wouterj

src/Templates/highlight.php/php.json

@@ -28,7 +28,8 @@
                     "end": "\\)",
                     "keywords": "true false null new array",
                     "contains": {
-                        "$ref": "#contains.11.contains.1.contains"
+                        "$ref": "#contains.11.contains.3.contains",
+                        "_": "params"
                     }
                 },
                 {
@@ -163,23 +164,27 @@
                             "begin": "[a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]*(?![A-Za-z0-9])(?![$])(?=:)(?=(?!::))"
                         },
                         {
-                            "$ref": "#contains.8",
+                            "$ref": "#contains.9",
                             "_": "variable"
                         },
                         {
-                            "$ref": "#contains.10.contains.1.contains.2",
+                            "$ref": "#contains.11.contains.3.contains.2",
                             "_": "comment"
                         },
                         {
-                            "$ref": "#contains.10.contains.1.contains.3",
+                            "$ref": "#contains.11.contains.3.contains.3",
                             "_": "string"
                         },
                         {
-                            "$ref": "#contains.10.contains.1.contains.4",
+                            "$ref": "#contains.11.contains.3.contains.4",
                             "_": "number"
                         },
                         {
-                            "$ref": "#contains.9",
+                            "$ref": "#contains.11",
+                            "_": "closure"
+                        },
+                        {
+                            "$ref": "#contains.10",
                             "_": "invoke"
                         }
                     ]
@@ -188,16 +193,23 @@
         },
         {
             "className": "function",
-            "beginKeywords": "function",
+            "beginKeywords": "fn function",
             "end": "[;{]",
             "excludeEnd": true,
             "illegal": "\\$|\\[|%",
             "contains": [
+                {
+                    "beginKeywords": "use"
+                },
                 {
                     "className": "title",
                     "begin": "[a-zA-Z_]\\w*",
                     "relevance": 0
                 },
+                {
+                    "begin": "=>",
+                    "endsParent": true
+                },
                 {
                     "className": "params",
                     "begin": "\\(",
@@ -206,7 +218,8 @@
                     "contains": [
                         "self",
                         {
-                            "$ref": "#contains.9"
+                            "$ref": "#contains.9",
+                            "_": "variable"
                         },
                         {
                             "className": "comment",
@@ -291,10 +304,12 @@
                             ]
                         },
                         {
-                            "$ref": "#contains.0"
+                            "$ref": "#contains.0",
+                            "_": "simple-attribute"
                         },
                         {
-                            "$ref": "#contains.1"
+                            "$ref": "#contains.1",
+                            "_": "attribute"
                         }
                     ]
                 }
@@ -311,7 +326,8 @@
                     "beginKeywords": "extends implements"
                 },
                 {
-                    "$ref": "#contains.11.contains.0"
+                    "$ref": "#contains.11.contains.1",
+                    "_": "title"
                 }
             ]
         },
@@ -321,7 +337,8 @@
             "illegal": "[\\.']",
             "contains": [
                 {
-                    "$ref": "#contains.11.contains.0"
+                    "$ref": "#contains.11.contains.1",
+                    "_": "title"
                 }
             ]
         },
@@ -330,18 +347,21 @@
             "end": ";",
             "contains": [
                 {
-                    "$ref": "#contains.11.contains.0"
+                    "$ref": "#contains.11.contains.1",
+                    "_": "title"
                 }
             ]
         },
         {
             "begin": "=>"
         },
         {
-            "$ref": "#contains.11.contains.1.contains.3"
+            "$ref": "#contains.11.contains.3.contains.3",
+            "_": "string"
         },
         {
-            "$ref": "#contains.11.contains.1.contains.4"
+            "$ref": "#contains.11.contains.3.contains.4",
+            "_": "number"
         }
     ]
 }

tests/fixtures/expected/blocks/code-blocks/php.html

@@ -85,7 +85,7 @@
 
     <span class="hljs-keyword">return</span> <span class="hljs-keyword">new</span> <span class="hljs-title invoke__">UserBadge</span>(
         <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>payload</span>-&gt;<span class="hljs-title invoke__">getUserId</span>(),
-        <span class="hljs-function"><span class="hljs-keyword">fn</span> <span class="hljs-params">(<span class="hljs-keyword">string</span> <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>userIdentifier</span>)</span>: <span class="hljs-title">User</span></span> =&gt; <span class="hljs-keyword">new</span> <span class="hljs-title invoke__">User</span>(<span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>userIdentifier</span>, <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>payload</span>-&gt;<span class="hljs-title invoke__">getRoles</span>())
+        <span class="hljs-function"><span class="hljs-keyword">fn</span> <span class="hljs-params">(<span class="hljs-keyword">string</span> <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>userIdentifier</span>)</span>: <span class="hljs-title">User</span> =&gt;</span> <span class="hljs-keyword">new</span> <span class="hljs-title invoke__">User</span>(<span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>userIdentifier</span>, <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>payload</span>-&gt;<span class="hljs-title invoke__">getRoles</span>())
     );
 
     <span class="hljs-comment">// or</span>