tm-grammars 1.22.19 → 1.23.0

package/grammars/glimmer-js.json

@@ -68,7 +68,7 @@
       ]
     },
     "component-tag": {
-      "begin": "(<\\/?)(@|this.)?([a-zA-Z0-9-_\\$:\\.]+)\\b",
+      "begin": "(</?)(@|this.)?([a-zA-Z0-9\\-_$:.]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -93,13 +93,13 @@
               "include": "#glimmer-component-path"
             },
             {
-              "match": "(@|:|\\$)",
+              "match": "([@:$])",
               "name": "markup.bold"
             }
           ]
         }
       },
-      "end": "(\\/?)(>)",
+      "end": "(/?)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -142,7 +142,7 @@
               "name": "punctuation.definition.entity.html.ember-handlebars"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.html.ember-handlebars"
         },
         {
@@ -166,7 +166,7 @@
           "name": "punctuation.separator.key-value.html.ember-handlebars"
         }
       },
-      "match": "\\s(@[a-zA-Z0-9:_.-]+)(=)?"
+      "match": "\\s(@[a-zA-Z0-9:_.\\-]+)(=)?"
     },
     "glimmer-as-stuff": {
       "patterns": [
@@ -179,7 +179,7 @@
       ]
     },
     "glimmer-block": {
-      "begin": "({{~?)(#|/)(([@\\$a-zA-Z0-9_/.-]+))",
+      "begin": "(\\{\\{~?)([#/])(([@$a-zA-Z0-9_/.\\-]+))",
       "captures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -194,7 +194,7 @@
               "include": "#glimmer-component-path"
             },
             {
-              "match": "(\\/)+",
+              "match": "(/)+",
               "name": "punctuation.definition.tag"
             },
             {
@@ -233,11 +233,11 @@
           "name": "keyword.operator"
         }
       },
-      "match": "({{~?)(true|false|null|undefined|\\d*(\\.)?\\d+)(~?}})",
+      "match": "(\\{\\{~?)(true|false|null|undefined|\\d*(\\.)?\\d+)(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-comment-block": {
-      "begin": "{{!--",
+      "begin": "\\{\\{!--",
       "captures": {
         "0": {
           "name": "punctuation.definition.block.comment.glimmer"
@@ -255,7 +255,7 @@
       ]
     },
     "glimmer-comment-inline": {
-      "begin": "{{!",
+      "begin": "\\{\\{!",
       "captures": {
         "0": {
           "name": "punctuation.definition.block.comment.glimmer"
@@ -278,10 +278,10 @@
           "name": "punctuation.definition.tag"
         }
       },
-      "match": "(::|_|\\$|\\.)"
+      "match": "(::|[_$.])"
     },
     "glimmer-control-expression": {
-      "begin": "({{~?)(([-a-zA-Z_0-9/]+)\\s)",
+      "begin": "(\\{\\{~?)(([\\-a-zA-Z_0-9/]+)\\s)",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -345,11 +345,11 @@
           "name": "punctuation.definition.tag"
         }
       },
-      "match": "({{~?)(else\\s[a-z]+\\s|else)([()@a-zA-Z0-9\\.\\s\\b]+)?(~?}})",
+      "match": "(\\{\\{~?)(else(?:\\s[a-z]+\\s|))([()@a-zA-Z0-9.\\s\\x08]+)?(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-expression": {
-      "begin": "({{~?)(([()\\s@a-zA-Z0-9_.-]+))",
+      "begin": "(\\{\\{~?)(([()\\s@a-zA-Z0-9_.\\-]+))",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -361,11 +361,11 @@
           "name": "support.function",
           "patterns": [
             {
-              "match": "[(]+",
+              "match": "\\(+",
               "name": "string.regexp"
             },
             {
-              "match": "[)]+",
+              "match": "\\)+",
               "name": "string.regexp"
             },
             {
@@ -387,7 +387,7 @@
       ]
     },
     "glimmer-expression-property": {
-      "begin": "({{~?)((@|this.)([a-zA-Z0-9_.-]+))",
+      "begin": "(\\{\\{~?)((@|this.)([a-zA-Z0-9_.\\-]+))",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -435,7 +435,7 @@
           "name": "punctuation.definition.expression.ember-handlebars"
         }
       },
