tm-grammars 1.22.18 → 1.23.0

package/grammars/hcl.json

@@ -26,12 +26,12 @@
           "name": "keyword.operator.accessor.hcl"
         }
       },
-      "end": "[[:alpha:]][\\w-]*|\\d*",
+      "end": "\\p{alpha}[\\w\\-]*|\\d*",
       "endCaptures": {
         "0": {
           "patterns": [
             {
-              "match": "(?!null|false|true)[[:alpha:]][\\w-]*",
+              "match": "(?!null|false|true)\\p{alpha}[\\w\\-]*",
               "name": "variable.other.member.hcl"
             },
             {
@@ -57,7 +57,7 @@
           "name": "keyword.operator.assignment.hcl"
         }
       },
-      "match": "(\\()?(\\b(?!null\\b|false\\b|true\\b)[[:alpha:]][[:alnum:]_-]*)(\\))?\\s*(\\=(?!\\=|\\>))\\s*",
+      "match": "(\\()?(\\b(?!null\\b|false\\b|true\\b)\\p{alpha}[[:alnum:]_\\-]*)(\\))?\\s*(=(?![=>]))\\s*",
       "name": "variable.declaration.hcl"
     },
     "attribute_splat": {
@@ -75,12 +75,12 @@
       }
     },
     "block": {
-      "begin": "([\\w][\\-\\w]*)(([^\\S\\r\\n]+([\\w][\\-_\\w]*|\\\"[^\\\"\\r\\n]*\\\"))*)[^\\S\\r\\n]*(\\{)",
+      "begin": "(\\w[\\-\\w]*)(([^\\S\\r\\n]+(\\w[\\-_\\w]*|\"[^\"\\r\\n]*\"))*)[^\\S\\r\\n]*(\\{)",
       "beginCaptures": {
         "1": {
           "patterns": [
             {
-              "match": "\\b(?!null|false|true)[[:alpha:]][[:alnum:]_-]*\\b",
+              "match": "\\b(?!null|false|true)\\p{alpha}[[:alnum:]_\\-]*\\b",
               "name": "entity.name.type.hcl"
             }
           ]
@@ -88,11 +88,11 @@
         "2": {
           "patterns": [
             {
-              "match": "\\\"[^\\\"\\r\\n]*\\\"",
+              "match": "\"[^\"\\r\\n]*\"",
               "name": "variable.other.enummember.hcl"
             },
             {
-              "match": "[[:alpha:]][[:alnum:]_-]*",
+              "match": "\\p{alpha}[[:alnum:]_\\-]*",
               "name": "variable.other.enummember.hcl"
             }
           ]
@@ -101,7 +101,7 @@
           "name": "punctuation.section.block.begin.hcl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.block.end.hcl"
@@ -140,7 +140,7 @@
           "name": "punctuation.section.brackets.begin.hcl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.brackets.end.hcl"
@@ -172,11 +172,11 @@
       ]
     },
     "char_escapes": {
-      "match": "\\\\[nrt\"\\\\]|\\\\u(\\h{8}|\\h{4})",
+      "match": "\\\\(?:[nrt\"\\\\]|u(\\h{8}|\\h{4}))",
       "name": "constant.character.escape.hcl"
     },
     "comma": {
-      "match": "\\,",
+      "match": ",",
       "name": "punctuation.separator.hcl"
     },
     "comments": {
@@ -247,7 +247,7 @@
           "name": "keyword.control.conditional.hcl"
         },
         {
-          "match": "\\:",
+          "match": ":",
           "name": "keyword.operator.hcl"
         },
         {
@@ -270,11 +270,11 @@
         "1": {
           "patterns": [
             {
-              "match": "\\b[[:alpha:]][\\w_-]*::([[:alpha:]][\\w_-]*::)?[[:alpha:]][\\w_-]*\\b",
+              "match": "\\b\\p{alpha}[\\w_\\-]*::(\\p{alpha}[\\w_\\-]*::)?\\p{alpha}[\\w_\\-]*\\b",
               "name": "support.function.namespaced.hcl"
             },
             {
-              "match": "\\b[[:alpha:]][\\w_-]*\\b",
+              "match": "\\b\\p{alpha}[\\w_\\-]*\\b",
               "name": "support.function.builtin.hcl"
             }
           ]
@@ -317,7 +317,7 @@
       "name": "storage.type.hcl"
     },
     "heredoc": {
-      "begin": "(\\<\\<\\-?)\\s*(\\w+)\\s*$",
+      "begin": "(<<-?)\\s*(\\w+)\\s*$",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.heredoc.hcl"
@@ -347,7 +347,7 @@
         "2": {
           "patterns": [
             {
-              "match": "\\=\\>",
+              "match": "=>",
               "name": "storage.type.function.hcl"
             },
             {
@@ -405,7 +405,7 @@
       ]
     },
     "local_identifiers": {
-      "match": "\\b(?!null|false|true)[[:alpha:]][[:alnum:]_-]*\\b",
+      "match": "\\b(?!null|false|true)\\p{alpha}[[:alnum:]_\\-]*\\b",
       "name": "variable.other.readwrite.hcl"
     },
     "numeric_literals": {
@@ -416,7 +416,7 @@
               "name": "punctuation.separator.exponent.hcl"
             }
           },
-          "match": "\\b\\d+([Ee][+-]?)\\d+\\b",
+          "match": "\\b\\d+([Ee][+\\-]?)\\d+\\b",
           "name": "constant.numeric.float.hcl"
         },
         {
@@ -428,7 +428,7 @@
               "name": "punctuation.separator.exponent.hcl"
             }
           },
-          "match": "\\b\\d+(\\.)\\d+(?:([Ee][+-]?)\\d+)?\\b",
+          "match": "\\b\\d+(\\.)\\d+(?:([Ee][+\\-]?)\\d+)?\\b",
           "name": "constant.numeric.float.hcl"
         },
         {
@@ -447,7 +447,7 @@
           "name": "keyword.control.hcl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.braces.end.hcl"
@@ -455,7 +455,7 @@
       },
       "patterns": [
         {
-          "match": "\\=\\>",
+          "match": "=>",
           "name": "storage.type.function.hcl"
         },
         {
@@ -495,7 +495,7 @@
           "name": "punctuation.section.braces.begin.hcl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.braces.end.hcl"
@@ -524,7 +524,7 @@
               "name": "keyword.operator.assignment.hcl"
             }
           },
-          "match": "\\b((?!null|false|true)[[:alpha:]][[:alnum:]_-]*)\\s*(\\=(?!=))\\s*"
+          "match": "\\b((?!null|false|true)\\p{alpha}[[:alnum:]_\\-]*)\\s*(=(?!=))\\s*"
         },
         {
           "captures": {
@@ -541,7 +541,7 @@
               "name": "keyword.operator.hcl"
             }
           },
