github-linguist 5.0.8 → 5.0.9

data/grammars/source.yaml.json

@@ -7,6 +7,7 @@
     "eyaml",
     "eyml",
     "yaml",
+    "yamllint",
     "yaml.erb",
     "yml",
     "yml.erb",
@@ -36,7 +37,7 @@
       "name": "punctuation.definition.document.end.yaml"
     },
     {
-      "begin": "^(\\s*)(?!-\\s*)(\\S+)\\s*(:)(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||>)",
+      "begin": "^(\\s*)(?!-\\s*)(.*\\S)\\s*(:)(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||>)",
       "beginCaptures": {
         "2": {
           "name": "entity.name.tag.yaml"
@@ -63,7 +64,7 @@
       ]
     },
     {
-      "begin": "^(\\s*)(?:(-)|(?:(?:(-)\\s*)?(\\S+)\\s*(:)))(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||>)",
+      "begin": "^(\\s*)(?:(-)|(?:(?:(-)\\s*)?(.*\\S)\\s*(:)))(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||>)",
       "beginCaptures": {
         "2": {
           "name": "punctuation.definition.entry.yaml"
@@ -114,7 +115,7 @@
       }
     },
     {
-      "begin": "(?>^(\\s*)(-)?\\s*)([^!{@#%&*>,'\"][^#'\"]*?)(:)\\s+((!!)omap)?",
+      "begin": "(?>^(\\s*)(-)?\\s*)([^!{@#%&*>,'\"][^#]*?)(:)\\s+((!!)omap)?",
       "beginCaptures": {
         "2": {
           "name": "punctuation.definition.entry.yaml"
@@ -232,7 +233,7 @@
       }
     },
     "constants": {
-      "match": "(?<=\\s)(true|false|null)(?=\\s*$)",
+      "match": "(?<=\\s)(true|false|null|True|False|Null|TRUE|FALSE|NULL|~)(?=\\s*$)",
       "name": "constant.language.yaml"
     },
     "date": {

data/grammars/text.html.basic.json

@@ -10,7 +10,7 @@
   ],
   "firstLineMatch": "<(?i:(!DOCTYPE\\s*)?html)",
   "injections": {
-    "R:text.html - comment.block": {
+    "R:text.html - (comment.block, text.html source)": {
       "comment": "Use R: to ensure this matches after any other injections.",
       "patterns": [
         {
@@ -24,7 +24,7 @@
   "name": "HTML",
   "patterns": [
     {
-      "begin": "(<)([a-zA-Z0-9:]++)(?=[^>]*></\\2>)",
+      "begin": "(<)([a-zA-Z][a-zA-Z0-9:-]*)(?=[^>]*></\\2>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.html"
@@ -139,97 +139,249 @@
       "include": "#embedded-code"
     },
     {
-      "begin": "(?:^\\s+)?(<)((?i:style))\\b(?![^>]*/>)",
-      "captures": {
+      "begin": "(^[ \\t]+)?(?=<(?i:style))",
+      "beginCaptures": {
         "1": {
-          "name": "punctuation.definition.tag.html"
-        },
-        "2": {
-          "name": "entity.name.tag.style.html"
-        },
-        "3": {
-          "name": "punctuation.definition.tag.html"
+          "name": "punctuation.whitespace.embedded.leading.html"
+        }
+      },
+      "end": "(?!\\G)([ \\t]*$\\n?)?",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.trailing.html"
         }
       },
-      "end": "(</)((?i:style))(>)(?:\\s*\\n)?",
-      "name": "source.css.embedded.html",
       "patterns": [
         {
-          "include": "#tag-stuff"
-        },
-        {
-          "begin": "(>)",
+          "begin": "(<)((?i:style))\\b",
           "beginCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.style.html"
+            },
             "1": {
-              "name": "punctuation.definition.tag.html"
+              "name": "punctuation.definition.tag.begin.html"
+            },
+            "2": {
+              "name": "entity.name.tag.html"
             }
           },
-          "end": "(?=</(?i:style))",
+          "end": "(/>)|((<)/)((?i:style))(>)",
+          "endCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.style.html"
+            },
+            "1": {
+              "name": "punctuation.definition.tag.end.html"
+            },
+            "2": {
+              "name": "punctuation.definition.tag.begin.html"
+            },
+            "3": {
+              "name": "source.css"
+            },
+            "4": {
+              "name": "entity.name.tag.html"
+            },
+            "5": {
+              "name": "punctuation.definition.tag.end.html"
+            }
+          },
+          "name": "meta.embedded.block.html",
           "patterns": [
             {
-              "include": "#embedded-code"
+              "begin": "\\G",
+              "captures": {
+                "1": {
+                  "name": "punctuation.definition.tag.end.html"
+                }
+              },
+              "end": "(?=/>)|(>)",
+              "name": "meta.tag.metadata.style.html",
+              "patterns": [
+                {
+                  "include": "#tag-stuff"
+                }
+              ]
             },
             {
-              "include": "source.css"
+              "begin": "(?!\\G)",
+              "end": "(?=</(?i:style))",
+              "name": "source.css",
+              "patterns": [
+                {
+                  "include": "#embedded-code"
+                },
+                {
+                  "include": "source.css"
+                }
+              ]
             }
           ]
         }
       ]
     },
     {
-      "begin": "(?:^\\s+)?(<)((?i:script))\\b(?![^>]*/>)(?![^>]*(?i:type.?=.?text/((?!javascript).*)))",
+      "begin": "(^[ \\t]+)?(?=<(?i:script))",
       "beginCaptures": {
         "1": {
-          "name": "punctuation.definition.tag.html"
-        },
-        "2": {
-          "name": "entity.name.tag.script.html"
+          "name": "punctuation.whitespace.embedded.leading.html"
         }
       },
-      "end": "(?<=</(script|SCRIPT))(>)(?:\\s*\\n)?",
+      "end": "(?!\\G)([ \\t]*$\\n?)?",
       "endCaptures": {
-        "2": {
-          "name": "punctuation.definition.tag.html"
+        "1": {
+          "name": "punctuation.whitespace.embedded.trailing.html"
         }
       },
-      "name": "source.js.embedded.html",
       "patterns": [
         {
-          "include": "#tag-stuff"
-        },
-        {
-          "begin": "(?<!</(?:script|SCRIPT))(>)",
-          "captures": {
+          "begin": "(<)((?i:script))\\b",
+          "beginCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.script.html"
+            },
             "1": {
-              "name": "punctuation.definition.tag.html"
+              "name": "punctuation.definition.tag.begin.html"
             },
             "2": {
-              "name": "entity.name.tag.script.html"
+              "name": "entity.name.tag.html"
             }
           },
-          "end": "(</)((?i:script))",
-          "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "punctuation.definition.comment.js"
-                }
-              },
-              "match": "(//).*?((?=</script)|$\\n?)",
-              "name": "comment.line.double-slash.js"
+          "end": "(/>)|(/)((?i:script))(>)",
+          "endCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.script.html"
             },
-            {
-              "begin": "/\\*",
-              "captures": {
-                "0": {
-                  "name": "punctuation.definition.comment.js"
-                }
-              },
-              "end": "\\*/|(?=</script)",
-              "name": "comment.block.js"
+            "1": {
+              "name": "punctuation.definition.tag.end.html"
             },
+            "2": {
+              "name": "punctuation.definition.tag.begin.html"
+            },
+            "3": {
+              "name": "entity.name.tag.html"
+            },
+            "4": {
+              "name": "punctuation.definition.tag.end.html"
+            }
+          },
+          "name": "meta.embedded.block.html",
+          "patterns": [
             {
-              "include": "source.js"
+              "begin": "\\G",
+              "end": "(?=/>|/)",
+              "patterns": [
+                {
+                  "begin": "(>)",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.end.html"
+                    }
+                  },
+                  "end": "((<))(?=/(?i:script))",
+                  "endCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.begin.html"
+                    },
+                    "2": {
+                      "name": "source.js"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "begin": "\\G",
+                      "end": "(?=</(?i:script))",
+                      "name": "source.js",
+                      "patterns": [
+                        {
+                          "begin": "(^[ \\t]+)?(?=//)",
+                          "beginCaptures": {
+                            "1": {
+                              "name": "punctuation.whitespace.comment.leading.js"
+                            }
+                          },
+                          "end": "(?!\\G)",
+                          "patterns": [
+                            {
+                              "begin": "//",
+                              "beginCaptures": {
+                                "0": {
+                                  "name": "punctuation.definition.comment.js"
+                                }
+                              },
+                              "end": "(?=</script)|\\n",
+                              "name": "comment.line.double-slash.js"
+                            }
+                          ]
+                        },
+                        {
+                          "begin": "/\\*",
+                          "captures": {
+                            "0": {
+                              "name": "punctuation.definition.comment.js"
+                            }
+                          },
+                          "end": "\\*/|(?=</script)",
+                          "name": "comment.block.js"
+                        },
+                        {
+                          "include": "source.js"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "begin": "\\G",
+                  "end": "(?i:(?=/?>|type\\s*=\\s*('|\"|)(?!text/(javascript|ecmascript)|application/((x-)?javascript|ecmascript))\\b))",
+                  "name": "meta.tag.metadata.script.html",
+                  "patterns": [
+                    {
+                      "include": "#tag-stuff"
+                    }
+                  ]
+                },
+                {
+                  "begin": "(?=(?i:type))",
+                  "end": "(<)(?=/(?i:script))",
+                  "endCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.begin.html"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "begin": "\\G",
+                      "end": "(>)|(?=/>)",
+                      "endCaptures": {
+                        "1": {
+                          "name": "punctuation.definition.tag.end.html"
+                        }
+                      },
+                      "name": "meta.tag.metadata.script.html",
+                      "patterns": [
+                        {
+                          "include": "#tag-stuff"
+                        }
+                      ]
+                    },
+                    {
+                      "begin": "(?!\\G)",
+                      "end": "(?=</(?i:script))",
+                      "name": "source.unknown"
+                    }
+                  ]
+                }
+              ]
             }
           ]
         }
@@ -277,7 +429,7 @@
       ]
     },
     {
-      "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b)",
+      "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b(?!-))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -300,7 +452,7 @@
       ]
     },
     {
-      "begin": "(</?)([a-zA-Z0-9:]+)",
+      "begin": "(</?)([a-zA-Z][a-zA-Z0-9:-]*)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -309,7 +461,7 @@
           "name": "entity.name.tag.other.html"
         }
       },
