github-linguist 5.2.0 → 5.3.0

data/grammars/text.html.php.blade.json

@@ -215,7 +215,7 @@
           ]
         },
         {
-          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n(\n  @\n  (?i: # Ordering not important as we everything will be matched up to opening parentheses\n   auth\n  |break\n  |can\n  |cannot\n  |case\n  |choice\n  |component\n  |continue\n  |each\n  |elsecan\n  |elsecannot\n  |elseif\n  |empty\n  |extends\n  |for\n  |foreach\n  |forelse\n  |guest\n  |hassection\n  |if\n  |include\n  |includeif\n  |includewhen\n  |inject\n  |isset\n  |lang\n  |php\n  |prepend\n  |push\n  |section\n  |slot\n  |stack\n  |switch\n  |unless\n  |unset\n  |while\n  |yield\n  )\n  [\\t ]* # Whitespace between name and parentheses\n)\n(\\() # Followed by opening parentheses",
+          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n(\n  @\n  (?i: # Ordering not important as we everything will be matched up to opening parentheses\n   auth\n  |break\n  |can\n  |cannot\n  |case\n  |choice\n  |component\n  |continue\n  |each\n  |elsecan\n  |elsecannot\n  |elseif\n  |empty\n  |extends\n  |for\n  |foreach\n  |forelse\n  |guest\n  |hassection\n  |if\n  |include\n  |includefirst\n  |includeif\n  |includewhen\n  |inject\n  |isset\n  |json\n  |lang\n  |php\n  |prepend\n  |push\n  |section\n  |slot\n  |stack\n  |switch\n  |unless\n  |unset\n  |while\n  |yield\n  )\n  [\\t ]* # Whitespace between name and parentheses\n)\n(\\() # Followed by opening parentheses",
           "beginCaptures": {
             "1": {
               "name": "keyword.blade"
@@ -478,128 +478,7 @@
           ]
         },
         {
-          "match": "[^\\(\\)]+"
-        }
-      ]
-    },
-    "class-body": {
-      "patterns": [
-        {
-          "match": "(?xi)\n\\b(use)\\s+\n([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n((?:\\s*,\\s*[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)*)\n(?=\\s*;)",
-          "name": "meta.use.php",
-          "captures": {
-            "1": {
-              "name": "keyword.other.use.php"
-            },
-            "2": {
-              "name": "support.class.php"
-            },
-            "3": {
-              "patterns": [
-                {
-                  "match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
-                  "name": "support.class.php"
-                },
-                {
-                  "match": ",",
-                  "name": "punctuation.separator.delimiter.php"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "begin": "(?i)\\buse\\b",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.other.use.php"
-            }
-          },
-          "end": "}",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.use.end.bracket.curly.php"
-            }
-          },
-          "name": "meta.use.php",
-          "patterns": [
-            {
-              "match": "(?xi)\n([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n((?:\\s*,\\s*[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)*)",
-              "captures": {
-                "1": {
-                  "name": "support.class.php"
-                },
-                "2": {
-                  "patterns": [
-                    {
-                      "match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
-                      "name": "support.class.php"
-                    },
-                    {
-                      "match": ",",
-                      "name": "punctuation.separator.delimiter.php"
-                    }
-                  ]
-                }
-              }
-            },
-            {
-              "begin": "{",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.use.begin.bracket.curly.php"
-                }
-              },
-              "end": "(?=})",
-              "contentName": "meta.use.body.php",
-              "patterns": [
-                {
-                  "include": "#scope-resolution"
-                },
-                {
-                  "match": "(?xi)\n\\b(as)\\s+\n([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\b       # Visibility modifier OR alias\n(?:\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*))? # alias",
-                  "captures": {
-                    "1": {
-                      "name": "keyword.other.use-as.php"
-                    },
-                    "2": {
-                      "patterns": [
-                        {
-                          "match": "\\b(final|abstract|public|private|protected|static)\\b",
-                          "name": "storage.modifier.php"
-                        },
-                        {
-                          "match": "[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
-                          "name": "entity.other.alias.php"
-                        }
-                      ]
-                    },
-                    "3": {
-                      "name": "entity.other.alias.php"
-                    }
-                  }
-                },
-                {
-                  "match": "(?i)\\b(insteadof)\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)",
-                  "captures": {
-                    "1": {
-                      "name": "keyword.other.use-insteadof.php"
-                    },
-                    "2": {
-                      "name": "support.class.php"
-                    }
-                  }
-                },
-                {
-                  "match": ";",
-                  "name": "punctuation.terminator.expression.php"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "include": "#language"
+          "match": "[^()]+"
         }
       ]
     },
@@ -983,7 +862,7 @@
     "function-call": {
       "patterns": [
         {
-          "begin": "(?i)(\\\\?[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*\\\\[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\s*(\\()",
+          "begin": "(?xi)\n(\n  \\\\?\\b                                                # Optional root namespace\n  [a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*          # First namespace\n  (?:\\\\[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)+ # Additional namespaces\n)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1000,7 +879,7 @@
               "name": "punctuation.definition.arguments.begin.bracket.round.php"
             }
           },
-          "end": "\\)",
+          "end": "\\)|(?=\\?>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.end.bracket.round.php"
@@ -1017,7 +896,11 @@
           "begin": "(?i)(\\\\)?\\b([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\s*(\\()",
           "beginCaptures": {
             "1": {
-              "name": "punctuation.separator.inheritance.php"
+              "patterns": [
+                {
+                  "include": "#namespace"
+                }
+              ]
             },
             "2": {
               "patterns": [
@@ -1034,7 +917,7 @@
               "name": "punctuation.definition.arguments.begin.bracket.round.php"
             }
           },
-          "end": "\\)",
+          "end": "\\)|(?=\\?>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.end.bracket.round.php"
@@ -1732,14 +1615,18 @@
       "patterns": [
         {
           "match": "\\\\[0-7]{1,3}",
-          "name": "constant.numeric.octal.php"
+          "name": "constant.character.escape.octal.php"
         },
         {
           "match": "\\\\x[0-9A-Fa-f]{1,2}",
-          "name": "constant.numeric.hex.php"
+          "name": "constant.character.escape.hex.php"
         },
         {
-          "match": "\\\\[enrt\\\\\\$\\\"]",
+          "match": "\\\\u{[0-9A-Fa-f]+}",
+          "name": "constant.character.escape.unicode.php"
+        },
+        {
+          "match": "\\\\[nrtvef$\"\\\\]",
           "name": "constant.character.escape.php"
         },
         {
@@ -1783,14 +1670,6 @@
         {
           "include": "#comments"
         },
-        {
-          "match": "{",
-          "name": "punctuation.section.scope.begin.php"
-        },
-        {
-          "match": "}",
-          "name": "punctuation.section.scope.end.php"
-        },
         {
           "begin": "(?i)^\\s*(interface)\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\\s*(extends)?\\s*",
           "beginCaptures": {
@@ -1848,68 +1727,165 @@
           ]
         },
         {
-          "begin": "(?i)(?:^|(?<=<\\?php))\\s*(namespace)\\b\\s+(?=([a-z0-9_\\x{7f}-\\x{ff}\\\\]+\\s*($|[;{]|(/[/*])))|$)",
+          "match": "(?i)(?:^|(?<=<\\?php))\\s*(namespace)\\s+([a-z0-9_\\x{7f}-\\x{ff}\\\\]+)(?=\\s*;)",
+          "name": "meta.namespace.php",
+          "captures": {
+            "1": {
+              "name": "keyword.other.namespace.php"
+            },
+            "2": {
+              "name": "entity.name.type.namespace.php",
+              "patterns": [
+                {
+                  "match": "\\\\",
+                  "name": "punctuation.separator.inheritance.php"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "begin": "(?i)(?:^|(?<=<\\?php))\\s*(namespace)\\s+",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.namespace.php"
             }
           },
-          "contentName": "entity.name.type.namespace.php",
-          "end": "(?i)(?=\\s*$|[^a-z0-9_\\x{7f}-\\x{ff}\\\\])",
+          "end": "(?<=})|(?=\\?>)",
           "name": "meta.namespace.php",
           "patterns": [
             {
-              "match": "\\\\",
-              "name": "punctuation.separator.inheritance.php"
+              "include": "#comments"
+            },
+            {
+              "match": "(?i)[a-z0-9_\\x{7f}-\\x{ff}\\\\]+",
+              "name": "entity.name.type.namespace.php",
+              "captures": {
+                "0": {
+                  "patterns": [
+                    {
+                      "match": "\\\\",
+                      "name": "punctuation.separator.inheritance.php"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "begin": "{",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.namespace.begin.bracket.curly.php"
+                }
+              },
+              "end": "}|(?=\\?>)",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.namespace.end.bracket.curly.php"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#language"
+                }
+              ]
+            },
+            {
+              "match": "[^\\s]+",
+              "name": "invalid.illegal.identifier.php"
             }
           ]
         },
         {
-          "begin": "(?i)\\b(use)\\s+(?:(const|function)\\s+)?",
+          "match": "\\s+(?=use\\b)"
+        },
+        {
+          "begin": "(?i)\\buse\\b",
           "beginCaptures": {
-            "1": {
+            "0": {
               "name": "keyword.other.use.php"
-            },
-            "2": {
-              "name": "storage.type.${2:/downcase}.php"
             }
           },
-          "end": "(?=;|(?:^\\s*$))",
+          "end": "(?<=})|(?=;)",
           "name": "meta.use.php",
           "patterns": [
             {
-              "include": "#comments"
+              "match": "\\b(const|function)\\b",
+              "name": "storage.type.${1:/downcase}.php"
             },
             {
-              "begin": "(?i)\\s*(?=[a-z0-9_\\x{7f}-\\x{ff}\\\\])",
-              "end": "(?i)(?:\\s*(as)\\s+([a-z0-9_\\x{7f}-\\x{ff}]*))?\\s*(?=,|;|$)",
+              "begin": "{",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.use.begin.bracket.curly.php"
+                }
+              },
+              "end": "}",
               "endCaptures": {
-                "1": {
-                  "name": "keyword.other.use-as.php"
-                },
-                "2": {
-                  "name": "support.other.namespace.use-as.php"
+                "0": {
+                  "name": "punctuation.definition.use.end.bracket.curly.php"
                 }
               },
               "patterns": [
                 {
-                  "include": "#class-builtin"
+                  "include": "#scope-resolution"
                 },
                 {
-                  "begin": "(?i)\\s*(?=[a-z0-9_\\x{7f}-\\x{ff}\\\\])",
-                  "end": "$|(?=[\\s,;])",
-                  "name": "support.other.namespace.use.php",
-                  "patterns": [
-                    {
-                      "match": "\\\\",
-                      "name": "punctuation.separator.inheritance.php"
+                  "match": "(?xi)\n\\b(as)\n\\s+(final|abstract|public|private|protected|static)\n\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n\\b",
+                  "captures": {
+                    "1": {
+                      "name": "keyword.other.use-as.php"
+                    },
+                    "2": {
+                      "name": "storage.modifier.php"
+                    },
+                    "3": {
+                      "name": "entity.other.alias.php"
                     }
-                  ]
+                  }
+                },
+                {
+                  "match": "(?xi)\n\\b(as)\n\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n\\b",
+                  "captures": {
+                    "1": {
+                      "name": "keyword.other.use-as.php"
+                    },
+                    "2": {
+                      "patterns": [
+                        {
+                          "match": "^(?:final|abstract|public|private|protected|static)$",
+                          "name": "storage.modifier.php"
+                        },
+                        {
+                          "match": ".+",
+                          "name": "entity.other.alias.php"
+                        }
+                      ]
+                    }
+                  }
+                },
+                {
+                  "match": "(?i)\\b(insteadof)\\s+([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)",
+                  "captures": {
+                    "1": {
+                      "name": "keyword.other.use-insteadof.php"
+                    },
+                    "2": {
+                      "name": "support.class.php"
+                    }
+                  }
+                },
+                {
+                  "match": ";",
+                  "name": "punctuation.terminator.expression.php"
+                },
+                {
+                  "include": "#use-inner"
                 }
               ]
             },
             {
-              "match": "\\s*,\\s*"
+              "include": "#use-inner"
             }
           ]
         },
@@ -1926,7 +1902,7 @@
               "name": "entity.name.type.class.php"
             }
           },
-          "end": "}",
+          "end": "}|(?=\\?>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.class.end.bracket.curly.php"
@@ -2025,11 +2001,11 @@
                   "name": "punctuation.definition.class.begin.bracket.curly.php"
                 }
               },
-              "end": "(?=})",
+              "end": "(?=}|\\?>)",
               "contentName": "meta.class.body.php",
               "patterns": [
                 {
-                  "include": "#class-body"
+                  "include": "#language"
                 }
               ]
             }
@@ -2039,8 +2015,12 @@
           "include": "#switch_statement"
         },
         {
-          "match": "(?x)\n\\b(\n  break|case|continue|declare|default|die|do|\n  else(if)?|end(declare|for(each)?|if|switch|while)|exit|\n  for(each)?|if|return|switch|use|while|yield\n)\\b",
-          "name": "keyword.control.php"
+          "match": "(?x)\n\\s*\n\\b(\n  break|case|continue|declare|default|die|do|\n  else(if)?|end(declare|for(each)?|if|switch|while)|exit|\n  for(each)?|if|return|switch|use|while|yield\n)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.control.${1:/downcase}.php"
+            }
+          }
         },
         {
           "begin": "(?i)\\b((?:require|include)(?:_once)?)\\s+",
@@ -2257,7 +2237,7 @@
               "name": "punctuation.definition.array.begin.bracket.round.php"
             }
           },
-          "end": "\\)",
+          "end": "\\)|(?=\\?>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.array.end.bracket.round.php"
@@ -2285,7 +2265,7 @@
           }
         },
         {
-          "match": "(?i)\\b(array|real|double|float|int(eger)?|bool(ean)?|string|class|clone|var|function|interface|trait|parent|self|object)\\b",
+          "match": "(?i)\\b(array|real|double|float|int(eger)?|bool(ean)?|string|class|var|function|interface|trait|parent|self|object)\\b",
           "name": "storage.type.php"
         },
         {
@@ -2299,9 +2279,20 @@
           "match": ";",
           "name": "punctuation.terminator.expression.php"
         },
+        {
+          "match": ":",
+          "name": "punctuation.terminator.statement.php"
+        },
         {
           "include": "#heredoc"
         },
+        {
+          "include": "#numbers"
+        },
+        {
+          "match": "(?i)\\bclone\\b",
+          "name": "keyword.other.clone.php"
+        },
         {
           "match": "\\.=?",
           "name": "keyword.operator.string.php"
@@ -2376,9 +2367,6 @@
             }
           ]
         },