-          "match": "^\\s*((\").*(\"))\\s*(\\=)\\s*"
+          "match": "^\\s*((\").*(\"))\\s*(=)\\s*"
         },
         {
           "begin": "^\\s*\\(",
@@ -550,7 +550,7 @@
               "name": "punctuation.section.parens.begin.hcl"
             }
           },
-          "end": "(\\))\\s*(=|:)\\s*",
+          "end": "(\\))\\s*([=:])\\s*",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.parens.end.hcl"
@@ -577,19 +577,19 @@
     "operators": {
       "patterns": [
         {
-          "match": "\\>\\=",
+          "match": ">=",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\<\\=",
+          "match": "<=",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\=\\=",
+          "match": "==",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\!\\=",
+          "match": "!=",
           "name": "keyword.operator.hcl"
         },
         {
@@ -597,7 +597,7 @@
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\-",
+          "match": "-",
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
@@ -605,15 +605,15 @@
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\/",
+          "match": "/",
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\%",
+          "match": "%",
           "name": "keyword.operator.arithmetic.hcl"
         },
         {
-          "match": "\\&\\&",
+          "match": "&&",
           "name": "keyword.operator.logical.hcl"
         },
         {
@@ -621,15 +621,15 @@
           "name": "keyword.operator.logical.hcl"
         },
         {
-          "match": "\\!",
+          "match": "!",
           "name": "keyword.operator.logical.hcl"
         },
         {
-          "match": "\\>",
+          "match": ">",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\<",
+          "match": "<",
           "name": "keyword.operator.hcl"
         },
         {
@@ -641,11 +641,11 @@
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\:",
+          "match": ":",
           "name": "keyword.operator.hcl"
         },
         {
-          "match": "\\=\\>",
+          "match": "=>",
           "name": "keyword.operator.hcl"
         }
       ]
@@ -673,13 +673,13 @@
       ]
     },
     "string_interpolation": {
-      "begin": "(?<![%$])([%$]{)",
+      "begin": "(?<![%$])([%$]\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.interpolation.begin.hcl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "keyword.other.interpolation.end.hcl"
@@ -688,11 +688,11 @@
       "name": "meta.interpolation.hcl",
       "patterns": [
         {
-          "match": "\\~\\s",
+          "match": "~\\s",
           "name": "keyword.operator.template.left.trim.hcl"
         },
         {
-          "match": "\\s\\~",
+          "match": "\\s~",
           "name": "keyword.operator.template.right.trim.hcl"
         },
         {
@@ -740,7 +740,7 @@
           "name": "keyword.control.hcl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.brackets.end.hcl"

package/grammars/hjson.json

@@ -4,7 +4,7 @@
     "hjson"
   ],
   "foldingStartMarker": "(?:^\\s*[{\\[](?!.*[}\\]],?\\s*$)|[{\\[]\\s*$)",
-  "foldingStopMarker": "(?:^\\s*[}\\]])",
+  "foldingStopMarker": "^\\s*[}\\]]",
   "name": "hjson",
   "patterns": [
     {
@@ -14,7 +14,7 @@
       "include": "#value"
     },
     {
-      "match": "[^\\s]",
+      "match": "\\S",
       "name": "invalid.illegal.excess-characters.hjson"
     }
   ],
@@ -26,7 +26,7 @@
           "name": "punctuation.definition.array.begin.hjson"
         }
       },