-      "end": "(>)",
+      "end": "(/?>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.html"

data/grammars/text.html.ecr.json

@@ -1,5 +1,5 @@
 {
-  "fileType": [
+  "fileTypes": [
     "ecr",
     "html.ecr"
   ],

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(?: # Ordering not important as we everything will be matched up to opening parentheses\n [Bb]reak\n|[Cc]an\n|[Cc]annot\n|[Cc]hoice\n|[Cc]omponent\n|[Cc]ontinue\n|[Ee]ach\n|[Ee]lsecan\n|[Ee]lsecannot\n|[Ee]lseif\n|[Ee]xtends\n|[Ff]or\n|[Ff]oreach\n|[Ff]orelse\n|[Hh]asSection\n|[Ii]f\n|[Ii]nclude\n|[Ii]ncludeIf\n|[Ii]ncludeWhen\n|[Ii]nject\n|[Ll]ang\n|[Pp]hp\n|[Pp]repend\n|[Pp]ush\n|[Ss]ection\n|[Ss]lot\n|[Ss]tack\n|[Uu]nless\n|[Uu]nset\n|[Ww]hile\n|[Yy]ield\n)\n[\\t ]* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
+          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?i: # Ordering not important as we everything will be matched up to opening parentheses\n break\n|can\n|cannot\n|choice\n|component\n|continue\n|each\n|elsecan\n|elsecannot\n|elseif\n|extends\n|for\n|foreach\n|forelse\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|unless\n|unset\n|while\n|yield\n)\n[\\t ]* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
           "beginCaptures": {
             "0": {
               "name": "keyword.blade"
@@ -231,7 +231,7 @@
           ]
         },
         {
-          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to opening parentheses\n [Aa]ppend\n|[Ee]lse\n|[Ee]mpty\n|[Ee]ndcan\n|[Ee]ndcannot\n|[Ee]ndcomponent\n|[Ee]ndfor\n|[Ee]ndforeach\n|[Ee]ndforelse\n|[Ee]ndif\n|[Ee]ndlang\n|[Ee]ndprepend\n|[Ee]ndpush\n|[Ee]ndsection\n|[Ee]ndslot\n|[Ee]ndunless\n|[Ee]ndwhile\n|[Oo]verwrite\n|[Pp]arent\n|[Ss]how\n|[Ss]top\n)\n[\\t ]* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
+          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?i: # Ordering not important as we everything will be matched up to opening parentheses\n append\n|else\n|endcan\n|endcannot\n|endcomponent\n|endempty\n|endfor\n|endforeach\n|endforelse\n|endif\n|endisset\n|endlang\n|endprepend\n|endpush\n|endsection\n|endslot\n|endunless\n|endwhile\n|overwrite\n|parent\n|show\n|stop\n)\n[\\t ]* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
           "beginCaptures": {
             "0": {
               "name": "keyword.blade"
@@ -242,12 +242,12 @@
           "name": "meta.directive.blade"
         },
         {
-          "match": "(?x)\n(?<![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 [Aa]ppend\n|[Bb]reak\n|[Cc]ontinue\n|[Ee]lse\n|[Ee]mpty\n|[Ee]ndcan\n|[Ee]ndcannot\n|[Ee]ndcomponent\n|[Ee]ndfor\n|[Ee]ndforeach\n|[Ee]ndforelse\n|[Ee]ndif\n|[Ee]ndlang\n|[Ee]ndprepend\n|[Ee]ndpush\n|[Ee]ndsection\n|[Ee]ndslot\n|[Ee]ndunless\n|endverbatim\n|[Ee]ndwhile\n|[Ll]ang\n|[Oo]verwrite\n|[Pp]arent\n|[Ss]how\n|[Ss]top\n|verbatim\n)\n\\b",
+          "match": "(?x)\n(?<![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)break\n|(?i)continue\n|(?i)else\n|(?i)empty\n|(?i)endcan\n|(?i)endcannot\n|(?i)endcomponent\n|(?i)endempty\n|(?i)endfor\n|(?i)endforeach\n|(?i)endforelse\n|(?i)endif\n|(?i)endisset\n|(?i)endlang\n|(?i)endprepend\n|(?i)endpush\n|(?i)endsection\n|(?i)endslot\n|(?i)endunless\n|endverbatim\n|(?i)endwhile\n|(?i)lang\n|(?i)overwrite\n|(?i)parent\n|(?i)show\n|(?i)stop\n|verbatim\n)\n\\b",
           "name": "keyword.blade"
         },
         {
-          "begin": "(?<![A-Za-z0-9_@])@[Pp]hp",
-          "end": "(?<![A-Za-z0-9_@])@[Ee]ndphp([\\t ]*\\(.*\\)(?!.*\\)))?",
+          "begin": "(?<![A-Za-z0-9_@])@(?i:php)",
+          "end": "(?<![A-Za-z0-9_@])@(?i:endphp)([\\t ]*\\(.*\\)(?!.*\\)))?",
           "beginCaptures": {
             "0": {
               "name": "keyword.begin.blade"
@@ -489,7 +489,7 @@
           "name": "comment.block.php"
         },
         {
-          "begin": "(^[ \\t]+)?(?=//)",
+          "begin": "(^\\s+)?(?=//)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.whitespace.comment.leading.php"
@@ -510,7 +510,7 @@
           ]
         },
         {
-          "begin": "(^[ \\t]+)?(?=#)",
+          "begin": "(^\\s+)?(?=#)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.whitespace.comment.leading.php"
@@ -826,315 +826,658 @@
         {
           "begin": "(?=<<<\\s*(\"?)([a-zA-Z_]+[a-zA-Z0-9_]*)(\\1)\\s*$)",
           "end": "(?!\\G)",
-          "injections": {
-            "*": {
+          "name": "string.unquoted.heredoc.php",
+          "patterns": [
+            {
+              "include": "#heredoc_interior"
+            }
+          ]
+        },
+        {
+          "begin": "(?=<<<\\s*'([a-zA-Z_]+[a-zA-Z0-9_]*)'\\s*$)",
+          "end": "(?!\\G)",
+          "name": "string.unquoted.nowdoc.php",
+          "patterns": [
+            {
+              "include": "#nowdoc_interior"
+            }
+          ]
+        }
+      ]
+    },
+    "heredoc_interior": {
+      "patterns": [
+        {
+          "begin": "(<<<)\\s*(\"?)(HTML)(\\2)(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "3": {
+              "name": "keyword.operator.heredoc.php"
+            },
+            "5": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "text.html",
+          "end": "^(\\3)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.heredoc.php"
+            }
+          },
+          "name": "meta.embedded.html",
+          "patterns": [
+            {
+              "include": "#interpolation"
+            },
+            {
+              "include": "text.html.basic"
+            }
+          ]
+        },
+        {
+          "begin": "(<<<)\\s*(\"?)(XML)(\\2)(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "3": {
+              "name": "keyword.operator.heredoc.php"
+            },
+            "5": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "text.xml",
+          "end": "^(\\3)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.heredoc.php"
+            }
+          },
+          "name": "meta.embedded.xml",
+          "patterns": [
+            {
+              "include": "#interpolation"
+            },
+            {
+              "include": "text.xml"
+            }
+          ]
+        },
+        {
+          "begin": "(<<<)\\s*(\"?)(SQL)(\\2)(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "3": {
+              "name": "keyword.operator.heredoc.php"
+            },
+            "5": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "source.sql",
+          "end": "^(\\3)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.heredoc.php"
+            }
+          },
+          "name": "meta.embedded.sql",
+          "patterns": [
+            {
+              "include": "#interpolation"
+            },
+            {
+              "include": "source.sql"
+            }
+          ]
+        },
+        {
+          "begin": "(<<<)\\s*(\"?)(JAVASCRIPT)(\\2)(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "3": {
+              "name": "keyword.operator.heredoc.php"
+            },
+            "5": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "source.js",
+          "end": "^(\\3)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.heredoc.php"
+            }
+          },
+          "name": "meta.embedded.js",
+          "patterns": [
+            {
+              "include": "#interpolation"
+            },
+            {
+              "include": "source.js"
+            }
+          ]
+        },
+        {
+          "begin": "(<<<)\\s*(\"?)(JSON)(\\2)(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "3": {
+              "name": "keyword.operator.heredoc.php"
+            },
+            "5": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "source.json",
+          "end": "^(\\3)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.heredoc.php"
+            }
+          },
+          "name": "meta.embedded.json",
+          "patterns": [
+            {
+              "include": "#interpolation"
+            },
+            {
+              "include": "source.json"
+            }
+          ]
+        },
+        {
+          "begin": "(<<<)\\s*(\"?)(CSS)(\\2)(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "3": {
+              "name": "keyword.operator.heredoc.php"
+            },
+            "5": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "source.css",
+          "end": "^(\\3)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.heredoc.php"
+            }
+          },
+          "name": "meta.embedded.css",
+          "patterns": [
+            {
+              "include": "#interpolation"
+            },
+            {
+              "include": "source.css"
+            }
+          ]
+        },
+        {
+          "begin": "(<<<)\\s*(\"?)(REGEXP?)(\\2)(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "3": {
+              "name": "keyword.operator.heredoc.php"
+            },
+            "5": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "string.regexp.heredoc.php",
+          "end": "^(\\3)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.heredoc.php"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#interpolation"
+            },
+            {
+              "comment": "Escaped from the regexp – there can also be 2 backslashes (since 1 will escape the first)",
+              "match": "(\\\\){1,2}[.$^\\[\\]{}]",
+              "name": "constant.character.escape.regex.php"
+            },
+            {
+              "captures": {
+                "1": {
+                  "name": "punctuation.definition.arbitrary-repitition.php"
+                },
+                "3": {
+                  "name": "punctuation.definition.arbitrary-repitition.php"
+                }
+              },
+              "match": "(\\{)\\d+(,\\d+)?(\\})",
+              "name": "string.regexp.arbitrary-repitition.php"
+            },
+            {
+              "begin": "\\[(?:\\^?\\])?",
+              "captures": {
+                "0": {
+                  "name": "punctuation.definition.character-class.php"
+                }
+              },
+              "end": "\\]",
+              "name": "string.regexp.character-class.php",
               "patterns": [
                 {
-                  "include": "#interpolation"
+                  "match": "\\\\[\\\\'\\[\\]]",
+                  "name": "constant.character.escape.php"
                 }
               ]
+            },
+            {
+              "match": "[$^+*]",
+              "name": "keyword.operator.regexp.php"
+            },
+            {
+              "begin": "(?<=^|\\s)(#)\\s(?=[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$)",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.comment.php"
+                }
+              },
+              "comment": "We are restrictive in what we allow to go after the comment character to avoid false positives, since the availability of comments depend on regexp flags.",
+              "end": "$\\n?",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.comment.php"
+                }
+              },
+              "name": "comment.line.number-sign.php"
+            }
+          ]
+        },
+        {
+          "begin": "(<<<)\\s*(\"?)([a-zA-Z_]+[a-zA-Z0-9_]*)(\\2)(\\s*)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "3": {
+              "name": "keyword.operator.heredoc.php"
+            },
+            "5": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "end": "^(\\3)\\b",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.operator.heredoc.php"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#interpolation"
+            }
+          ]
+        }
+      ]
+    },
+    "nowdoc_interior": {
+      "patterns": [
+        {
+          "begin": "(<<<)\\s*'(HTML)'(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "2": {
+              "name": "keyword.operator.nowdoc.php"
+            },
+            "3": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "text.html",
+          "end": "^(\\2)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.nowdoc.php"
+            }
+          },
+          "name": "meta.embedded.html",
+          "patterns": [
+            {
+              "include": "text.html.basic"
+            }
+          ]
+        },
+        {
+          "begin": "(<<<)\\s*'(XML)'(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "2": {
+              "name": "keyword.operator.nowdoc.php"
+            },
+            "3": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "text.xml",
+          "end": "^(\\2)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.nowdoc.php"
+            }
+          },
+          "name": "meta.embedded.xml",
+          "patterns": [
+            {
+              "include": "text.xml"
+            }
+          ]
+        },
+        {
+          "begin": "(<<<)\\s*'(SQL)'(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "2": {
+              "name": "keyword.operator.nowdoc.php"
+            },
+            "3": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "source.sql",
+          "end": "^(\\2)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.nowdoc.php"
+            }
+          },
+          "name": "meta.embedded.sql",
+          "patterns": [
+            {
+              "include": "source.sql"
+            }
+          ]
+        },
+        {
+          "begin": "(<<<)\\s*'(JAVASCRIPT)'(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "2": {
+              "name": "keyword.operator.nowdoc.php"
+            },
+            "3": {
+              "name": "invalid.illegal.trailing-whitespace.php"
             }
           },
