github-linguist 7.6.1 → 7.7.0

data/grammars/source.dart.json

@@ -232,7 +232,7 @@
         },
         {
           "name": "keyword.declaration.dart",
-          "match": "(?\u003c!\\$)\\b(abstract|class|enum|extends|external|factory|implements|get|mixin|native|operator|set|typedef|with|covariant)\\b(?!\\$)"
+          "match": "(?\u003c!\\$)\\b(abstract|class|enum|extends|extension|external|factory|implements|get|mixin|native|operator|set|typedef|with|covariant)\\b(?!\\$)"
         },
         {
           "name": "keyword.operator.dart",

data/grammars/source.dircolors.json

@@ -0,0 +1,39 @@
+{
+  "name": "dircolors",
+  "scopeName": "source.dircolors",
+  "patterns": [
+    {
+      "begin": "(^\\s+)?(?\u003c!\\S)(?=#)(?!#\\{)",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
+          "name": "comment.line.number-sign.dircolors",
+          "begin": "#",
+          "end": "\\n",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.dircolors"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.dircolors"
+        }
+      }
+    },
+    {
+      "name": "constant.numeric.radix.dircolors",
+      "match": "\\b[0-3]?[0-9]#[0-9a-zA-Z]+\\b"
+    },
+    {
+      "name": "constant.numeric.dircolors",
+      "match": "\\b\\d+?\\b"
+    },
+    {
+      "name": "keyword.other.dircolors",
+      "match": "\\b(TERM|COLOR|EIGHTBIT|OPTION|NORMAL|NORM|FILE|RESET|DIR|LNK|LINK|SYMLINK|ORPHAN|MISSING|FIFO|PIPE|SOCK|BLK|BLOCK|CHR|CHAR|DOOR|EXEC|LEFT|LEFTCODE|RIGHT|RIGHTCODE|END|ENDCODE|SUID|SETUID|SGID|SETGID|STICKY|OTHER_WRITABLE|OWR|STICKY_OTHER_WRITABLE|OWT|CAPABILITY|MULTIHARDLINK|CLRTOEOL)\\b"
+    }
+  ]
+}

data/grammars/source.direct-x.json