-      "end": "(\\])(?:\\s*([^,\\s]+))?",
+      "end": "(])(?:\\s*([^,\\s]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.array.end.hjson"
@@ -49,7 +49,7 @@
           "name": "punctuation.definition.array.begin.hjson"
         }
       },
-      "end": "(\\])(?:\\s*([^,\\s\\]]+))?",
+      "end": "(])(?:\\s*([^,\\s\\]]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.array.end.hjson"
@@ -74,7 +74,7 @@
           "name": "punctuation.separator.array.after-const.hjson"
         }
       },
-      "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\]))"
+      "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|]))"
     },
     "arrayContent": {
       "name": "meta.structure.array.hjson",
@@ -190,7 +190,7 @@
           "name": "punctuation.separator.array.after-num.hjson"
         }
       },
-      "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\]))"
+      "match": "(-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+\\-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|]))"
     },
     "arrayObject": {
       "begin": "\\{",
@@ -199,7 +199,7 @@
           "name": "punctuation.definition.dictionary.begin.hjson"
         }
       },
-      "end": "(\\}|(?<=\\}))(?:\\s*([^,\\s\\]]+))?",
+      "end": "(}|(?<=}))(?:\\s*([^,\\s\\]]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.dictionary.end.hjson"
@@ -255,7 +255,7 @@
               "name": "punctuation.definition.comment.hjson"
             }
           },
-          "match": "^\\s*(#).*(?:\\n)?",
+          "match": "^\\s*(#).*\\n?",
           "name": "comment.line.hash"
         },
         {
@@ -264,7 +264,7 @@
               "name": "punctuation.definition.comment.hjson"
             }
           },
-          "match": "^\\s*(//).*(?:\\n)?",
+          "match": "^\\s*(//).*\\n?",
           "name": "comment.line.double-slash"
         },
         {
@@ -360,7 +360,7 @@
           "name": "constant.language.hjson"
         }
       },