-        {
-          "include": "#numbers"
-        },
         {
           "include": "#instantiation"
         },
@@ -2404,6 +2392,25 @@
         {
           "include": "#string-backtick"
         },
+        {
+          "begin": "{",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.begin.bracket.curly.php"
+            }
+          },
+          "end": "}|(?=\\?>)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.end.bracket.curly.php"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#language"
+            }
+          ]
+        },
         {
           "begin": "\\[",
           "beginCaptures": {
@@ -2411,7 +2418,7 @@
               "name": "punctuation.section.array.begin.php"
             }
           },
-          "end": "\\]",
+          "end": "\\]|(?=\\?>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.array.end.php"
@@ -2430,7 +2437,7 @@
               "name": "punctuation.definition.begin.bracket.round.php"
             }
           },
-          "end": "\\)",
+          "end": "\\)|(?=\\?>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.end.bracket.round.php"
@@ -2471,8 +2478,36 @@
       ]
     },
     "numbers": {
-      "match": "(?i)\\b((0x[0-9a-f]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(e(\\+|-)?[0-9]+)?)\\b",
-      "name": "constant.numeric.php"
+      "patterns": [
+        {
+          "match": "0[xX][0-9a-fA-F]+",
+          "name": "constant.numeric.hex.php"
+        },
+        {
+          "match": "0[bB][01]+",
+          "name": "constant.numeric.binary.php"
+        },
+        {
+          "match": "0[0-7]+",
+          "name": "constant.numeric.octal.php"
+        },
+        {
+          "match": "(?x)\n(?:\n  [0-9]*(\\.)[0-9]+(?:[eE][+-]?[0-9]+)?|\n  [0-9]+(\\.)[0-9]*(?:[eE][+-]?[0-9]+)?|\n  [0-9]+[eE][+-]?[0-9]+\n)",
+          "name": "constant.numeric.decimal.php",
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.decimal.period.php"
+            },
+            "2": {
+              "name": "punctuation.separator.decimal.period.php"
+            }
+          }
+        },
+        {
+          "match": "0|[1-9][0-9]*",
+          "name": "constant.numeric.decimal.php"
+        }
+      ]
     },
     "object": {
       "patterns": [
@@ -2511,7 +2546,7 @@
               "name": "punctuation.definition.arguments.begin.bracket.round.php"
             }
           },
