github-linguist 7.6.0 → 7.10.0

data/grammars/text.dfy.dafny.json

@@ -0,0 +1,188 @@
+{
+  "name": "Dafny",
+  "scopeName": "text.dfy.dafny",
+  "patterns": [
+    {
+      "name": "meta.class.identifier.dafny",
+      "begin": "(class)\\s*(\\w+)\\s*",
+      "end": "\\{",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.dafny"
+        },
+        "2": {
+          "name": "entity.name.function.dafny"
+        }
+      }
+    },
+    {
+      "name": "keyword.control.dafny",
+      "match": "\\b(class|trait|datatype|codatatype|type|newtype|function|ghost|var|const|method|constructor|colemma|abstract|module|import|export|lemma|as|opened|static|protected|twostate|refines|witness|extends|returns|break|then|else|if|label|return|while|print|where|new|in|fresh|allocated|match|case|assert|by|assume|expect|reveal|modify|predicate|inductive|copredicate|forall|exists|false|true|null|old|unchanged|calc|iterator|yields|yield)\\b"
+    },
+    {
+      "name": "meta.method.identifier.dafny",
+      "begin": "(\\w+)\\s*\\(",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "#parameters"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.dafny"
+        }
+      }
+    },
+    {
+      "include": "#code"
+    }
+  ],
+  "repository": {
+    "code": {
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#comments-inline"
+        },
+        {
+          "include": "#keywords"
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
+        {
+          "name": "comment.block.empty.dafny",
+          "match": "/\\*\\*/",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.dafny"
+            }
+          }
+        },
+        {
+          "include": "#comments-inline"
+        }
+      ]
+    },
+    "comments-inline": {
+      "patterns": [
+        {
+          "name": "comment.block.dafny",
+          "begin": "/\\*",
+          "end": "\\*/",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.dafny"
+            }
+          }
+        },
+        {
+          "match": "\\s*((//).*$\\n?)",
+          "captures": {
+            "1": {
+              "name": "comment.line.double-slash.dafny"
+            },
+            "2": {
+              "name": "punctuation.definition.comment.dafny"
+            }
+          }
+        }
+      ]
+    },
+    "generics": {
+      "patterns": [
+        {
+          "name": "meta.type.identifier.dafny",
+          "begin": "\u003c(\\w+)",
+          "end": "\u003e",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.dafny"
+            }
+          }
+        }
+      ]
+    },
+    "keywords": {
+      "patterns": [
+        {
+          "name": "keyword.control.dafny",
+          "match": "\\b(class|trait|datatype|codatatype|type|newtype|function|include|ghost|var|const|method|constructor|colemma|abstract|module|import|export|lemma|as|opened|static|protected|twostate|refines|witness|extends|returns|break|then|else|if|label|return|while|print|where|new|in|fresh|allocated|match|case|assert|by|assume|reveal|modify|predicate|inductive|copredicate|forall|exists|false|true|null|old|unchanged|calc|iterator|yields|yield)\\b"
+        },
+        {
+          "name": "entity.name.function",
+          "match": "\\b(function)\\b"
+        },
+        {
+          "name": "punctuation.terminator.dafny",
+          "match": ";"
+        },
+        {
+          "name": "keyword.control.verify.dafny",
+          "match": "\\b(requires|ensures|modifies|reads|invariant|decreases|reveals|provides)\\b"
+        },
+        {
+          "name": "keyword.type.dafny",
+          "match": "\\b(bool|char|real|multiset|map|imap|nat|int|ORDINAL|object|string|set|iset|seq|array|array[1-9]\\d*|bv0|bv[1-9]\\d*)\\b"
+        },
+        {
+          "name": "storage.type.dafny",
+          "match": "this"
+        },
+        {
+          "name": "keyword.control.catch-exception.dafny",
+          "match": "\\b(try|catch|finally|throw)\\b"
+        },
+        {
+          "name": "keyword.control.dafny",
+          "match": "\\|:"
+        },
+        {
+          "name": "keyword.operator.comparison.dafny",
+          "match": "(==|!=|\u003c=|\u003e=|\u003c\u003e|\u003c|\u003e)"
+        },
+        {
+          "name": "keyword.operator.assignment.dafny",
+          "match": "(:=)"
+        },
+        {
+          "name": "keyword.operator.increment-decrement.dafny",
+          "match": "(\\-\\-|\\+\\+)"
+        },
+        {
+          "name": "keyword.operator.arithmetic.dafny",
+          "match": "(\\-|\\+|\\*|\\/|%)"
+        },
+        {
+          "name": "keyword.operator.logical.dafny",
+          "match": "(!|\u0026\u0026|\\|\\|)"
+        },
+        {
+          "name": "keyword.operator.dereference.dafny",
+          "match": "(?\u003c=\\S)\\.(?=\\S)"
+        }
+      ]
+    },
+    "parameters": {
+      "patterns": [
+        {
+          "name": "meta.type.identifier.dafny",
+          "begin": ":\\s*(\\w+)",
+          "end": "\\s*|,|\\)|\\}|requires|ensures|modifies",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.dafny"
+            }
+          }
+        },
+        {
+          "include": "#generics"
+        }
+      ]
+    }
+  }
+}

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

@@ -23,130 +23,471 @@
         }
       ]
     },