-      "match": "\\b(true|false|null)[\\t ]*(?=$|#|/\\*|//|\\])"
+      "match": "\\b(true|false|null)[\\t ]*(?=$|#|/\\*|//|])"
     },
     "jstring": {
       "patterns": [
@@ -415,7 +415,7 @@
     "jstringDoubleContent": {
       "patterns": [
         {
-          "match": "\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
+          "match": "\\\\(?:[\"'\\\\/bfnrt]|u\\h{4})",
           "name": "constant.character.escape.hjson"
         },
         {
@@ -431,7 +431,7 @@
     "jstringSingleContent": {
       "patterns": [
         {
-          "match": "\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4})",
+          "match": "\\\\(?:[\"'\\\\/bfnrt]|u\\h{4})",
           "name": "constant.character.escape.hjson"
         },
         {
@@ -445,7 +445,7 @@
       ]
     },
     "key": {
-      "begin": "(?:((?:[^:,\\{\\}\\[\\]\\s\"'][^:,\\{\\}\\[\\]\\s]*)|(?:'(?:[^\\\\']|(\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4}))|(\\\\.))*')|(?:\"(?:[^\\\\\"]|(\\\\(?:[\"'\\\\\\/bfnrt]|u[0-9a-fA-F]{4}))|(\\\\.))*\"))\\s*(?!\\n)([,\\{\\}\\[\\]]*))",
+      "begin": "([^:,{}\\[\\]\\s\"'][^:,{}\\[\\]\\s]*|'(?:[^\\\\']|(\\\\(?:[\"'\\\\/bfnrt]|u\\h{4}))|(\\\\.))*'|\"(?:[^\\\\\"]|(\\\\(?:[\"'\\\\/bfnrt]|u\\h{4}))|(\\\\.))*\")\\s*(?!\\n)([,{}\\[\\]]*)",
       "beginCaptures": {
         "0": {
           "name": "meta.structure.key-value.begin.hjson"
@@ -486,13 +486,13 @@
           "include": "#keyValue"
         },
         {
-          "match": "[^\\s]",
+          "match": "\\S",
           "name": "invalid.illegal.object-property.hjson"
         }
       ]
     },
     "keyValue": {
-      "begin": "(?:\\s*(:)\\s*([,\\}\\]]*))",
+      "begin": "\\s*(:)\\s*([,}\\]]*)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.separator.dictionary.key-value.hjson"
@@ -519,10 +519,10 @@
               "name": "invalid.illegal.object-property.closing-bracket.hjson"
             }
           },
-          "match": "^\\s*(\\})"
+          "match": "^\\s*(})"
         },
         {
-          "match": "[^\\s]",
+          "match": "\\S",
           "name": "invalid.illegal.object-property.hjson"
         }
       ]
@@ -551,7 +551,7 @@
           "name": "constant.numeric.hjson"
         }
       },
-      "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)[\\t ]*(?=$|#|/\\*|//|\\])"
+      "match": "(-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+\\-]?\\d+)?)[\\t ]*(?=$|#|/\\*|//|])"
     },
     "object": {
       "begin": "\\{",
@@ -560,7 +560,7 @@
           "name": "punctuation.definition.dictionary.begin.hjson"
         }
       },
-      "end": "(\\}|(?<=\\}))(?:\\s*([^,\\s]+))?",
+      "end": "(}|(?<=}))(?:\\s*([^,\\s]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.dictionary.end.hjson"
@@ -583,7 +583,7 @@
           "name": "punctuation.definition.array.begin.hjson"
         }
       },
-      "end": "(\\])(?:\\s*([^,\\s\\}]+))?",
+      "end": "(])(?:\\s*([^,\\s}]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.array.end.hjson"
@@ -608,7 +608,7 @@
           "name": "punctuation.separator.dictionary.pair.after-const.hjson"
         }
       },
-      "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\}))"
+      "match": "\\b(true|false|null)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|}))"
     },
     "objectContent": {
       "patterns": [
@@ -623,7 +623,7 @@
           "name": "invalid.illegal.object-property.hjson"
         },
         {
-          "begin": "(?<=\\{|,)|,",
+          "begin": "(?<=[{,])|,",
           "beginCaptures": {
             "1": {
               "name": "punctuation.separator.dictionary.pair.hjson"
@@ -641,7 +641,7 @@
           ]
         },
         {
-          "match": "[^\\s]",
+          "match": "\\S",
           "name": "invalid.illegal.object-property.hjson"
         }
       ]
@@ -655,7 +655,7 @@
               "name": "punctuation.definition.string.begin.hjson"
             }
           },
-          "end": "(\")(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+          "end": "(\")(?:\\s*((?:[^,\\s}#/]|/[^/*])+))?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.hjson"
@@ -678,7 +678,7 @@
               "name": "punctuation.definition.string.begin.hjson"
             }
           },
-          "end": "(')(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+          "end": "(')(?:\\s*((?:[^,\\s}#/]|/[^/*])+))?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.hjson"
@@ -703,7 +703,7 @@
           "name": "punctuation.definition.string.begin.hjson"
         }
       },