-          "name": "string.unquoted.heredoc.php",
+          "contentName": "source.js",
+          "end": "^(\\2)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.nowdoc.php"
+            }
+          },
+          "name": "meta.embedded.js",
           "patterns": [
             {
-              "include": "#heredoc_interior"
+              "include": "source.js"
             }
           ]
         },
         {
-          "begin": "(?=<<<\\s*('?)([a-zA-Z_]+[a-zA-Z0-9_]*)(\\1)\\s*$)",
-          "end": "(?!\\G)",
-          "name": "string.unquoted.heredoc.nowdoc.php",
+          "begin": "(<<<)\\s*'(JSON)'(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "2": {
+              "name": "keyword.operator.nowdoc.php"
+            },
+            "3": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "source.json",
+          "end": "^(\\2)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.nowdoc.php"
+            }
+          },
+          "name": "meta.embedded.json",
           "patterns": [
             {
-              "include": "#heredoc_interior"
+              "include": "source.json"
             }
           ]
-        }
-      ],
-      "repository": {
-        "heredoc_interior": {
+        },
+        {
+          "begin": "(<<<)\\s*'(CSS)'(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            },
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "2": {
+              "name": "keyword.operator.nowdoc.php"
+            },
+            "3": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "source.css",
+          "end": "^(\\2)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "keyword.operator.nowdoc.php"
+            }
+          },
+          "name": "meta.embedded.css",
           "patterns": [
             {
-              "begin": "(<<<)\\s*(['\"]?)(HTML)(\\2)\\s*$\\n?",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.begin.php"
-                },
-                "1": {
-                  "name": "punctuation.definition.string.php"
-                },
-                "3": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "contentName": "text.html",
-              "end": "^(\\3)\\b",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "1": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "name": "meta.embedded.html",
-              "patterns": [
-                {
-                  "include": "text.html.basic"
-                }
-              ]
+              "include": "source.css"
+            }
+          ]
+        },
+        {
+          "begin": "(<<<)\\s*'(REGEXP?)'(\\s*)$",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
             },