-    "class-builtin": {
-      "patterns": [
-        {
-          "name": "support.class.builtin.php",
-          "match": "(?xi)\n(\\\\)?\\b\n((APC|Append)Iterator|Array(Access|Iterator|Object)\n|Bad(Function|Method)CallException\n|(Caching|CallbackFilter)Iterator|Collator|Collectable|Cond|Countable|CURLFile\n|Date(Interval|Period|Time(Interface|Immutable|Zone)?)?|Directory(Iterator)?|DomainException\n|DOM(Attr|CdataSection|CharacterData|Comment|Document(Fragment)?|Element|EntityReference\n    |Implementation|NamedNodeMap|Node(list)?|ProcessingInstruction|Text|XPath)\n|(Error)?Exception|EmptyIterator\n|finfo\n|Ev(Check|Child|Embed|Fork|Idle|Io|Loop|Periodic|Prepare|Signal|Stat|Timer|Watcher)?\n|Event(Base|Buffer(Event)?|SslContext|Http(Request|Connection)?|Config|DnsBase|Util|Listener)?\n|FANNConnection|(Filter|Filesystem)Iterator\n|Gender\\\\Gender|GlobIterator|Gmagick(Draw|Pixel)?\n|Haru(Annotation|Destination|Doc|Encoder|Font|Image|Outline|Page)\n|Http((Inflate|Deflate)?Stream|Message|Request(Pool)?|Response|QueryString)\n|HRTime\\\\(PerformanceCounter|StopWatch)\n|Intl(Calendar|((CodePoint|RuleBased)?Break|Parts)?Iterator|DateFormatter|TimeZone)\n|Imagick(Draw|Pixel(Iterator)?)?\n|InfiniteIterator|InvalidArgumentException|Iterator(Aggregate|Iterator)?\n|JsonSerializable\n|KTaglib_(MPEG_(File|AudioProperties)|Tag|ID3v2_(Tag|(AttachedPicture)?Frame))\n|Lapack|(Length|Locale|Logic)Exception|LimitIterator|Lua(Closure)?\n|Mongo(BinData|Client|Code|Collection|CommandCursor|Cursor(Exception)?|Date|DB(Ref)?|DeleteBatch\n      |Grid(FS(Cursor|File)?)|Id|InsertBatch|Int(32|64)|Log|Pool|Regex|ResultException|Timestamp\n      |UpdateBatch|Write(Batch|ConcernException))?\n|Memcache(d)?|MessageFormatter|MultipleIterator|Mutex\n|mysqli(_(driver|stmt|warning|result))?\n|MysqlndUh(Connection|PreparedStatement)\n|NoRewindIterator|Normalizer|NumberFormatter\n|OCI-(Collection|Lob)|OuterIterator|(OutOf(Bounds|Range)|Overflow)Exception\n|ParentIterator|PDO(Statement)?|Phar(Data|FileInfo)?|php_user_filter|Pool\n|QuickHash(Int(Set|StringHash)|StringIntHash)\n|Recursive(Array|Caching|Directory|Fallback|Filter|Iterator|Regex|Tree)?Iterator\n|Reflection(Class|Function(Abstract)?|Method|Object|Parameter|Property|(Zend)?Extension)?\n|RangeException|Reflector|RegexIterator|ResourceBundle|RuntimeException|RRD(Creator|Graph|Updater)\n|SAM(Connection|Message)|SCA(_(SoapProxy|LocalProxy))?\n|SDO_(DAS_(ChangeSummary|Data(Factory|Object)|Relational|Setting|XML(_Document)?)\n     |Data(Factory|Object)|Exception|List|Model_(Property|ReflectionDataObject|Type)|Sequence)\n|SeekableIterator|Serializable|SessionHandler(Interface)?|SimpleXML(Iterator|Element)|SNMP\n|Soap(Client|Fault|Header|Param|Server|Var)\n|SphinxClient|Spoofchecker\n|Spl(DoublyLinkedList|Enum|File(Info|Object)|FixedArray|(Max|Min)?Heap|Observer|ObjectStorage\n    |(Priority)?Queue|Stack|Subject|Type|TempFileObject)\n|SQLite(3(Result|Stmt)?|Database|Result|Unbuffered)\n|stdClass|streamWrapper|SVM(Model)?|Swish(Result(s)?|Search)?|Sync(Event|Mutex|ReaderWriter|Semaphore)\n|Thread(ed)?|tidy(Node)?|TokyoTyrant(Table|Iterator|Query)?|Transliterator|Traversable\n|UConverter|(Underflow|UnexpectedValue)Exception\n|V8Js(Exception)?|Varnish(Admin|Log|Stat)\n|Worker|Weak(Map|Ref)\n|XML(Diff\\\\(Base|DOM|File|Memory)|Reader|Writer)|XsltProcessor\n|Yaf_(Route_(Interface|Map|Regex|Rewrite|Simple|Supervar)\n     |Action_Abstract|Application|Config_(Simple|Ini|Abstract)|Controller_Abstract\n     |Dispatcher|Exception|Loader|Plugin_Abstract|Registry|Request_(Abstract|Simple|Http)\n     |Response_Abstract|Router|Session|View_(Simple|Interface))\n|Yar_(Client(_Exception)?|Concurrent_Client|Server(_Exception)?)\n|ZipArchive|ZMQ(Context|Device|Poll|Socket)?)\n\\b",
-          "captures": {
-            "1": {
-              "name": "punctuation.separator.inheritance.php"
-            }
-          }
-        }
-      ]
-    },
-    "class-name": {
+    "blade": {
       "patterns": [
         {
-          "begin": "(?i)(?=\\\\?[a-z_0-9]+\\\\)",
-          "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
+          "name": "comment.block.blade",
+          "begin": "{{--",
+          "end": "--}}",
           "patterns": [
             {
-              "include": "#namespace"
+              "name": "invalid.illegal.php-code-in-comment.blade",
+              "begin": "(^\\s*)(?=\u003c\\?(?![^?]*\\?\u003e))",
+              "end": "(?!\\G)(\\s*$\\n)?",
+              "patterns": [
+                {
+                  "name": "meta.embedded.block.php",
+                  "contentName": "source.php",
+                  "begin": "\u003c\\?(?i:php|=)?",
+                  "end": "(\\?)\u003e",
+                  "patterns": [
+                    {
+                      "include": "#language"
+                    }
+                  ],
+                  "beginCaptures": {
+                    "0": {
+                      "name": "punctuation.section.embedded.begin.php"
+                    }
+                  },
+                  "endCaptures": {
+                    "0": {
+                      "name": "punctuation.section.embedded.end.php"
+                    },
+                    "1": {
+                      "name": "source.php"
+                    }
+                  }
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.whitespace.embedded.leading.php"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.whitespace.embedded.trailing.php"
+                }
+              }
+            },
+            {
+              "name": "invalid.illegal.php-code-in-comment.blade.meta.embedded.block.php",
+              "contentName": "source.php",
+              "begin": "\u003c\\?(?i:php|=)?(?![^?]*\\?\u003e)",
+              "end": "(\\?)\u003e",
+              "patterns": [
+                {
+                  "include": "#language"
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.begin.php"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.end.php"
+                },
+                "1": {
+                  "name": "source.php"
+                }
+              }
+            },
+            {
+              "name": "invalid.illegal.php-code-in-comment.blade.meta.embedded.line.php",
+              "begin": "\u003c\\?(?i:php|=)?",
+              "end": "\u003e",
+              "patterns": [
+                {
+                  "name": "meta.special.empty-tag.php",
+                  "match": "\\G(\\s*)((\\?))(?=\u003e)",
+                  "captures": {
+                    "1": {
+                      "name": "source.php"
+                    },
+                    "2": {
+                      "name": "punctuation.section.embedded.end.php"
+                    },
+                    "3": {
+                      "name": "source.php"
+                    }
+                  }
+                },
+                {
+                  "contentName": "source.php",
+                  "begin": "\\G",
+                  "end": "(\\?)(?=\u003e)",
+                  "patterns": [
+                    {
+                      "include": "#language"
+                    }
+                  ],
+                  "endCaptures": {
+                    "0": {
+                      "name": "punctuation.section.embedded.end.php"
+                    },
+                    "1": {
+                      "name": "source.php"
+                    }
+                  }
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.begin.php"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.end.php"
+                }
+              }
             }
           ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.begin.blade"
+            }
+          },
           "endCaptures": {
-            "1": {
-              "name": "support.class.php"
+            "0": {
+              "name": "punctuation.definition.comment.end.blade"
             }
           }
         },
         {
-          "include": "#class-builtin"
+          "name": "comment.blade",
+          "match": "@(?={{{|{{|{!!|@\\w+(?:::\\w+)?)"
         },
         {
-          "begin": "(?=[\\\\a-zA-Z_])",
-          "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
+          "name": "meta.function.echo.blade",
+          "contentName": "source.php",
+          "begin": "(?\u003c!@){{{",
+          "end": "(})}}",
           "patterns": [
             {
-              "include": "#namespace"
+              "include": "#language"
             }
           ],
+          "beginCaptures": {
+            "0": {
+              "name": "support.function.construct.begin.blade"
+            }
+          },
           "endCaptures": {
+            "0": {
+              "name": "support.function.construct.end.blade"
+            },
             "1": {
-              "name": "support.class.php"
+              "name": "source.php"
             }
           }
-        }
-      ]
-    },
-    "comments": {
-      "patterns": [
+        },
         {
-          "name": "comment.block.documentation.phpdoc.php",
-          "begin": "/\\*\\*(?=\\s)",
-          "end": "\\*/",
+          "name": "meta.function.echo.blade",
+          "contentName": "source.php",
+          "begin": "(?\u003c![@{]){{",
+          "end": "(})}",
           "patterns": [
             {
-              "include": "#php_doc"
+              "include": "#language"
             }
           ],
           "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.comment.php"
+              "name": "support.function.construct.begin.blade"
             }
           },
           "endCaptures": {
             "0": {
-              "name": "punctuation.definition.comment.php"
+              "name": "support.function.construct.end.blade"
+            },
+            "1": {
+              "name": "source.php"
             }
           }
         },
         {
-          "name": "comment.block.php",
-          "begin": "/\\*",
-          "end": "\\*/",
-          "captures": {
+          "name": "meta.function.echo.blade",
+          "contentName": "source.php",
+          "begin": "(?\u003c!@){!!",
+          "end": "(!)!}",
+          "patterns": [
+            {
+              "include": "#language"
+            }
+          ],
+          "beginCaptures": {
             "0": {
-              "name": "punctuation.definition.comment.php"
+              "name": "support.function.construct.begin.blade"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "support.function.construct.end.blade"
+            },
+            "1": {
+              "name": "source.php"
             }
           }
         },
         {
-          "begin": "(^\\s+)?(?=//)",
-          "end": "(?!\\G)",
+          "name": "meta.directive.blade",
+          "contentName": "source.php",
+          "begin": "(?x)\n(?\u003c![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  |canany\n  |cannot\n  |case\n  |choice\n  |component\n  |componentfirst\n  |continue\n  |dd\n  |dump\n  |each\n  |elseauth\n  |elsecan\n  |elsecanany\n  |elsecannot\n  |elseguest\n  |elseif\n  |empty\n  |env\n  |error\n  |extends\n  |for\n  |foreach\n  |forelse\n  |guest\n  |hassection\n  |if\n  |include\n  |includefirst\n  |includeif\n  |includeunless\n  |includewhen\n  |inject\n  |isset\n  |json\n  |lang\n  |method\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",
+          "end": "\\)",
           "patterns": [
             {
-              "name": "comment.line.double-slash.php",
-              "begin": "//",
-              "end": "\\n|(?=\\?\u003e)",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.comment.php"
-                }
-              }
+              "include": "#language"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "punctuation.whitespace.comment.leading.php"
+              "name": "keyword.blade"
+            },
+            "2": {
+              "name": "begin.bracket.round.blade.php"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "end.bracket.round.blade.php"
             }
           }
         },
         {
-          "begin": "(^\\s+)?(?=#)",
-          "end": "(?!\\G)",
+          "name": "meta.directive.blade",
+          "contentName": "comment.blade",
+          "begin": "(?x)\n(?\u003c![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   append\n  |csrf\n  |default\n  |else\n  |endauth\n  |endcan\n  |endcanany\n  |endcannot\n  |endcomponent\n  |endcomponentfirst\n  |endempty\n  |endenv\n  |enderror\n  |endfor\n  |endforeach\n  |endforelse\n  |endguest\n  |endif\n  |endisset\n  |endlang\n  |endprepend\n  |endproduction\n  |endpush\n  |endsection\n  |endslot\n  |endswitch\n  |endunless\n  |endwhile\n  |overwrite\n  |parent\n  |production\n  |show\n  |stop\n  )\n  [\\t ]* # Whitespace between name and parentheses\n)\n(\\() # Followed by opening parentheses",
+          "end": "\\)",
           "patterns": [
             {
-              "name": "comment.line.number-sign.php",
-              "begin": "#",
-              "end": "\\n|(?=\\?\u003e)",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.comment.php"
-                }
-              }
+              "include": "#balance_brackets"
             }
           ],
           "beginCaptures": {
             "1": {
-              "name": "punctuation.whitespace.comment.leading.php"
+              "name": "keyword.blade"
+            },
+            "2": {
+              "name": "begin.bracket.round.blade.php"
             }
-          }
-        }
-      ]
-    },
+          },
+          "endCaptures": {
+            "0": {
+              "name": "end.bracket.round.blade.php"
+            }
+          }
+        },
+        {
+          "name": "keyword.blade",
+          "match": "(?x)\n(?\u003c![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to word boundary\n (?i)append\n|(?i)auth\n|(?i)break\n|(?i)continue\n|(?i)csrf\n|(?i)default\n|(?i)else\n|(?i)elseauth\n|(?i)elseguest\n|(?i)empty\n|(?i)endauth\n|(?i)endcan\n|(?i)endcanany\n|(?i)endcannot\n|(?i)endcomponent\n|(?i)endcomponentfirst\n|(?i)endempty\n|(?i)endenv\n|(?i)enderror\n|(?i)endfor\n|(?i)endforeach\n|(?i)endforelse\n|(?i)endguest\n|(?i)endif\n|(?i)endisset\n|(?i)endlang\n|(?i)endprepend\n|(?i)endproduction\n|(?i)endpush\n|(?i)endsection\n|(?i)endslot\n|(?i)endswitch\n|(?i)endunless\n|endverbatim\n|(?i)endwhile\n|(?i)guest\n|(?i)lang\n|(?i)overwrite\n|(?i)parent\n|(?i)production\n|(?i)show\n|(?i)stop\n|verbatim\n)\n\\b"
+        },
+        {
+          "name": "meta.embedded.block.blade",
+          "contentName": "source.php",
+          "begin": "(?\u003c![A-Za-z0-9_@])@(?i:php)\\b",
+          "end": "(?\u003c![A-Za-z0-9_@])(?=@(?i:endphp)\\b)",
+          "patterns": [
+            {
+              "include": "#language"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.begin.blade"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "keyword.end.blade"
+            }
+          }
+        },
+        {
+          "name": "meta.directive.blade",
+          "contentName": "comment.blade",
+          "begin": "(?x)\n(?\u003c![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n(\n  @\n  (?i:\n    endphp\n  )\n  [\\t ]* # Whitespace between name and parentheses\n)\n(\\() # Followed by opening parentheses",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#balance_brackets"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.end.blade"
+            },
+            "2": {
+              "name": "begin.bracket.round.blade.php"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "end.bracket.round.blade.php"
+            }
+          }
+        },
+        {
+          "name": "keyword.end.blade",
+          "match": "(?x)\n(?\u003c![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to word boundary\n (?i)endphp\n)\n\\b"
+        },
+        {
+          "name": "meta.directive.custom.blade",
+          "contentName": "source.php",
+          "begin": "(?x)\n(?\u003c![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n(\n  @\n  \\w+(?:::\\w+)? # Any number/letter sequence, can also be postfixed by ::someOtherString\n  [\\t ]* # Whitespace between name and parentheses\n)\n(\\() # Followed by opening parentheses",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#language"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.blade"
+            },
+            "2": {
+              "name": "begin.bracket.round.blade.php"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "end.bracket.round.blade.php"
+            }
+          }
+        },
+        {
+          "name": "entity.name.function.blade",
+          "match": "(?x)\n(?\u003c![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n\\w+(?:::\\w+)? # Any number/letter sequence, can also be postfixed by ::someOtherString\n\\b # Bounded by word boundary"
+        }
+      ]
+    },
+    "class-builtin": {
+      "patterns": [
+        {
+          "name": "support.class.builtin.php",
+          "match": "(?xi)\n(\\\\)?\\b\n((APC|Append)Iterator|Array(Access|Iterator|Object)\n|Bad(Function|Method)CallException\n|(Caching|CallbackFilter)Iterator|Collator|Collectable|Cond|Countable|CURLFile\n|Date(Interval|Period|Time(Interface|Immutable|Zone)?)?|Directory(Iterator)?|DomainException\n|DOM(Attr|CdataSection|CharacterData|Comment|Document(Fragment)?|Element|EntityReference\n    |Implementation|NamedNodeMap|Node(list)?|ProcessingInstruction|Text|XPath)\n|(Error)?Exception|EmptyIterator\n|finfo\n|Ev(Check|Child|Embed|Fork|Idle|Io|Loop|Periodic|Prepare|Signal|Stat|Timer|Watcher)?\n|Event(Base|Buffer(Event)?|SslContext|Http(Request|Connection)?|Config|DnsBase|Util|Listener)?\n|FANNConnection|(Filter|Filesystem)Iterator\n|Gender\\\\Gender|GlobIterator|Gmagick(Draw|Pixel)?\n|Haru(Annotation|Destination|Doc|Encoder|Font|Image|Outline|Page)\n|Http((Inflate|Deflate)?Stream|Message|Request(Pool)?|Response|QueryString)\n|HRTime\\\\(PerformanceCounter|StopWatch)\n|Intl(Calendar|((CodePoint|RuleBased)?Break|Parts)?Iterator|DateFormatter|TimeZone)\n|Imagick(Draw|Pixel(Iterator)?)?\n|InfiniteIterator|InvalidArgumentException|Iterator(Aggregate|Iterator)?\n|JsonSerializable\n|KTaglib_(MPEG_(File|AudioProperties)|Tag|ID3v2_(Tag|(AttachedPicture)?Frame))\n|Lapack|(Length|Locale|Logic)Exception|LimitIterator|Lua(Closure)?\n|Mongo(BinData|Client|Code|Collection|CommandCursor|Cursor(Exception)?|Date|DB(Ref)?|DeleteBatch\n      |Grid(FS(Cursor|File)?)|Id|InsertBatch|Int(32|64)|Log|Pool|Regex|ResultException|Timestamp\n      |UpdateBatch|Write(Batch|ConcernException))?\n|Memcache(d)?|MessageFormatter|MultipleIterator|Mutex\n|mysqli(_(driver|stmt|warning|result))?\n|MysqlndUh(Connection|PreparedStatement)\n|NoRewindIterator|Normalizer|NumberFormatter\n|OCI-(Collection|Lob)|OuterIterator|(OutOf(Bounds|Range)|Overflow)Exception\n|ParentIterator|PDO(Statement)?|Phar(Data|FileInfo)?|php_user_filter|Pool\n|QuickHash(Int(Set|StringHash)|StringIntHash)\n|Recursive(Array|Caching|Directory|Fallback|Filter|Iterator|Regex|Tree)?Iterator\n|Reflection(Class|Function(Abstract)?|Method|Object|Parameter|Property|(Zend)?Extension)?\n|RangeException|Reflector|RegexIterator|ResourceBundle|RuntimeException|RRD(Creator|Graph|Updater)\n|SAM(Connection|Message)|SCA(_(SoapProxy|LocalProxy))?\n|SDO_(DAS_(ChangeSummary|Data(Factory|Object)|Relational|Setting|XML(_Document)?)\n     |Data(Factory|Object)|Exception|List|Model_(Property|ReflectionDataObject|Type)|Sequence)\n|SeekableIterator|Serializable|SessionHandler(Interface)?|SimpleXML(Iterator|Element)|SNMP\n|Soap(Client|Fault|Header|Param|Server|Var)\n|SphinxClient|Spoofchecker\n|Spl(DoublyLinkedList|Enum|File(Info|Object)|FixedArray|(Max|Min)?Heap|Observer|ObjectStorage\n    |(Priority)?Queue|Stack|Subject|Type|TempFileObject)\n|SQLite(3(Result|Stmt)?|Database|Result|Unbuffered)\n|stdClass|streamWrapper|SVM(Model)?|Swish(Result(s)?|Search)?|Sync(Event|Mutex|ReaderWriter|Semaphore)\n|Thread(ed)?|tidy(Node)?|TokyoTyrant(Table|Iterator|Query)?|Transliterator|Traversable\n|UConverter|(Underflow|UnexpectedValue)Exception\n|V8Js(Exception)?|Varnish(Admin|Log|Stat)\n|Worker|Weak(Map|Ref)\n|XML(Diff\\\\(Base|DOM|File|Memory)|Reader|Writer)|XsltProcessor\n|Yaf_(Route_(Interface|Map|Regex|Rewrite|Simple|Supervar)\n     |Action_Abstract|Application|Config_(Simple|Ini|Abstract)|Controller_Abstract\n     |Dispatcher|Exception|Loader|Plugin_Abstract|Registry|Request_(Abstract|Simple|Http)\n     |Response_Abstract|Router|Session|View_(Simple|Interface))\n|Yar_(Client(_Exception)?|Concurrent_Client|Server(_Exception)?)\n|ZipArchive|ZMQ(Context|Device|Poll|Socket)?)\n\\b",
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.inheritance.php"
+            }
+          }
+        }
+      ]
+    },
+    "class-name": {
+      "patterns": [
+        {
+          "begin": "(?i)(?=\\\\?[a-z_0-9]+\\\\)",
+          "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
+          "patterns": [
+            {
+              "include": "#namespace"
+            }
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "support.class.php"
+            }
+          }
+        },
+        {
+          "include": "#class-builtin"
+        },
+        {
+          "begin": "(?=[\\\\a-zA-Z_])",
+          "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
+          "patterns": [
+            {
+              "include": "#namespace"
+            }
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "support.class.php"
+            }
+          }
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
+        {
+          "name": "comment.block.documentation.phpdoc.php",
+          "begin": "/\\*\\*(?=\\s)",
+          "end": "\\*/",
+          "patterns": [
+            {
+              "include": "#php_doc"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.php"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.php"
+            }
+          }
+        },
+        {
+          "name": "comment.block.php",
+          "begin": "/\\*",
+          "end": "\\*/",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.php"
+            }
+          }
+        },
+        {
+          "begin": "(^\\s+)?(?=//)",
+          "end": "(?!\\G)",
+          "patterns": [
+            {
+              "name": "comment.line.double-slash.php",
+              "begin": "//",
+              "end": "\\n|(?=\\?\u003e)",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.comment.php"
+                }
+              }
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.php"
+            }
+          }
+        },
+        {
+          "begin": "(^\\s+)?(?=#)",
+          "end": "(?!\\G)",
+          "patterns": [
+            {
+              "name": "comment.line.number-sign.php",
+              "begin": "#",
+              "end": "\\n|(?=\\?\u003e)",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.comment.php"
+                }
+              }
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.php"
+            }
+          }
+        }
+      ]
+    },
     "constants": {
       "patterns": [
         {
@@ -3183,528 +3524,194 @@
                   "include": "#language"
                 }
               ],
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.section.switch-block.begin.bracket.curly.php"
-                }
-              }
-            }
-          ],
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.control.switch.php"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.section.switch-block.end.bracket.curly.php"
-            }
-          }
-        }
-      ]
-    },
-    "use-inner": {
-      "patterns": [
-        {
-          "include": "#comments"
-        },
-        {
-          "begin": "(?i)\\b(as)\\s+",
-          "end": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.use-as.php"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "entity.other.alias.php"
-            }
-          }
-        },
-        {
-          "include": "#class-name"
-        },
-        {
-          "name": "punctuation.separator.delimiter.php",
-          "match": ","
-        }
-      ]
-    },
-    "var_basic": {
-      "patterns": [
-        {
-          "name": "variable.other.php",
-          "match": "(?i)(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*\\b",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.variable.php"
-            }
-          }
-        }
-      ]
-    },
-    "var_global": {
-      "name": "variable.other.global.php",
-      "match": "(\\$)((_(COOKIE|FILES|GET|POST|REQUEST))|arg(v|c))\\b",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.variable.php"
-        }
-      }
-    },
-    "var_global_safer": {
-      "name": "variable.other.global.safer.php",
-      "match": "(\\$)((GLOBALS|_(ENV|SERVER|SESSION)))",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.variable.php"
-        }
-      }
-    },
-    "var_language": {
-      "name": "variable.language.this.php",
-      "match": "(\\$)this\\b",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.variable.php"
-        }
-      }
-    },
-    "variable-name": {
-      "patterns": [
-        {
-          "include": "#var_global"
-        },
-        {
-          "include": "#var_global_safer"
-        },
-        {
-          "match": "(?xi)\n((\\$)(?\u003cname\u003e[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*))\n(?:\n  (-\u003e)(\\g\u003cname\u003e)\n  |\n  (\\[)(?:(\\d+)|((\\$)\\g\u003cname\u003e)|([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*))(\\])\n)?",
-          "captures": {
-            "1": {
-              "name": "variable.other.php"
-            },
-            "10": {
-              "name": "string.unquoted.index.php"
-            },
-            "11": {
-              "name": "punctuation.section.array.end.php"
-            },
-            "2": {
-              "name": "punctuation.definition.variable.php"
-            },
-            "4": {
-              "name": "keyword.operator.class.php"
-            },
-            "5": {
-              "name": "variable.other.property.php"
-            },
-            "6": {
-              "name": "punctuation.section.array.begin.php"
-            },
-            "7": {
-              "name": "constant.numeric.index.php"
-            },
-            "8": {
-              "name": "variable.other.index.php"
-            },
-            "9": {
-              "name": "punctuation.definition.variable.php"
-            }
-          }
-        },
-        {
-          "match": "(?i)((\\${)(?\u003cname\u003e[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)(}))",
-          "captures": {
-            "1": {
-              "name": "variable.other.php"
-            },
-            "2": {
-              "name": "punctuation.definition.variable.php"
-            },
-            "4": {
-              "name": "punctuation.definition.variable.php"
-            }
-          }
-        }
-      ]
-    },
-    "variables": {
-      "patterns": [
-        {
-          "include": "#var_language"
-        },
-        {
-          "include": "#var_global"
-        },
-        {
-          "include": "#var_global_safer"
-        },
-        {
-          "include": "#var_basic"
-        },
-        {
-          "begin": "\\${(?=.*?})",
-          "end": "}",
-          "patterns": [
-            {
-              "include": "#language"
-            }
-          ],
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.variable.php"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.variable.php"
-            }
-          }
-        }
-      ]
-    }
-  },
-  "injections": {
-    "text.html.php.blade - (meta.embedded | meta.tag | comment.block.blade), L:(text.html.php.blade meta.tag - (comment.block.blade | meta.embedded.block.blade)), L:(source.js.embedded.html - (comment.block.blade | meta.embedded.block.blade))": {
-      "patterns": [
-        {
-          "name": "comment.block.blade",
-          "begin": "{{--",
-          "end": "--}}",
-          "patterns": [
-            {
-              "name": "invalid.illegal.php-code-in-comment.blade",
-              "begin": "(^\\s*)(?=\u003c\\?(?![^?]*\\?\u003e))",
-              "end": "(?!\\G)(\\s*$\\n)?",
-              "patterns": [
-                {
-                  "name": "meta.embedded.block.php",
-                  "contentName": "source.php",
-                  "begin": "\u003c\\?(?i:php|=)?",
-                  "end": "(\\?)\u003e",
-                  "patterns": [
-                    {
-                      "include": "#language"
-                    }
-                  ],
-                  "beginCaptures": {
-                    "0": {
-                      "name": "punctuation.section.embedded.begin.php"
-                    }
-                  },
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.section.embedded.end.php"
-                    },
-                    "1": {
-                      "name": "source.php"
-                    }
-                  }
-                }
-              ],
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.whitespace.embedded.leading.php"
-                }
-              },
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.whitespace.embedded.trailing.php"
-                }
-              }
-            },
-            {
-              "name": "invalid.illegal.php-code-in-comment.blade.meta.embedded.block.php",
-              "contentName": "source.php",
-              "begin": "\u003c\\?(?i:php|=)?(?![^?]*\\?\u003e)",
-              "end": "(\\?)\u003e",
-              "patterns": [
-                {
-                  "include": "#language"
-                }
-              ],
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.begin.php"
-                }
-              },
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "1": {
-                  "name": "source.php"
-                }
-              }
-            },
-            {
-              "name": "invalid.illegal.php-code-in-comment.blade.meta.embedded.line.php",
-              "begin": "\u003c\\?(?i:php|=)?",
-              "end": "\u003e",
-              "patterns": [
-                {
-                  "name": "meta.special.empty-tag.php",
-                  "match": "\\G(\\s*)((\\?))(?=\u003e)",
-                  "captures": {
-                    "1": {
-                      "name": "source.php"
-                    },
-                    "2": {
-                      "name": "punctuation.section.embedded.end.php"
-                    },
-                    "3": {
-                      "name": "source.php"
-                    }
-                  }
-                },
-                {
-                  "contentName": "source.php",
-                  "begin": "\\G",
-                  "end": "(\\?)(?=\u003e)",
-                  "patterns": [
-                    {
-                      "include": "#language"
-                    }
-                  ],
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.section.embedded.end.php"
-                    },
-                    "1": {
-                      "name": "source.php"
-                    }
-                  }
-                }
-              ],
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.begin.php"
-                }
-              },
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                }
-              }
-            }
-          ],
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.begin.blade"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.end.blade"
-            }
-          }
-        },
-        {
-          "name": "comment.blade",
-          "match": "@(?={{{|{{|{!!|@\\w+(?:::\\w+)?)"
-        },
-        {
-          "name": "meta.function.echo.blade",
-          "contentName": "source.php",
-          "begin": "(?\u003c!@){{{",
-          "end": "(})}}",
-          "patterns": [
-            {
-              "include": "#language"
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.section.switch-block.begin.bracket.curly.php"
+                }
+              }
             }
           ],
           "beginCaptures": {
             "0": {
-              "name": "support.function.construct.begin.blade"
+              "name": "keyword.control.switch.php"
             }
           },
           "endCaptures": {
             "0": {
-              "name": "support.function.construct.end.blade"
-            },
-            "1": {
-              "name": "source.php"
+              "name": "punctuation.definition.section.switch-block.end.bracket.curly.php"
             }
           }