-      "match": "\\b([a-zA-Z0-9_-]+)(\\s?=)",
+      "match": "\\b([a-zA-Z0-9_\\-]+)(\\s?=)",
       "patterns": [
       ]
     },
@@ -451,7 +451,7 @@
           ]
         }
       },
-      "match": "\\b([a-zA-Z0-9:_.-]+)\\b(?!=)",
+      "match": "\\b([a-zA-Z0-9:_.\\-]+)\\b(?!=)",
       "patterns": [
       ]
     },
@@ -470,11 +470,11 @@
           "name": "keyword.operator"
         }
       },
-      "match": "({{~?)(yield|outlet)(~?}})",
+      "match": "(\\{\\{~?)(yield|outlet)(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-subexp": {
-      "begin": "(\\()([@a-zA-Z0-9.-]+)",
+      "begin": "(\\()([@a-zA-Z0-9.\\-]+)",
       "captures": {
         "1": {
           "name": "keyword.other"
@@ -520,7 +520,7 @@
       ]
     },
     "glimmer-unescaped-expression": {
-      "begin": "{{{",
+      "begin": "\\{\\{\\{",
       "captures": {
         "0": {
           "name": "keyword.operator"
@@ -558,7 +558,7 @@
           "name": "punctuation.separator.key-value.html.ember-handlebars"
         }
       },
-      "match": "\\s([a-zA-Z0-9:_.-]+)(=)?"
+      "match": "\\s([a-zA-Z0-9:_.\\-]+)(=)?"
     },
     "html-comment": {
       "begin": "<!--",
@@ -580,7 +580,7 @@
       ]
     },
     "html-tag": {
-      "begin": "(<\\/?)([a-z0-9-]+)(?!\\.|:)\\b",
+      "begin": "(</?)([a-z0-9\\-]+)(?![.:])\\b",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -589,7 +589,7 @@
           "name": "entity.name.tag.html.ember-handlebars"
         }
       },
-      "end": "(\\/?)(>)",
+      "end": "(/?)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -709,8 +709,8 @@
           "name": "meta.js.embeddedTemplateWithArgs",
           "patterns": [
             {
-              "begin": "(?<=\\<template)",
-              "end": "(?=\\>)",
+              "begin": "(?<=<template)",
+              "end": "(?=>)",
               "patterns": [
                 {
                   "include": "#tag-like-content"
@@ -780,7 +780,7 @@
           ]
         },
         {
-          "begin": "(\\b(?:\\w+\\.)*(?:hbs|html)\\s*)(`)",
+          "begin": "(\\b(?:\\w+\\.)*h(?:bs|tml)\\s*)(`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.js"
@@ -875,7 +875,7 @@
           },
           "patterns": [
             {
-              "begin": "((`|'|\"))",
+              "begin": "(([`'\"]))",
               "beginCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -884,7 +884,7 @@
                   "name": "punctuation.definition.string.template.begin.ts"
                 }
               },
-              "end": "((`|'|\"))",
+              "end": "(([`'\"]))",
               "endCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -967,7 +967,7 @@
           },
           "patterns": [
             {
-              "begin": "((`|'|\"))",
+              "begin": "(([`'\"]))",
               "beginCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -977,7 +977,7 @@
                 }
               },
               "contentName": "meta.embedded.block.html",
-              "end": "((`|'|\"))",
+              "end": "(([`'\"]))",
               "endCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -1072,7 +1072,7 @@
           ]
         }
       },
-      "match": "(@|this.)([a-zA-Z0-9_.-]+)",
+      "match": "(@|this.)([a-zA-Z0-9_.\\-]+)",
       "patterns": [
       ]
     },