-            {
-              "begin": "(<<<)\\s*(['\"]?)(XML)(\\2)\\s*$\\n?",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.begin.php"
-                },
-                "1": {
-                  "name": "punctuation.definition.string.php"
-                },
-                "3": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "contentName": "text.xml",
-              "end": "^(\\3)\\b",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "1": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "name": "meta.embedded.xml",
-              "patterns": [
-                {
-                  "include": "text.xml"
-                }
-              ]
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "2": {
+              "name": "keyword.operator.nowdoc.php"
+            },
+            "3": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "contentName": "string.regexp.nowdoc.php",
+          "end": "^(\\2)\\b",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
             },
+            "1": {
+              "name": "keyword.operator.nowdoc.php"
+            }
+          },
+          "patterns": [
             {
-              "begin": "(<<<)\\s*(['\"]?)(SQL)(\\2)\\s*$\\n?",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.begin.php"
-                },
-                "1": {
-                  "name": "punctuation.definition.string.php"
-                },
-                "3": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "contentName": "source.sql",
-              "end": "^(\\3)\\b",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "1": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "name": "meta.embedded.sql",
-              "patterns": [
-                {
-                  "include": "source.sql"
-                }
-              ]
+              "comment": "Escaped from the regexp – there can also be 2 backslashes (since 1 will escape the first)",
+              "match": "(\\\\){1,2}[.$^\\[\\]{}]",
+              "name": "constant.character.escape.regex.php"
             },
             {
-              "begin": "(<<<)\\s*(['\"]?)(JAVASCRIPT)(\\2)\\s*$\\n?",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.begin.php"
-                },
+              "captures": {
                 "1": {
-                  "name": "punctuation.definition.string.php"
+                  "name": "punctuation.definition.arbitrary-repitition.php"
                 },
                 "3": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "contentName": "source.js",
-              "end": "^(\\3)\\b",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "1": {
-                  "name": "keyword.operator.heredoc.php"
+                  "name": "punctuation.definition.arbitrary-repitition.php"
                 }
               },