-      "end": "(''')(?:\\s*((?:[^,\\s\\}#/]|/[^/*])+))?",
+      "end": "(''')(?:\\s*((?:[^,\\s}#/]|/[^/*])+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.hjson"
@@ -723,7 +723,7 @@
           "name": "punctuation.separator.dictionary.pair.after-num.hjson"
         }
       },
-      "match": "(-?(?:0|(?:[1-9]\\d*))(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|\\}))"
+      "match": "(-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+\\-]?\\d+)?)(?:[\\t ]*(?=,)|[\\t ]*(?:(,)[\\t ]*)?(?=$|#|/\\*|//|}))"
     },
     "objectObject": {
       "begin": "\\{",
@@ -732,7 +732,7 @@
           "name": "punctuation.definition.dictionary.begin.hjson"
         }
       },
-      "end": "(\\}|(?<=\\})\\}?)(?:\\s*([^,\\s}]+))?",
+      "end": "(}|(?<=})}?)(?:\\s*([^,\\s}]+))?",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.dictionary.end.hjson"
@@ -794,7 +794,7 @@
       ]
     },
     "ustring": {
-      "match": "([^:,\\{\\[\\}\\]\\s].*)$",
+      "match": "([^:,{\\[}\\]\\s].*)$",
       "name": "string.quoted.none.hjson"
     },
     "value": {

package/grammars/hlsl.json

@@ -13,19 +13,19 @@
       "name": "comment.line.double-slash.hlsl"
     },
     {
-      "match": "\\b[0-9]+\\.[0-9]*(F|f)?\\b",
+      "match": "\\b[0-9]+\\.[0-9]*([Ff])?\\b",
       "name": "constant.numeric.decimal.hlsl"
     },
     {
-      "match": "(\\.([0-9]+)(F|f)?)\\b",
+      "match": "(\\.([0-9]+)([Ff])?)\\b",
       "name": "constant.numeric.decimal.hlsl"
     },
     {
-      "match": "\\b([0-9]+(F|f)?)\\b",
+      "match": "\\b([0-9]+([Ff])?)\\b",
       "name": "constant.numeric.decimal.hlsl"
     },
     {
-      "match": "\\b(0(x|X)[0-9a-fA-F]+)\\b",
+      "match": "\\b(0([xX])\\h+)\\b",
       "name": "constant.numeric.hex.hlsl"
     },
     {
@@ -53,23 +53,23 @@
       "name": "storage.type.basic.hlsl"
     },
     {
-      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)(?=[\\s]*\\()",
+      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)(?=\\s*\\()",
       "name": "support.function.hlsl"
     },
     {
-      "match": "(?<=\\:\\s|\\:)(?i:BINORMAL[0-9]*|BLENDINDICES[0-9]*|BLENDWEIGHT[0-9]*|COLOR[0-9]*|NORMAL[0-9]*|POSITIONT|POSITION|PSIZE[0-9]*|TANGENT[0-9]*|TEXCOORD[0-9]*|FOG|TESSFACTOR[0-9]*|VFACE|VPOS|DEPTH[0-9]*)\\b",
+      "match": "(?<=:(?:\\s|))(?i:BINORMAL[0-9]*|BLENDINDICES[0-9]*|BLENDWEIGHT[0-9]*|COLOR[0-9]*|NORMAL[0-9]*|POSITIONT|POSITION|PSIZE[0-9]*|TANGENT[0-9]*|TEXCOORD[0-9]*|FOG|TESSFACTOR[0-9]*|VFACE|VPOS|DEPTH[0-9]*)\\b",
       "name": "support.variable.semantic.hlsl"
     },
     {
-      "match": "(?<=\\:\\s|\\:)(?i:SV_ClipDistance[0-9]*|SV_CullDistance[0-9]*|SV_Coverage|SV_Depth|SV_DepthGreaterEqual[0-9]*|SV_DepthLessEqual[0-9]*|SV_InstanceID|SV_IsFrontFace|SV_Position|SV_RenderTargetArrayIndex|SV_SampleIndex|SV_StencilRef|SV_Target[0-7]?|SV_VertexID|SV_ViewportArrayIndex)\\b",
+      "match": "(?<=:(?:\\s|))(?i:SV_(?:ClipDistance[0-9]*|CullDistance[0-9]*|Coverage|Depth|DepthGreaterEqual[0-9]*|DepthLessEqual[0-9]*|InstanceID|IsFrontFace|Position|RenderTargetArrayIndex|SampleIndex|StencilRef|Target[0-7]?|VertexID|ViewportArrayIndex))\\b",
       "name": "support.variable.semantic.sm4.hlsl"
     },
     {
-      "match": "(?<=\\:\\s|\\:)(?i:SV_DispatchThreadID|SV_DomainLocation|SV_GroupID|SV_GroupIndex|SV_GroupThreadID|SV_GSInstanceID|SV_InsideTessFactor|SV_OutputControlPointID|SV_TessFactor)\\b",
+      "match": "(?<=:(?:\\s|))(?i:SV_(?:DispatchThreadID|DomainLocation|GroupID|GroupIndex|GroupThreadID|GSInstanceID|InsideTessFactor|OutputControlPointID|TessFactor))\\b",
       "name": "support.variable.semantic.sm5.hlsl"
     },
     {
-      "match": "(?<=\\:\\s|\\:)(?i:SV_InnerCoverage|SV_StencilRef)\\b",
+      "match": "(?<=:(?:\\s|))(?i:SV_(?:InnerCoverage|StencilRef))\\b",
       "name": "support.variable.semantic.sm5_1.hlsl"
     },
     {
@@ -101,11 +101,11 @@
       "name": "support.type.object.hlsl"
     },
     {
-      "match": "\\b(RasterizerOrderedBuffer|RasterizerOrderedByteAddressBuffer|RasterizerOrderedStructuredBuffer|RasterizerOrderedTexture1D|RasterizerOrderedTexture1DArray|RasterizerOrderedTexture2D|RasterizerOrderedTexture2DArray|RasterizerOrderedTexture3D)\\b",
+      "match": "\\b(RasterizerOrdered(?:Buffer|ByteAddressBuffer|StructuredBuffer|Texture1D|Texture1DArray|Texture2D|Texture2DArray|Texture3D))\\b",
       "name": "support.type.object.rasterizerordered.hlsl"
     },
     {
-      "match": "\\b(RWBuffer|RWByteAddressBuffer|RWStructuredBuffer|RWTexture1D|RWTexture1DArray|RWTexture2D|RWTexture2DArray|RWTexture3D)\\b",
+      "match": "\\b(RW(?:Buffer|ByteAddressBuffer|StructuredBuffer|Texture1D|Texture1DArray|Texture2D|Texture2DArray|Texture3D))\\b",
       "name": "support.type.object.rw.hlsl"
     },
     {
@@ -113,19 +113,19 @@
       "name": "support.type.object.geometryshader.hlsl"
     },
     {
-      "match": "\\b(sampler|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler_state)\\b",
+      "match": "\\b(sampler(?:|1D|2D|3D|CUBE|_state))\\b",
       "name": "support.type.sampler.legacy.hlsl"
     },
     {
-      "match": "\\b(SamplerState|SamplerComparisonState)\\b",
+      "match": "\\b(Sampler(?:State|ComparisonState))\\b",
       "name": "support.type.sampler.hlsl"
     },
     {
-      "match": "\\b(texture2D|textureCUBE)\\b",
+      "match": "\\b(texture(?:2D|CUBE))\\b",
       "name": "support.type.texture.legacy.hlsl"
     },
     {
-      "match": "\\b(Texture1D|Texture1DArray|Texture2D|Texture2DArray|Texture2DMS|Texture2DMSArray|Texture3D|TextureCube|TextureCubeArray)\\b",
+      "match": "\\b(Texture(?:1D|1DArray|2D|2DArray|2DMS|2DMSArray|3D|Cube|CubeArray))\\b",
       "name": "support.type.texture.hlsl"
     },
     {

package/grammars/html-derivative.json

@@ -2,7 +2,6 @@
   "displayName": "HTML (Derivative)",
   "injections": {
     "R:text.html - (comment.block, text.html meta.embedded, meta.tag.*.*.html, meta.tag.*.*.*.html, meta.tag.*.*.*.*.html)": {
-      "comment": "Uses R: to ensure this matches after any other injections.",
       "patterns": [
         {
           "match": "<",