-          "end": "\\)",
+          "end": "\\)|(?=\\?>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.end.bracket.round.php"
@@ -2646,7 +2681,7 @@
           "match": "(@xlink)\\s+(.+)\\s*$"
         },
         {
-          "begin": "(@(?:global|param|property(-(read|write))?|return|throws|var))\\s+(?=[A-Za-z_\\x{7f}-\\x{ff}]|\\()",
+          "begin": "(@(?:global|param|property(-(read|write))?|return|throws|var))\\s+(?=[A-Za-z_\\x{7f}-\\x{ff}\\\\]|\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.phpdoc.php"
@@ -2682,7 +2717,7 @@
       ]
     },
     "php_doc_types": {
-      "match": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*(\\|[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)*",
+      "match": "(?i)[a-z_\\x{7f}-\\x{ff}\\\\][a-z0-9_\\x{7f}-\\x{ff}\\\\]*(\\|[a-z_\\x{7f}-\\x{ff}\\\\][a-z0-9_\\x{7f}-\\x{ff}\\\\]*)*",
       "captures": {
         "0": {
           "patterns": [
@@ -2708,7 +2743,7 @@
           "name": "punctuation.definition.type.begin.bracket.round.phpdoc.php"
         }
       },
-      "end": "(\\))(\\[\\])",
+      "end": "(\\))(\\[\\])|(?=\\*/)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.type.end.bracket.round.phpdoc.php"
@@ -2734,7 +2769,7 @@
       ]
     },
     "php_doc_types_array_single": {
-      "match": "(?i)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)(\\[\\])",
+      "match": "(?i)([a-z_\\x{7f}-\\x{ff}\\\\][a-z0-9_\\x{7f}-\\x{ff}\\\\]*)(\\[\\])",
       "captures": {
         "1": {
           "patterns": [
@@ -2883,7 +2918,7 @@
               "name": "punctuation.definition.arguments.begin.bracket.round.php"
             }
           },
-          "end": "\\)",
+          "end": "\\)|(?=\\?>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.arguments.end.bracket.round.php"
@@ -3572,6 +3607,9 @@
     },
     "switch_statement": {
       "patterns": [
+        {
+          "match": "\\s+(?=switch\\b)"
+        },
         {
           "begin": "\\bswitch\\b(?!\\s*\\(.*\\)\\s*:)",
           "beginCaptures": {
@@ -3579,7 +3617,7 @@
               "name": "keyword.control.switch.php"
             }
           },
-          "end": "}",
+          "end": "}|(?=\\?>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.section.switch-block.end.bracket.curly.php"
@@ -3594,7 +3632,7 @@
                   "name": "punctuation.definition.switch-expression.begin.bracket.round.php"
                 }
               },
-              "end": "\\)",
+              "end": "\\)|(?=\\?>)",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.switch-expression.end.bracket.round.php"
@@ -3613,38 +3651,8 @@
                   "name": "punctuation.definition.section.switch-block.begin.bracket.curly.php"
                 }
               },