+        }
+      ]
+    },
+    "use-inner": {
+      "patterns": [
+        {
+          "include": "#comments"
         },
         {
-          "name": "meta.function.echo.blade",
-          "contentName": "source.php",
-          "begin": "(?\u003c![@{]){{",
-          "end": "(})}",
-          "patterns": [
-            {
-              "include": "#language"
-            }
-          ],
+          "begin": "(?i)\\b(as)\\s+",
+          "end": "(?i)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*",
           "beginCaptures": {
-            "0": {
-              "name": "support.function.construct.begin.blade"
+            "1": {
+              "name": "keyword.other.use-as.php"
             }
           },
           "endCaptures": {
             "0": {
-              "name": "support.function.construct.end.blade"
-            },
-            "1": {
-              "name": "source.php"
+              "name": "entity.other.alias.php"
             }
           }
         },
         {
-          "name": "meta.function.echo.blade",
-          "contentName": "source.php",
-          "begin": "(?\u003c!@){!!",
-          "end": "(!)!}",
-          "patterns": [
-            {
-              "include": "#language"
-            }
-          ],
-          "beginCaptures": {
-            "0": {
-              "name": "support.function.construct.begin.blade"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "support.function.construct.end.blade"
-            },
+          "include": "#class-name"
+        },
+        {
+          "name": "punctuation.separator.delimiter.php",
+          "match": ","
+        }
+      ]
+    },
+    "var_basic": {
+      "patterns": [
+        {
+          "name": "variable.other.php",
+          "match": "(?i)(\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*\\b",
+          "captures": {
             "1": {
-              "name": "source.php"
+              "name": "punctuation.definition.variable.php"
             }
           }
+        }
+      ]
+    },
+    "var_global": {
+      "name": "variable.other.global.php",
+      "match": "(\\$)((_(COOKIE|FILES|GET|POST|REQUEST))|arg(v|c))\\b",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.variable.php"
+        }
+      }
+    },
+    "var_global_safer": {
+      "name": "variable.other.global.safer.php",
+      "match": "(\\$)((GLOBALS|_(ENV|SERVER|SESSION)))",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.variable.php"
+        }
+      }
+    },
+    "var_language": {
+      "name": "variable.language.this.php",
+      "match": "(\\$)this\\b",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.variable.php"
+        }
+      }
+    },
+    "variable-name": {
+      "patterns": [
+        {
+          "include": "#var_global"
         },
         {
-          "name": "meta.directive.blade",
-          "contentName": "source.php",
-          "begin": "(?x)\n(?\u003c![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  |canany\n  |cannot\n  |case\n  |choice\n  |component\n  |componentfirst\n  |continue\n  |dd\n  |dump\n  |each\n  |elseauth\n  |elsecan\n  |elsecanany\n  |elsecannot\n  |elseguest\n  |elseif\n  |empty\n  |error\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  |method\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",
-          "end": "\\)",
-          "patterns": [
-            {
-              "include": "#language"
-            }
-          ],
-          "beginCaptures": {
+          "include": "#var_global_safer"
+        },
+        {
+          "match": "(?xi)\n((\\$)(?\u003cname\u003e[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*))\n(?:\n  (-\u003e)(\\g\u003cname\u003e)\n  |\n  (\\[)(?:(\\d+)|((\\$)\\g\u003cname\u003e)|([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*))(\\])\n)?",
+          "captures": {
             "1": {
-              "name": "keyword.blade"
+              "name": "variable.other.php"
+            },
+            "10": {
+              "name": "string.unquoted.index.php"
+            },
+            "11": {
+              "name": "punctuation.section.array.end.php"
             },
             "2": {
-              "name": "begin.bracket.round.blade.php"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "end.bracket.round.blade.php"
+              "name": "punctuation.definition.variable.php"
+            },
+            "4": {
+              "name": "keyword.operator.class.php"
+            },
+            "5": {
+              "name": "variable.other.property.php"
+            },
+            "6": {
+              "name": "punctuation.section.array.begin.php"
+            },
+            "7": {
+              "name": "constant.numeric.index.php"
+            },
+            "8": {
+              "name": "variable.other.index.php"
+            },
+            "9": {
+              "name": "punctuation.definition.variable.php"
             }
           }
         },
         {
-          "name": "meta.directive.blade",
-          "contentName": "comment.blade",
-          "begin": "(?x)\n(?\u003c![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   append\n  |csrf\n  |default\n  |else\n  |endauth\n  |endcan\n  |endcanany\n  |endcannot\n  |endcomponent\n  |endcomponentfirst\n  |endempty\n  |enderror\n  |endfor\n  |endforeach\n  |endforelse\n  |endguest\n  |endif\n  |endisset\n  |endlang\n  |endprepend\n  |endpush\n  |endsection\n  |endslot\n  |endswitch\n  |endunless\n  |endwhile\n  |overwrite\n  |parent\n  |show\n  |stop\n  )\n  [\\t ]* # Whitespace between name and parentheses\n)\n(\\() # Followed by opening parentheses",
-          "end": "\\)",
-          "patterns": [
-            {
-              "include": "#balance_brackets"
-            }
-          ],
-          "beginCaptures": {
+          "match": "(?i)((\\${)(?\u003cname\u003e[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)(}))",
+          "captures": {
             "1": {
-              "name": "keyword.blade"
+              "name": "variable.other.php"
             },
             "2": {
-              "name": "begin.bracket.round.blade.php"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "end.bracket.round.blade.php"
+              "name": "punctuation.definition.variable.php"
+            },
+            "4": {
+              "name": "punctuation.definition.variable.php"
             }
           }
-        },
+        }
+      ]
+    },
+    "variables": {
+      "patterns": [
         {
-          "name": "keyword.blade",
-          "match": "(?x)\n(?\u003c![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to word boundary\n (?i)append\n|(?i)auth\n|(?i)break\n|(?i)continue\n|(?i)csrf\n|(?i)default\n|(?i)else\n|(?i)elseauth\n|(?i)elseguest\n|(?i)empty\n|(?i)endauth\n|(?i)endcan\n|(?i)endcanany\n|(?i)endcannot\n|(?i)endcomponent\n|(?i)endcomponentfirst\n|(?i)endempty\n|(?i)enderror\n|(?i)endfor\n|(?i)endforeach\n|(?i)endforelse\n|(?i)endguest\n|(?i)endif\n|(?i)endisset\n|(?i)endlang\n|(?i)endprepend\n|(?i)endpush\n|(?i)endsection\n|(?i)endslot\n|(?i)endswitch\n|(?i)endunless\n|endverbatim\n|(?i)endwhile\n|(?i)guest\n|(?i)lang\n|(?i)overwrite\n|(?i)parent\n|(?i)show\n|(?i)stop\n|verbatim\n)\n\\b"
+          "include": "#var_language"
         },
         {
-          "name": "meta.embedded.block.blade",
-          "contentName": "source.php",
-          "begin": "(?\u003c![A-Za-z0-9_@])@(?i:php)\\b",
-          "end": "(?\u003c![A-Za-z0-9_@])(?=@(?i:endphp)\\b)",
-          "patterns": [
-            {
-              "include": "#language"
-            }
-          ],
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.begin.blade"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "keyword.end.blade"
-            }
-          }
+          "include": "#var_global"
         },
         {
-          "name": "meta.directive.blade",
-          "contentName": "comment.blade",
-          "begin": "(?x)\n(?\u003c![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n(\n  @\n  (?i:\n    endphp\n  )\n  [\\t ]* # Whitespace between name and parentheses\n)\n(\\() # Followed by opening parentheses",
-          "end": "\\)",
-          "patterns": [
-            {
-              "include": "#balance_brackets"
-            }
-          ],
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.end.blade"
-            },
-            "2": {
-              "name": "begin.bracket.round.blade.php"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "end.bracket.round.blade.php"
-            }
-          }
+          "include": "#var_global_safer"
         },
         {
-          "name": "keyword.end.blade",
-          "match": "(?x)\n(?\u003c![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to word boundary\n (?i)endphp\n)\n\\b"
+          "include": "#var_basic"
         },
         {
-          "name": "meta.directive.custom.blade",
-          "contentName": "source.php",
-          "begin": "(?x)\n(?\u003c![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n(\n  @\n  \\w+(?:::\\w+)? # Any number/letter sequence, can also be postfixed by ::someOtherString\n  [\\t ]* # Whitespace between name and parentheses\n)\n(\\() # Followed by opening parentheses",
-          "end": "\\)",
+          "begin": "\\${(?=.*?})",
+          "end": "}",
           "patterns": [
             {
               "include": "#language"
             }
           ],
           "beginCaptures": {
-            "1": {
-              "name": "entity.name.function.blade"
-            },
-            "2": {
-              "name": "begin.bracket.round.blade.php"
+            "0": {
+              "name": "punctuation.definition.variable.php"
             }
           },
           "endCaptures": {
             "0": {
-              "name": "end.bracket.round.blade.php"
+              "name": "punctuation.definition.variable.php"
             }
           }
-        },
+        }
+      ]
+    }
+  },
+  "injections": {
+    "text.html.php.blade - (meta.embedded | meta.tag | comment.block.blade), L:(text.html.php.blade meta.tag - (comment.block.blade | meta.embedded.block.blade)), L:(source.js.embedded.html - (comment.block.blade | meta.embedded.block.blade))": {
+      "patterns": [
         {
-          "name": "entity.name.function.blade",
-          "match": "(?x)\n(?\u003c![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n\\w+(?:::\\w+)? # Any number/letter sequence, can also be postfixed by ::someOtherString\n\\b # Bounded by word boundary"
+          "include": "#blade"
         },
         {
           "begin": "(^\\s*)(?=\u003c\\?(?![^?]*\\?\u003e))",