@@ -1191,7 +1191,7 @@
                   ]
                 },
                 {
-                  "begin": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=\n\t\t\t\t\t\t\t\t\t\t\t\t\ttype\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\n\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\tx-handlebars\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-(handlebars-)?|ng-)?template\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | html\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
+                  "begin": "(?i:(?=type\\s*=\\s*(['\"]|)text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html)[\\s\"'>]))",
                   "end": "((<))(?=/(?i:script))",
                   "endCaptures": {
                     "0": {
@@ -1490,7 +1490,7 @@
       ]
     },
     "variable": {
-      "match": "\\b([a-zA-Z0-9-_]+)\\b",
+      "match": "\\b([a-zA-Z0-9\\-_]+)\\b",
       "name": "support.function",
       "patterns": [
       ]

package/grammars/glimmer-ts.json

@@ -68,7 +68,7 @@
       ]
     },
     "component-tag": {
-      "begin": "(<\\/?)(@|this.)?([a-zA-Z0-9-_\\$:\\.]+)\\b",
+      "begin": "(</?)(@|this.)?([a-zA-Z0-9\\-_$:.]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -93,13 +93,13 @@
               "include": "#glimmer-component-path"
             },
             {
-              "match": "(@|:|\\$)",
+              "match": "([@:$])",
               "name": "markup.bold"
             }
           ]
         }
       },
-      "end": "(\\/?)(>)",
+      "end": "(/?)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -142,7 +142,7 @@
               "name": "punctuation.definition.entity.html.ember-handlebars"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.html.ember-handlebars"
         },
         {
@@ -166,7 +166,7 @@
           "name": "punctuation.separator.key-value.html.ember-handlebars"
         }
       },
-      "match": "\\s(@[a-zA-Z0-9:_.-]+)(=)?"
+      "match": "\\s(@[a-zA-Z0-9:_.\\-]+)(=)?"
     },
     "glimmer-as-stuff": {
       "patterns": [
@@ -179,7 +179,7 @@
       ]
     },
     "glimmer-block": {
-      "begin": "({{~?)(#|/)(([@\\$a-zA-Z0-9_/.-]+))",
+      "begin": "(\\{\\{~?)([#/])(([@$a-zA-Z0-9_/.\\-]+))",
       "captures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -194,7 +194,7 @@
               "include": "#glimmer-component-path"
             },
             {
-              "match": "(\\/)+",
+              "match": "(/)+",
               "name": "punctuation.definition.tag"
             },
             {
@@ -233,11 +233,11 @@
           "name": "keyword.operator"
         }
       },
-      "match": "({{~?)(true|false|null|undefined|\\d*(\\.)?\\d+)(~?}})",
+      "match": "(\\{\\{~?)(true|false|null|undefined|\\d*(\\.)?\\d+)(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-comment-block": {
-      "begin": "{{!--",
+      "begin": "\\{\\{!--",
       "captures": {
         "0": {
           "name": "punctuation.definition.block.comment.glimmer"
@@ -255,7 +255,7 @@
       ]
     },
     "glimmer-comment-inline": {
-      "begin": "{{!",
+      "begin": "\\{\\{!",
       "captures": {
         "0": {
           "name": "punctuation.definition.block.comment.glimmer"
@@ -278,10 +278,10 @@
           "name": "punctuation.definition.tag"
         }
       },
-      "match": "(::|_|\\$|\\.)"
+      "match": "(::|[_$.])"
     },
     "glimmer-control-expression": {
-      "begin": "({{~?)(([-a-zA-Z_0-9/]+)\\s)",
+      "begin": "(\\{\\{~?)(([\\-a-zA-Z_0-9/]+)\\s)",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -345,11 +345,11 @@
           "name": "punctuation.definition.tag"
         }
       },
-      "match": "({{~?)(else\\s[a-z]+\\s|else)([()@a-zA-Z0-9\\.\\s\\b]+)?(~?}})",
+      "match": "(\\{\\{~?)(else(?:\\s[a-z]+\\s|))([()@a-zA-Z0-9.\\s\\x08]+)?(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-expression": {
-      "begin": "({{~?)(([()\\s@a-zA-Z0-9_.-]+))",
+      "begin": "(\\{\\{~?)(([()\\s@a-zA-Z0-9_.\\-]+))",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -361,11 +361,11 @@
           "name": "support.function",
           "patterns": [
             {
-              "match": "[(]+",
+              "match": "\\(+",
               "name": "string.regexp"
             },
             {
-              "match": "[)]+",
+              "match": "\\)+",
               "name": "string.regexp"
             },
             {
@@ -387,7 +387,7 @@
       ]
     },
     "glimmer-expression-property": {
-      "begin": "({{~?)((@|this.)([a-zA-Z0-9_.-]+))",
+      "begin": "(\\{\\{~?)((@|this.)([a-zA-Z0-9_.\\-]+))",
       "captures": {
         "1": {
           "name": "keyword.operator"
@@ -435,7 +435,7 @@
           "name": "punctuation.definition.expression.ember-handlebars"
         }
       },
-      "match": "\\b([a-zA-Z0-9_-]+)(\\s?=)",
+      "match": "\\b([a-zA-Z0-9_\\-]+)(\\s?=)",
       "patterns": [
       ]
     },
@@ -451,7 +451,7 @@
           ]
         }
       },