-              "end": "(?=})",
+              "end": "(?=}|\\?>)",
               "patterns": [
-                {
-                  "begin": "\\bcase\\b",
-                  "beginCaptures": {
-                    "0": {
-                      "name": "keyword.control.case.php"
-                    }
-                  },
-                  "end": ":",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.terminator.statement.php"
-                    }
-                  },
-                  "patterns": [
-                    {
-                      "include": "#language"
-                    }
-                  ]
-                },
-                {
-                  "match": "(?:^\\s*)?\\b(default)\\s*(:)",
-                  "captures": {
-                    "1": {
-                      "name": "keyword.control.default.php"
-                    },
-                    "2": {
-                      "name": "punctuation.terminator.statement.php"
-                    }
-                  }
-                },
                 {
                   "include": "#language"
                 }
@@ -3654,6 +3662,34 @@
         }
       ]
     },
+    "use-inner": {
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "begin": "(?i)\\b(as)\\s+",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.use-as.php"
+            }
+          },
+          "end": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
+          "endCaptures": {
+            "0": {
+              "name": "entity.other.alias.php"
+            }
+          }
+        },
+        {
+          "include": "#class-name"
+        },
+        {
+          "match": ",",
+          "name": "punctuation.separator.delimiter.php"
+        }
+      ]
+    },
     "var_basic": {
       "patterns": [
         {