github-linguist 7.6.1 → 7.9.0

data/grammars/source.gitconfig.json

@@ -374,7 +374,7 @@
         },
         {
           "name": "meta.variable-field.gitconfig",
-          "begin": "(?i)\\b(email)\\s*(=)",
+          "begin": "(?i)\\b(email|url)\\s*(=)",
           "end": "$|(?=#|;)",
           "patterns": [
             {

data/grammars/source.hack.json

@@ -10,6 +10,53 @@
     }
   ],
   "repository": {
+    "attributes": {
+      "patterns": [
+        {
+          "name": "meta.attributes.php",
+          "begin": "(\u003c\u003c)(?!\u003c)",
+          "end": "(\u003e\u003e)",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "name": "entity.other.attribute-name.php",
+              "match": "([A-Za-z_][A-Za-z0-9_]*)"
+            },
+            {
+              "begin": "(\\()",
+              "end": "(\\))",
+              "patterns": [
+                {
+                  "include": "#language"
+                }
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.parameters.begin.php"
+                }
+              },
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.definition.parameters.end.php"
+                }
+              }
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.attributes.php"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.attributes.php"
+            }
+          }
+        }
+      ]
+    },
     "class-builtin": {
       "patterns": [
         {
@@ -202,6 +249,9 @@
         {
           "include": "#comments"
         },
+        {
+          "include": "#attributes"
+        },
         {
           "include": "#type-annotation"
         },
@@ -366,6 +416,55 @@
         }
       ]
     },
+    "implements": {
+      "patterns": [
+        {
+          "begin": "(?i)(implements)\\s+",
+          "end": "(?i)(?=[;{])",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "contentName": "meta.other.inherited-class.php",
+              "begin": "(?i)(?=[a-z0-9_\\\\]+)",
+              "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_\\\\])",
+                  "patterns": [
+                    {
+                      "include": "#namespace"
+                    }
+                  ],
+                  "endCaptures": {
+                    "1": {
+                      "name": "entity.other.inherited-class.php"
+                    }
+                  }
+                },
+                {
+                  "include": "#class-builtin"
+                },
+                {
+                  "include": "#namespace"
+                },
+                {
+                  "name": "entity.other.inherited-class.php",
+                  "match": "(?i)[a-z_][a-z_0-9]*"
+                }
+              ]
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.modifier.implements.php"
+            }
+          }
+        }
+      ]
+    },
     "instantiation": {
       "begin": "(?i)(new)\\s+",
       "end": "(?i)(?=[^$a-z0-9_\\\\])",
@@ -435,26 +534,12 @@
           "match": "\\\\[nrt\\\\\\$\\\"]"
         },
         {
-          "begin": "(\\{)(?=\\$.*?\\})",
-          "end": "(\\})",
-          "patterns": [
-            {
-              "include": "#language"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.variable.php"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.variable.php"
-            }
-          }
+          "name": "variable.other.php",
+          "match": "(\\{\\$.*?\\})"
         },
         {
-          "include": "#variable-name"
+          "name": "variable.other.php",
+          "match": "(\\$[a-zA-Z_][a-zA-Z0-9_]*((-\u003e[a-zA-Z_][a-zA-Z0-9_]*)|(\\[[a-zA-Z0-9_]+\\]))?)"
         }
       ]
     },
@@ -475,6 +560,15 @@
         {
           "include": "#comments"
         },
+        {
+          "begin": "(?=^\\s*\u003c\u003c)",
+          "end": "(?\u003c=\u003e\u003e)",
+          "patterns": [
+            {
+              "include": "#attributes"
+            }
+          ]
+        },
         {
           "include": "#xhp"
         },
@@ -495,6 +589,9 @@
             {
               "name": "keyword.operator.assignment.php",
               "match": "(=)"
+            },
+            {
+              "include": "#type-annotation"
             }
           ],
           "beginCaptures": {
@@ -521,6 +618,9 @@
             },
             {
               "include": "#generics"
+            },
+            {
+              "include": "#implements"
             }
           ],
           "beginCaptures": {
@@ -606,6 +706,9 @@
             {
               "include": "#generics"
             },
+            {
+              "include": "#implements"
+            },
             {
               "contentName": "meta.other.inherited-class.php",
               "begin": "(?i)(extends)\\s+",
@@ -641,51 +744,6 @@
                   "name": "storage.modifier.extends.php"
                 }
               }