-      "match": "\\b([a-zA-Z0-9:_.-]+)\\b(?!=)",
+      "match": "\\b([a-zA-Z0-9:_.\\-]+)\\b(?!=)",
       "patterns": [
       ]
     },
@@ -470,11 +470,11 @@
           "name": "keyword.operator"
         }
       },
-      "match": "({{~?)(yield|outlet)(~?}})",
+      "match": "(\\{\\{~?)(yield|outlet)(~?}})",
       "name": "entity.expression.ember-handlebars"
     },
     "glimmer-subexp": {
-      "begin": "(\\()([@a-zA-Z0-9.-]+)",
+      "begin": "(\\()([@a-zA-Z0-9.\\-]+)",
       "captures": {
         "1": {
           "name": "keyword.other"
@@ -520,7 +520,7 @@
       ]
     },
     "glimmer-unescaped-expression": {
-      "begin": "{{{",
+      "begin": "\\{\\{\\{",
       "captures": {
         "0": {
           "name": "keyword.operator"
@@ -558,7 +558,7 @@
           "name": "punctuation.separator.key-value.html.ember-handlebars"
         }
       },
-      "match": "\\s([a-zA-Z0-9:_.-]+)(=)?"
+      "match": "\\s([a-zA-Z0-9:_.\\-]+)(=)?"
     },
     "html-comment": {
       "begin": "<!--",
@@ -580,7 +580,7 @@
       ]
     },
     "html-tag": {
-      "begin": "(<\\/?)([a-z0-9-]+)(?!\\.|:)\\b",
+      "begin": "(</?)([a-z0-9\\-]+)(?![.:])\\b",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -589,7 +589,7 @@
           "name": "entity.name.tag.html.ember-handlebars"
         }
       },
-      "end": "(\\/?)(>)",
+      "end": "(/?)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag"
@@ -709,8 +709,8 @@
           "name": "meta.js.embeddedTemplateWithArgs",
           "patterns": [
             {
-              "begin": "(?<=\\<template)",
-              "end": "(?=\\>)",
+              "begin": "(?<=<template)",
+              "end": "(?=>)",
               "patterns": [
                 {
                   "include": "#tag-like-content"
@@ -780,7 +780,7 @@
           ]
         },
         {
-          "begin": "(\\b(?:\\w+\\.)*(?:hbs|html)\\s*)(`)",
+          "begin": "(\\b(?:\\w+\\.)*h(?:bs|tml)\\s*)(`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.js"
@@ -875,7 +875,7 @@
           },
           "patterns": [
             {
-              "begin": "((`|'|\"))",
+              "begin": "(([`'\"]))",
               "beginCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -884,7 +884,7 @@
                   "name": "punctuation.definition.string.template.begin.ts"
                 }
               },
-              "end": "((`|'|\"))",
+              "end": "(([`'\"]))",
               "endCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -967,7 +967,7 @@
           },
           "patterns": [
             {
-              "begin": "((`|'|\"))",
+              "begin": "(([`'\"]))",
               "beginCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -977,7 +977,7 @@
                 }
               },
               "contentName": "meta.embedded.block.html",
-              "end": "((`|'|\"))",
+              "end": "(([`'\"]))",
               "endCaptures": {
                 "1": {
                   "name": "string.template.ts"
@@ -1072,7 +1072,7 @@
           ]
         }
       },
-      "match": "(@|this.)([a-zA-Z0-9_.-]+)",
+      "match": "(@|this.)([a-zA-Z0-9_.\\-]+)",
       "patterns": [
       ]
     },