-              "name": "meta.embedded.js",
-              "patterns": [
-                {
-                  "include": "source.js"
-                }
-              ]
+              "match": "(\\{)\\d+(,\\d+)?(\\})",
+              "name": "string.regexp.arbitrary-repitition.php"
             },
             {
-              "begin": "(<<<)\\s*(['\"]?)(JSON)(\\2)\\s*$\\n?",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.begin.php"
-                },
-                "1": {
-                  "name": "punctuation.definition.string.php"
-                },
-                "3": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "contentName": "source.json",
-              "end": "^(\\3)\\b",
-              "endCaptures": {
+              "begin": "\\[(?:\\^?\\])?",
+              "captures": {
                 "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "1": {
-                  "name": "keyword.operator.heredoc.php"
+                  "name": "punctuation.definition.character-class.php"
                 }
               },
-              "name": "meta.embedded.json",
+              "end": "\\]",
+              "name": "string.regexp.character-class.php",
               "patterns": [
                 {
-                  "include": "source.json"
+                  "match": "\\\\[\\\\'\\[\\]]",
+                  "name": "constant.character.escape.php"
                 }
               ]
             },
             {
-              "begin": "(<<<)\\s*(['\"]?)(CSS)(\\2)\\s*$\\n?",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.begin.php"
-                },
-                "1": {
-                  "name": "punctuation.definition.string.php"
-                },
-                "3": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "contentName": "source.css",
-              "end": "^(\\3)\\b",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "1": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "name": "meta.embedded.css",
-              "patterns": [
-                {
-                  "include": "source.css"
-                }
-              ]
+              "match": "[$^+*]",
+              "name": "keyword.operator.regexp.php"
             },
             {
-              "begin": "(<<<)\\s*(['\"]?)(REGEX)(\\2)\\s*$\\n?",
+              "begin": "(?<=^|\\s)(#)\\s(?=[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$)",
               "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.begin.php"
-                },
                 "1": {
-                  "name": "punctuation.definition.string.php"
-                },
-                "3": {
-                  "name": "keyword.operator.heredoc.php"
+                  "name": "punctuation.definition.comment.php"
                 }
               },