@@ -0,0 +1,135 @@
+{
+  "name": "DirectX 3D File",
+  "scopeName": "source.direct-x",
+  "patterns": [
+    {
+      "include": "#main"
+    }
+  ],
+  "repository": {
+    "header": {
+      "name": "meta.signature.header.direct-x",
+      "match": "^\\s*(xof)\\s*(\\d+)\\s*(txt|bin|tzip|bzip)\\s*(.*)",
+      "captures": {
+        "1": {
+          "name": "keyword.control.magic-number.direct-x"
+        },
+        "2": {
+          "name": "constant.numeric.integer.int.version-number.direct-x"
+        },
+        "3": {
+          "name": "storage.type.var.format.direct-x"
+        },
+        "4": {
+          "patterns": [
+            {
+              "include": "etc"
+            }
+          ]
+        }
+      }
+    },
+    "keywords": {
+      "name": "keyword.operator.reserved.direct-x",
+      "match": "(?ix) \\b\n(ARRAY|BINARY_RESOURCE|BINARY|CHAR|CSTRING|DOUBLE|DWORD|FLOAT\n|SDWORD|STRING|SWORD|TEMPLATE|UCHAR|ULONGLONG|UNICODE|WORD)\\b"
+    },
+    "main": {
+      "patterns": [
+        {
+          "include": "#header"
+        },
+        {
+          "include": "#template"
+        },
+        {
+          "include": "#uuid"
+        },
+        {
+          "include": "#keywords"
+        },
+        {
+          "include": "#templateTypes"
+        },
+        {
+          "include": "#name"
+        },
+        {
+          "include": "etc#ellipsis"
+        },
+        {
+          "include": "etc#commentHash"
+        },
+        {
+          "include": "etc#commentSlash"
+        },
+        {
+          "include": "etc"
+        }
+      ]
+    },
+    "name": {
+      "name": "variable.other.direct-x",
+      "match": "(?!\\d)\\w+"
+    },
+    "template": {
+      "name": "meta.template.direct-x",
+      "begin": "\\b([A-Za-z_]\\w*)\\s+((?!\\d)\\w+)\\s*({)",
+      "end": "}",
+      "patterns": [
+        {
+          "include": "#main"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.function.template.direct-x"
+        },
+        "2": {
+          "name": "entity.name.function.direct-x"
+        },
+        "3": {
+          "name": "punctuation.section.scope.begin.direct-x"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.scope.end.direct-x"
+        }
+      }
+    },
+    "templateTypes": {
+      "name": "storage.type.var.template.direct-x",
+      "match": "(?ix) \\b\n(AnimTicksPerSecond|AnimationKey|AnimationOptions|AnimationSet|Animation|Boolean2d|Boolean|ColorRGBA?|CompressedAnimationSet\n|Coords2d|DeclData|EffectDWord|EffectFloats|EffectInstance|EffectParamDWord|EffectParamFloats|EffectParamString|EffectString\n|FVFData|FaceAdjacency|FloatKeys|FrameTransformMatrix|Frame|Guid|IndexedColor|MaterialWrap|Material|Matrix4x4|MeshFaceWraps\n|MeshFace|MeshMaterialList|MeshNormals|MeshTextureCoords|MeshVertexColors|Mesh|PMAttributeRange|PMInfo|PMVSplitRecord\n|PatchMesh9|PatchMesh|Patch|SkinWeights|Templates|TextureFilename|TimedFloatKeys|Vector|VertexDuplicationIndices\n|VertexElement|XSkinMeshHeader) \\b"
+    },
+    "uuid": {
+      "name": "meta.uuid.direct-x",
+      "match": "(\u003c)([-\\sA-Fa-f0-9]+)(\u003e)",
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "etc#bracket"
+            }
+          ]
+        },
+        "2": {
+          "patterns": [
+            {
+              "include": "etc#dash"
+            },
+            {
+              "include": "etc#hexNoSign"
+            }
+          ]
+        },
+        "3": {
+          "patterns": [
+            {
+              "include": "etc#bracket"
+            }
+          ]
+        }
+      }
+    }
+  }
+}

data/grammars/source.ebnf.json

@@ -22,13 +22,46 @@
         }
       }
     },