@@ -1191,7 +1191,7 @@
                   ]
                 },
                 {
-                  "begin": "(?ix:\n\t\t\t\t\t\t\t\t\t\t\t\t(?=\n\t\t\t\t\t\t\t\t\t\t\t\t\ttype\\s*=\\s*\n\t\t\t\t\t\t\t\t\t\t\t\t\t('|\"|)\n\t\t\t\t\t\t\t\t\t\t\t\t\ttext/\n\t\t\t\t\t\t\t\t\t\t\t\t\t(\n\t\t\t\t\t\t\t\t\t\t\t\t\t\tx-handlebars\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | (x-(handlebars-)?|ng-)?template\n\t\t\t\t\t\t\t\t\t\t\t\t\t  | html\n\t\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t\t\t[\\s\"'>]\n\t\t\t\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t\t\t\t)",
+                  "begin": "(?i:(?=type\\s*=\\s*(['\"]|)text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html)[\\s\"'>]))",
                   "end": "((<))(?=/(?i:script))",
                   "endCaptures": {
                     "0": {
@@ -1490,7 +1490,7 @@
       ]
     },
     "variable": {
-      "match": "\\b([a-zA-Z0-9-_]+)\\b",
+      "match": "\\b([a-zA-Z0-9\\-_]+)\\b",
       "name": "support.function",
       "patterns": [
       ]

package/grammars/glsl.json

@@ -18,7 +18,7 @@
     "g.glsl"
   ],
   "foldingStartMarker": "/\\*\\*|\\{\\s*$",
-  "foldingStopMarker": "\\*\\*/|^\\s*\\}",
+  "foldingStopMarker": "\\*\\*/|^\\s*}",
   "name": "glsl",
   "patterns": [
     {
@@ -26,7 +26,7 @@
       "name": "keyword.control.glsl"
     },
     {
-      "match": "\\b(void|bool|int|uint|float|vec2|vec3|vec4|bvec2|bvec3|bvec4|ivec2|ivec2|ivec3|uvec2|uvec2|uvec3|mat2|mat3|mat4|mat2x2|mat2x3|mat2x4|mat3x2|mat3x3|mat3x4|mat4x2|mat4x3|mat4x4|sampler[1|2|3]D|samplerCube|sampler2DRect|sampler[1|2]DShadow|sampler2DRectShadow|sampler[1|2]DArray|sampler[1|2]DArrayShadow|samplerBuffer|sampler2DMS|sampler2DMSArray|struct|isampler[1|2|3]D|isamplerCube|isampler2DRect|isampler[1|2]DArray|isamplerBuffer|isampler2DMS|isampler2DMSArray|usampler[1|2|3]D|usamplerCube|usampler2DRect|usampler[1|2]DArray|usamplerBuffer|usampler2DMS|usampler2DMSArray)\\b",
+      "match": "\\b(void|bool|int|uint|float|vec2|vec3|vec4|bvec2|bvec3|bvec4|ivec2|ivec2|ivec3|uvec2|uvec2|uvec3|mat2|mat3|mat4|mat2x2|mat2x3|mat2x4|mat3x2|mat3x3|mat3x4|mat4x2|mat4x3|mat4x4|sampler[1|23]D|samplerCube|sampler2DRect|sampler[1|2]DShadow|sampler2DRectShadow|sampler[1|2]DArray|sampler[1|2]DArrayShadow|samplerBuffer|sampler2DMS|sampler2DMSArray|struct|isampler[1|23]D|isamplerCube|isampler2DRect|isampler[1|2]DArray|isamplerBuffer|isampler2DMS|isampler2DMSArray|usampler[1|23]D|usamplerCube|usampler2DRect|usampler[1|2]DArray|usamplerBuffer|usampler2DMS|usampler2DMSArray)\\b",
       "name": "storage.type.glsl"
     },
     {
@@ -34,11 +34,11 @@
       "name": "storage.modifier.glsl"
     },
     {
-      "match": "\\b(gl_BackColor|gl_BackLightModelProduct|gl_BackLightProduct|gl_BackMaterial|gl_BackSecondaryColor|gl_ClipDistance|gl_ClipPlane|gl_ClipVertex|gl_Color|gl_DepthRange|gl_DepthRangeParameters|gl_EyePlaneQ|gl_EyePlaneR|gl_EyePlaneS|gl_EyePlaneT|gl_Fog|gl_FogCoord|gl_FogFragCoord|gl_FogParameters|gl_FragColor|gl_FragCoord|gl_FragDat|gl_FragDept|gl_FrontColor|gl_FrontFacing|gl_FrontLightModelProduct|gl_FrontLightProduct|gl_FrontMaterial|gl_FrontSecondaryColor|gl_InstanceID|gl_Layer|gl_LightModel|gl_LightModelParameters|gl_LightModelProducts|gl_LightProducts|gl_LightSource|gl_LightSourceParameters|gl_MaterialParameters|gl_ModelViewMatrix|gl_ModelViewMatrixInverse|gl_ModelViewMatrixInverseTranspose|gl_ModelViewMatrixTranspose|gl_ModelViewProjectionMatrix|gl_ModelViewProjectionMatrixInverse|gl_ModelViewProjectionMatrixInverseTranspose|gl_ModelViewProjectionMatrixTranspose|gl_MultiTexCoord[0-7]|gl_Normal|gl_NormalMatrix|gl_NormalScale|gl_ObjectPlaneQ|gl_ObjectPlaneR|gl_ObjectPlaneS|gl_ObjectPlaneT|gl_Point|gl_PointCoord|gl_PointParameters|gl_PointSize|gl_Position|gl_PrimitiveIDIn|gl_ProjectionMatrix|gl_ProjectionMatrixInverse|gl_ProjectionMatrixInverseTranspose|gl_ProjectionMatrixTranspose|gl_SecondaryColor|gl_TexCoord|gl_TextureEnvColor|gl_TextureMatrix|gl_TextureMatrixInverse|gl_TextureMatrixInverseTranspose|gl_TextureMatrixTranspose|gl_Vertex|gl_VertexIDh)\\b",
+      "match": "\\b(gl_(?:BackColor|BackLightModelProduct|BackLightProduct|BackMaterial|BackSecondaryColor|ClipDistance|ClipPlane|ClipVertex|Color|DepthRange|DepthRangeParameters|EyePlaneQ|EyePlaneR|EyePlaneS|EyePlaneT|Fog|FogCoord|FogFragCoord|FogParameters|FragColor|FragCoord|FragDat|FragDept|FrontColor|FrontFacing|FrontLightModelProduct|FrontLightProduct|FrontMaterial|FrontSecondaryColor|InstanceID|Layer|LightModel|LightModelParameters|LightModelProducts|LightProducts|LightSource|LightSourceParameters|MaterialParameters|ModelViewMatrix|ModelViewMatrixInverse|ModelViewMatrixInverseTranspose|ModelViewMatrixTranspose|ModelViewProjectionMatrix|ModelViewProjectionMatrixInverse|ModelViewProjectionMatrixInverseTranspose|ModelViewProjectionMatrixTranspose|MultiTexCoord[0-7]|Normal|NormalMatrix|NormalScale|ObjectPlaneQ|ObjectPlaneR|ObjectPlaneS|ObjectPlaneT|Point|PointCoord|PointParameters|PointSize|Position|PrimitiveIDIn|ProjectionMatrix|ProjectionMatrixInverse|ProjectionMatrixInverseTranspose|ProjectionMatrixTranspose|SecondaryColor|TexCoord|TextureEnvColor|TextureMatrix|TextureMatrixInverse|TextureMatrixInverseTranspose|TextureMatrixTranspose|Vertex|VertexIDh))\\b",
       "name": "support.variable.glsl"
     },
     {
-      "match": "\\b(gl_MaxClipPlanes|gl_MaxCombinedTextureImageUnits|gl_MaxDrawBuffers|gl_MaxFragmentUniformComponents|gl_MaxLights|gl_MaxTextureCoords|gl_MaxTextureImageUnits|gl_MaxTextureUnits|gl_MaxVaryingFloats|gl_MaxVertexAttribs|gl_MaxVertexTextureImageUnits|gl_MaxVertexUniformComponents)\\b",
+      "match": "\\b(gl_Max(?:ClipPlanes|CombinedTextureImageUnits|DrawBuffers|FragmentUniformComponents|Lights|TextureCoords|TextureImageUnits|TextureUnits|VaryingFloats|VertexAttribs|VertexTextureImageUnits|VertexUniformComponents))\\b",
       "name": "support.constant.glsl"
     },
     {