-            },
-            {
-              "begin": "(?i)(implements)\\s+",
-              "end": "(?i)(?=[;{])",
-              "patterns": [
-                {
-                  "include": "#comments"
-                },
-                {
-                  "contentName": "meta.other.inherited-class.php",
-                  "begin": "(?i)(?=[a-z0-9_\\\\]+)",
-                  "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_\\\\])",
-                      "patterns": [
-                        {
-                          "include": "#namespace"
-                        }
-                      ],
-                      "endCaptures": {
-                        "1": {
-                          "name": "entity.other.inherited-class.php"
-                        }
-                      }
-                    },
-                    {
-                      "include": "#class-builtin"
-                    },
-                    {
-                      "include": "#namespace"
-                    },
-                    {
-                      "name": "entity.other.inherited-class.php",
-                      "match": "(?i)[a-z_][a-z_0-9]*"
-                    }
-                  ]
-                }
-              ],
-              "beginCaptures": {
-                "1": {
-                  "name": "storage.modifier.implements.php"
-                }
-              }
             }
           ],
           "beginCaptures": {
@@ -725,27 +783,50 @@
         },
         {
           "name": "meta.catch.php",
-          "begin": "\\b(catch)\\b\\s*\\(\\s*",
-          "end": "([A-Za-z_][A-Za-z_0-9]*)\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\\s*\\)",
+          "begin": "\\b(catch)\\s*(\\()",
+          "end": "\\)",
           "patterns": [
             {
               "include": "#namespace"
+            },
+            {
+              "match": "(?xi)\n([a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)                 # Exception class\n((?:\\s*\\|\\s*[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)*) # Optional additional exception classes\n\\s*\n((\\$+)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*)           # Variable",
+              "captures": {
+                "1": {
+                  "name": "support.class.exception.php"
+                },
+                "2": {
+                  "patterns": [
+                    {
+                      "name": "support.class.exception.php",
+                      "match": "(?i)[a-z_\\x{7f}-\\x{10ffff}][a-z0-9_\\x{7f}-\\x{10ffff}]*"
+                    },
+                    {
+                      "name": "punctuation.separator.delimiter.php",
+                      "match": "\\|"
+                    }
+                  ]
+                },
+                "3": {
+                  "name": "variable.other.php"
+                },
+                "4": {
+                  "name": "punctuation.definition.variable.php"
+                }
+              }
             }
           ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.exception.catch.php"
+            },
+            "2": {
+              "name": "punctuation.definition.parameters.begin.bracket.round.php"
             }
           },
           "endCaptures": {
-            "1": {
-              "name": "support.class.exception.php"
-            },
-            "2": {
-              "name": "variable.other.php"
-            },
-            "3": {
-              "name": "punctuation.definition.variable.php"
+            "0": {
+              "name": "punctuation.definition.parameters.end.bracket.round.php"
             }
           }
         },
@@ -1048,7 +1129,11 @@
         },
         {
           "name": "keyword.operator.logical.php",
-          "match": "(?i)(!|\u0026\u0026|\\|\\|)|\\b(and|or|xor|as)\\b"
+          "match": "(?i)(!|\u0026\u0026|\\|\\|)|\\b(and|or|xor)\\b"
+        },
+        {
+          "name": "keyword.operator.type.php",
+          "match": "(?i)\\b(is|as)\\b"
         },
         {
           "include": "#function-call"
@@ -1177,9 +1262,13 @@
     },
     "namespace": {
       "name": "support.other.namespace.php",
-      "begin": "(?i)(?:(namespace)|[a-z0-9_]+)?(\\\\)(?=.*?[^a-z_0-9\\\\])",
+      "begin": "(?i)((namespace)|[a-z0-9_]+)?(\\\\)(?=.*?[^a-z_0-9\\\\])",
       "end": "(?i)(?=[a-z0-9_]*[^a-z0-9_\\\\])",
       "patterns": [
+        {
+          "name": "entity.name.type.namespace.php",
+          "match": "(?i)[a-z0-9_]+(?=\\\\)"
+        },
         {
           "match": "(?i)(\\\\)",
           "captures": {
@@ -1191,9 +1280,9 @@
       ],
       "beginCaptures": {
         "1": {
-          "name": "variable.language.namespace.php"
+          "name": "entity.name.type.namespace.php"
         },
-        "2": {
+        "3": {
           "name": "punctuation.separator.inheritance.php"
         }
       }
@@ -1483,6 +1572,10 @@
       "begin": "\"\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER)\\b)",
       "end": "\"",
       "patterns": [
+        {
+          "name": "punctuation.definition.parameters.begin.bracket.round.php",
+          "match": "\\("
+        },
         {
           "name": "comment.line.number-sign.sql",
           "match": "#(\\\\\"|[^\"])*(?=\"|$\\n?)"
@@ -1547,6 +1640,10 @@
       "begin": "'\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER)\\b)",
       "end": "'",
       "patterns": [
+        {
+          "name": "punctuation.definition.parameters.begin.bracket.round.php",
+          "match": "\\("
+        },
         {
           "name": "comment.line.number-sign.sql",
           "match": "#(\\\\'|[^'])*(?='|$\\n?)"
@@ -2110,30 +2207,24 @@
         },
         {
           "name": "storage.type.shape.php",
-          "begin": "(?=shape\\()",
-          "end": "\\)",
+          "begin": "(shape\\()",
+          "end": "((,|\\.\\.\\.)?\\s*\\))",
           "patterns": [
             {
-              "begin": "(shape\\()",
-              "end": "(=\u003e)",
-              "patterns": [
-                {
-                  "include": "#strings"
-                },
-                {
-                  "include": "#constants"
-                }
-              ],
-              "endCaptures": {
-                "1": {
-                  "name": "keyword.operator.key.php"
-                }
-              }
+              "include": "#type-annotation"
             },
             {
-              "include": "#type-annotation"
+              "include": "#strings"
+            },
+            {
+              "include": "#constants"
             }
-          ]
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "keyword.operator.key.php"
+            }
+          }
         },
         {
           "begin": "\\(",
@@ -2146,6 +2237,9 @@
         },
         {
           "include": "#class-name"
+        },
+        {
+          "include": "#comments"
         }
       ]
     },
@@ -2157,7 +2251,12 @@
         {
           "include": "#namespace"
         }
-      ]
+      ],
+      "endCaptures": {
+        "0": {
+          "name": "entity.name.function.php"
+        }
+      }
     },
     "var_basic": {
       "patterns": [
@@ -2452,6 +2551,9 @@
             {
               "include": "#xhp-tag-termination"
             },
+            {
+              "include": "#xhp-html-comments"
+            },
             {
               "include": "#xhp-tag-attributes"
             }
@@ -2484,7 +2586,7 @@
     "xhp-tag-termination": {
       "patterns": [
         {
-          "begin": "(\u003e)",
+          "begin": "(?\u003c!--)(\u003e)",
           "end": "(\u003c/)",
           "patterns": [
             {