+    "lhs": {
+      "patterns": [
+        {
+          "name": "meta.lhs.ebnf",
+          "match": "(?x)\n(?:    \\s++\n|      ^|\\G\n| (?=  ^|\\G    )\n| (?\u003c= ;|\\*\\) )\n)\n\n# Exclude leading whitespace\n\\s*\n\n([A-Za-z][A-Za-z0-9_]*+)",
+          "captures": {
+            "1": {
+              "name": "entity.name.rule.identifier.ebnf"
+            }
+          }
+        },
+        {
+          "name": "meta.lhs.non-standard.ebnf",
+          "contentName": "entity.name.rule.identifier.non-standard.ebnf",
+          "begin": "(?x)\n(?:    \\s++\n|      ^|\\G\n| (?=  ^|\\G  )\n| (?\u003c= \\*\\) )\n)\n\n# Exclude leading whitespace\n\\s*\n\n# Check for at least one “invalid” character\n(?=\n\t# Starts with a digit\n\t[0-9]\n\t|\n\t\n\t# Contains at least one non-“word” character\n\t[A-Za-z0-9_]*   # Skip any legal characters\n\t(?: [^:;=()]    # Don't swallow symbols for comments, terminators, or assignments\n\t|   \\((?!\\*)  # Permit open brackets if they don't introduce a comment\n\t)\n)",
+          "end": "(?x)\n# Exclude trailing whitespace\n\\s*\n\n# Stop before an...\n(?= :*=      # Assignment operator separating `#lhs` from `#rhs`\n|   ;        # Unexpected terminator\n|   \\(\\*   # Embedded comment\n)",
+          "patterns": [
+            {
+              "include": "#comment"
+            }
+          ]
+        },
+        {
+          "include": "#comment"
+        }
+      ]
+    },
     "main": {
       "patterns": [
         {
           "include": "#comment"
         },
         {
-          "include": "#rule"
+          "include": "#semicolon"
+        },
+        {
+          "include": "#lhs"
+        },
+        {
+          "include": "#rhs"
         },
         {
           "include": "#special"
@@ -36,6 +69,27 @@
       ]
     },
     "rhs": {
+      "name": "meta.rhs.ebnf",
+      "begin": "(::=)|(:=)|(=)",
+      "end": "(?=;|^\\s*(?:\u003c?[A-Za-z][A-Za-z0-9_]*\u003e?\\s*)?:*=)",
+      "patterns": [
+        {
+          "include": "#rhs-innards"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.assignment.non-standard.double-colon.ebnf"
+        },
+        "2": {
+          "name": "keyword.operator.assignment.non-standard.single-colon.ebnf"
+        },
+        "3": {
+          "name": "keyword.operator.assignment.ebnf"
+        }
+      }
+    },
+    "rhs-innards": {
       "patterns": [
         {
           "name": "punctuation.delimiter.comma.ebnf",
@@ -92,7 +146,7 @@
           "end": "\\]",
           "patterns": [
             {
-              "include": "#rhs"
+              "include": "#rhs-innards"
             }
           ],
           "beginCaptures": {
@@ -112,7 +166,7 @@
           "end": "}",
           "patterns": [
             {
-              "include": "#rhs"
+              "include": "#rhs-innards"
             }
           ],
           "beginCaptures": {
@@ -132,7 +186,7 @@
           "end": "\\)",
           "patterns": [
             {
-              "include": "#rhs"
+              "include": "#rhs-innards"
             }
           ],
           "beginCaptures": {
@@ -152,45 +206,19 @@
         {
           "name": "variable.parameter.argument.identifier.reference.ebnf",
           "match": "[A-Za-z][A-Za-z0-9_]*"
-        }
-      ]
-    },
-    "rule": {
-      "begin": "(?=[A-Za-z][A-Za-z0-9_]*)",
-      "end": ";",
-      "patterns": [
+        },
         {
-          "name": "meta.lhs.ebnf",
-          "begin": "\\G",
-          "end": "(?=[=;])",
-          "patterns": [
-            {
-              "name": "entity.name.rule.identifier.ebnf",
-              "match": "[A-Za-z][A-Za-z0-9_]*"
-            }
-          ]
+          "name": "keyword.operator.logical.not.negation.non-standard.ebnf",
+          "match": "!"
         },
         {
-          "name": "meta.rhs.ebnf",
-          "begin": "=",
-          "end": "(?=;)",
-          "patterns": [
-            {
-              "include": "#rhs"
-            }
-          ],
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.operator.assignment.ebnf"
-            }
-          }
+          "include": "source.lex.regexp#quantifier"
         }
-      ],
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.terminator.statement.ebnf"
-        }
-      }
+      ]
+    },
+    "semicolon": {
+      "name": "punctuation.terminator.statement.ebnf",
+      "match": ";"
     },
     "special": {
       "name": "meta.pragma.directive.special.ebnf",

data/grammars/source.elixir.json

@@ -16,6 +16,49 @@
         }
       }
     },