-              "contentName": "string.regexp.heredoc.php",
-              "end": "^(\\3)\\b",
+              "comment": "We are restrictive in what we allow to go after the comment character to avoid false positives, since the availability of comments depend on regexp flags.",
+              "end": "$\\n?",
               "endCaptures": {
                 "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "1": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "patterns": [
-                {
-                  "comment": "Escaped from the regexp – there can also be 2 backslashes (since 1 will escape the first)",
-                  "match": "(\\\\){1,2}[.$^\\[\\]{}]",
-                  "name": "constant.character.escape.regex.php"
-                },
-                {
-                  "captures": {
-                    "1": {
-                      "name": "punctuation.definition.arbitrary-repitition.php"
-                    },
-                    "3": {
-                      "name": "punctuation.definition.arbitrary-repitition.php"
-                    }
-                  },
-                  "match": "(\\{)\\d+(,\\d+)?(\\})",
-                  "name": "string.regexp.arbitrary-repitition.php"
-                },
-                {
-                  "begin": "\\[(?:\\^?\\])?",
-                  "captures": {
-                    "0": {
-                      "name": "punctuation.definition.character-class.php"
-                    }
-                  },
-                  "end": "\\]",
-                  "name": "string.regexp.character-class.php",
-                  "patterns": [
-                    {
-                      "match": "\\\\[\\\\'\\[\\]]",
-                      "name": "constant.character.escape.php"
-                    }
-                  ]
-                },
-                {
-                  "match": "[$^+*]",
-                  "name": "keyword.operator.regexp.php"
-                },
-                {
-                  "begin": "(?<=^|\\s)(#)\\s(?=[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$)",
-                  "beginCaptures": {
-                    "1": {
-                      "name": "punctuation.definition.comment.php"
-                    }
-                  },
-                  "comment": "We are restrictive in what we allow to go after the comment character to avoid false positives, since the availability of comments depend on regexp flags.",
-                  "end": "$\\n?",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.comment.php"
-                    }
-                  },
-                  "name": "comment.line.number-sign.php"
-                }
-              ]
-            },
-            {
-              "begin": "(<<<)\\s*(['\"]?)([a-zA-Z_]+[a-zA-Z0-9_]*)(\\2)",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.string.php"
-                },
-                "3": {
-                  "name": "keyword.operator.heredoc.php"
+                  "name": "punctuation.definition.comment.php"
                 }
               },
-              "end": "^(\\3)\\b",
-              "endCaptures": {
-                "1": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              }
+              "name": "comment.line.number-sign.php"
             }
           ]
+        },
+        {
+          "begin": "(<<<)\\s*'([a-zA-Z_]+[a-zA-Z0-9_]*)'(\\s*)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.php"
+            },
+            "2": {
+              "name": "keyword.operator.nowdoc.php"
+            },
+            "3": {
+              "name": "invalid.illegal.trailing-whitespace.php"
+            }
+          },
+          "end": "^(\\2)\\b",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.operator.nowdoc.php"
+            }
+          }
         }
-      }
+      ]
     },
     "instantiation": {
       "begin": "(?i)(new)\\s+",