[Syntax highlighting] support implements on traits (#82)

slackhq · Nov 20, 2019 · 8adf0a1 · 8adf0a1
1 parent 4cdd005
commit 8adf0a1
Showing 1 changed file with 55 additions and 45 deletions.
diff --git a/syntaxes/hack.json b/syntaxes/hack.json
@@ -171,6 +171,55 @@
         }
       ]
     },
+    "implements": {
+      "patterns": [
+        {
+	  "begin": "(?i)(implements)\\s+",
+	  "beginCaptures": {
+	    "1": {
+	      "name": "storage.modifier.implements.php"
+	    }
+	  },
+	  "end": "(?i)(?=[;{])",
+	  "patterns": [
+	    {
+	      "include": "#comments"
+	    },
+	    {
+	      "begin": "(?i)(?=[a-z0-9_\\\\]+)",
+	      "contentName": "meta.other.inherited-class.php",
+	      "end": "(?i)(?:\\s*(?:,|(?=[^a-z0-9_\\\\\\s]))\\s*)",
+	      "patterns": [
+		{
+		  "begin": "(?i)(?=\\\\?[a-z_0-9]+\\\\)",
+		  "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
+		  "endCaptures": {
+		    "1": {
+		      "name": "entity.other.inherited-class.php"
+		    }
+		  },
+		  "patterns": [
+		    {
+		      "include": "#namespace"
+		    }
+		  ]
+		},
+		{
+		  "include": "#class-builtin"
+		},
+		{
+		  "include": "#namespace"
+		},
+		{
+		  "match": "(?i)[a-z_][a-z_0-9]*",
+		  "name": "entity.other.inherited-class.php"
+		}
+	      ]
+	    }
+	  ]
+	}
+      ]
+    },
     "attributes": {
       "patterns": [
         {
@@ -693,6 +742,9 @@
             },
             {
               "include": "#generics"
+            },
+            {
+              "include": "#implements"
             }
           ]
         },
@@ -781,6 +833,9 @@
             {
               "include": "#generics"
             },
+            {
+              "include": "#implements"
+            },
             {
               "begin": "(?i)(extends)\\s+",
               "beginCaptures": {
@@ -816,51 +871,6 @@
                   "name": "entity.other.inherited-class.php"
                 }
               ]
-            },
-            {
-              "begin": "(?i)(implements)\\s+",
-              "beginCaptures": {
-                "1": {
-                  "name": "storage.modifier.implements.php"
-                }
-              },
-              "end": "(?i)(?=[;{])",
-              "patterns": [
-                {
-                  "include": "#comments"
-                },
-                {
-                  "begin": "(?i)(?=[a-z0-9_\\\\]+)",
-                  "contentName": "meta.other.inherited-class.php",
-                  "end": "(?i)(?:\\s*(?:,|(?=[^a-z0-9_\\\\\\s]))\\s*)",
-                  "patterns": [
-                    {
-                      "begin": "(?i)(?=\\\\?[a-z_0-9]+\\\\)",
-                      "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
-                      "endCaptures": {
-                        "1": {
-                          "name": "entity.other.inherited-class.php"
-                        }
-                      },
-                      "patterns": [
-                        {
-                          "include": "#namespace"
-                        }
-                      ]
-                    },
-                    {
-                      "include": "#class-builtin"
-                    },
-                    {
-                      "include": "#namespace"
-                    },
-                    {
-                      "match": "(?i)[a-z_][a-z_0-9]*",
-                      "name": "entity.other.inherited-class.php"
-                    }
-                  ]
-                }
-              ]
             }
           ]
         },