+    {
+      "match": "([A-Z]\\w+)\\s*(\\.)\\s*([a-z_]\\w*[!?]?)",
+      "captures": {
+        "1": {
+          "name": "entity.name.type.class.elixir"
+        },
+        "2": {
+          "name": "punctuation.separator.method.elixir"
+        },
+        "3": {
+          "name": "entity.name.function.elixir"
+        }
+      }
+    },
+    {
+      "match": "(\\:\\w+)\\s*(\\.)\\s*([_]?\\w*[!?]?)",
+      "captures": {
+        "1": {
+          "name": "constant.other.symbol.elixir"
+        },
+        "2": {
+          "name": "punctuation.separator.method.elixir"
+        },
+        "3": {
+          "name": "entity.name.function.elixir"
+        }
+      }
+    },
+    {
+      "match": "(\\|\\\u003e)\\s*([a-z_]\\w*[!?]?)",
+      "captures": {
+        "1": {
+          "name": "keyword.operator.other.elixir"
+        },
+        "2": {
+          "name": "entity.name.function.elixir"
+        }
+      }
+    },
+    {
+      "name": "entity.name.function.elixir",
+      "match": "\\b[a-z_]\\w*[!?]?(?=\\s*\\.?\\s*\\()"
+    },
     {
       "begin": "\\b(fn)\\b(?=.*-\u003e)",
       "end": "(?\u003e(-\u003e)|(when)|(\\)))",

data/grammars/source.gfm.json

@@ -1084,7 +1084,7 @@
     {
       "name": "markup.code.julia.gfm",
       "contentName": "source.embedded.julia",
-      "begin": "^\\s*(`{3,}|~{3,})\\s*(?i:(julia))\\s*$",
+      "begin": "^\\s*(`{3,}|~{3,})\\s*(?i:(julia|jl))\\s*$",
       "end": "^\\s*\\1((?\u003c=`)`+|(?\u003c=~)~+)?\\s*$",
       "patterns": [
         {

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_\\\\])",
@@ -475,6 +574,15 @@
         {
           "include": "#comments"
         },
+        {
+          "begin": "(?=^\\s*\u003c\u003c)",
+          "end": "(?\u003c=\u003e\u003e)",
+          "patterns": [
+            {
+              "include": "#attributes"
+            }
+          ]
+        },
         {
           "include": "#xhp"
         },
@@ -495,6 +603,9 @@
             {
               "name": "keyword.operator.assignment.php",
               "match": "(=)"
+            },
+            {
+              "include": "#type-annotation"
             }
           ],
           "beginCaptures": {
@@ -521,6 +632,9 @@
             },
             {
               "include": "#generics"
+            },
+            {
+              "include": "#implements"
             }
           ],
           "beginCaptures": {
@@ -606,6 +720,9 @@
             {
               "include": "#generics"
             },
+            {
+              "include": "#implements"
+            },
             {
               "contentName": "meta.other.inherited-class.php",
               "begin": "(?i)(extends)\\s+",
@@ -641,51 +758,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 +797,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 +1143,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 +1276,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 +1294,9 @@
       ],
       "beginCaptures": {
         "1": {
-          "name": "variable.language.namespace.php"
+          "name": "entity.name.type.namespace.php"
         },
-        "2": {
+        "3": {
           "name": "punctuation.separator.inheritance.php"
         }
       }
@@ -1483,6 +1586,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 +1654,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 +2221,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 +2251,9 @@
         },
         {
           "include": "#class-name"
+        },
+        {
+          "include": "#comments"
         }
       ]
     },
@@ -2157,7 +2265,12 @@
         {
           "include": "#namespace"
         }
-      ]
+      ],
+      "endCaptures": {
+        "0": {
+          "name": "entity.name.function.php"
+        }
+      }
     },
     "var_basic": {
       "patterns": [
@@ -2452,6 +2565,9 @@
             {
               "include": "#xhp-tag-termination"
             },
+            {
+              "include": "#xhp-html-comments"
+            },
             {
               "include": "#xhp-tag-attributes"
             }
@@ -2484,7 +2600,7 @@
     "xhp-tag-termination": {
       "patterns": [
         {
-          "begin": "(\u003e)",
+          "begin": "(?\u003c!--)(\u003e)",
           "end": "(\u003c/)",
           "patterns": [
             {