github-linguist 5.3.3 → 6.0.0

data/grammars/source.terra.json

@@ -1,11 +1,6 @@
 {
-  "comment": "Terra Syntax: version 0.1",
   "name": "Terra",
   "scopeName": "source.terra",
-  "fileTypes": [
-    "t"
-  ],
-  "uuid": "60fdffd9-17bb-4a53-a0f1-3ba1a0e5c0bf",
   "patterns": [
     {
       "name": "meta.function.terra",
@@ -33,59 +28,59 @@
     },
     {
       "name": "constant.numeric.terra",
-      "match": "(?<![\\d.])\\s0x[a-fA-F\\d]+|\\b\\d+(\\.\\d+)?([eE]-?\\d+)?|\\.\\d+([eE]-?\\d+)?"
+      "match": "(?\u003c![\\d.])\\s0x[a-fA-F\\d]+|\\b\\d+(\\.\\d+)?([eE]-?\\d+)?|\\.\\d+([eE]-?\\d+)?"
     },
     {
       "name": "string.quoted.single.terra",
       "begin": "'",
+      "end": "'",
+      "patterns": [
+        {
+          "name": "constant.character.escape.terra",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.terra"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.terra"
         }
-      },
+      }
+    },
+    {
+      "name": "string.quoted.double.terra",
+      "begin": "\"",
+      "end": "\"",
       "patterns": [
         {
           "name": "constant.character.escape.terra",
           "match": "\\\\."
         }
-      ]
-    },
-    {
-      "name": "string.quoted.double.terra",
-      "begin": "\"",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.terra"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.terra"
         }
-      },
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escape.terra"
-        }
-      ]
+      }
     },
     {
       "name": "string.quoted.other.multiline.terra",
-      "begin": "(?<!--)\\[(=*)\\[",
+      "begin": "(?\u003c!--)\\[(=*)\\[",
+      "end": "\\]\\1\\]",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.terra"
         }
       },
-      "end": "\\]\\1\\]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.terra"
@@ -117,19 +112,19 @@
     },
     {
       "name": "constant.language.terra",
-      "match": "(?<![^.]\\.|:)\\b(false|nil|true|_G|_VERSION|math\\.(pi|huge))\\b|(?<![.])\\.{3}(?!\\.)"
+      "match": "(?\u003c![^.]\\.|:)\\b(false|nil|true|_G|_VERSION|math\\.(pi|huge))\\b|(?\u003c![.])\\.{3}(?!\\.)"
     },
     {
       "name": "variable.language.self.terra",
-      "match": "(?<![^.]\\.|:)\\b(self)\\b"
+      "match": "(?\u003c![^.]\\.|:)\\b(self)\\b"
     },
     {
       "name": "support.function.terra",
-      "match": "(?<![^.]\\.|:)\\b(assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|loadfile|loadstring|module|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\\b(?=[( {])"
+      "match": "(?\u003c![^.]\\.|:)\\b(assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|loadfile|loadstring|module|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\\b(?=[( {])"
     },
     {
       "name": "support.function.library.terra",
-      "match": "(?<![^.]\\.|:)\\b(coroutine\\.(create|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|rep|reverse|sub|upper)|table\\.(concat|insert|maxn|remove|sort)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(cpath|loaded|loadlib|path|preload|seeall)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|traceback))\\b(?=[( {])"
+      "match": "(?\u003c![^.]\\.|:)\\b(coroutine\\.(create|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|rep|reverse|sub|upper)|table\\.(concat|insert|maxn|remove|sort)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(cpath|loaded|loadlib|path|preload|seeall)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|traceback))\\b(?=[( {])"
     },
     {
       "name": "keyword.operator.terra",
@@ -137,9 +132,7 @@
     },
     {
       "name": "keyword.operator.terra",
-      "match": "\\+|-|%|#|\\*|\\/|\\^|==?|~=|<=?|>=?|(?<!\\.)\\.{2}(?!\\.)"
+      "match": "\\+|-|%|#|\\*|\\/|\\^|==?|~=|\u003c=?|\u003e=?|(?\u003c!\\.)\\.{2}(?!\\.)"
     }
-  ],
-  "foldingStartMarker": "^\\s*\\b(function|local\\s+function|if|for)\\b|{[ \\t]*$|\\[\\[",
-  "foldingStopMarker": "\\bend\\b|^\\s*}|\\]\\]"
-}
+  ]
+}

data/grammars/source.terraform.json

@@ -1,15 +1,8 @@
 {
   "name": "Terraform",
   "scopeName": "source.terraform",
-  "fileTypes": [
-    "tf",
-    "tfvars",
-    "hcl"
-  ],
-  "uuid": "9060ca81-906d-4f19-a91a-159f4eb119d6",
   "patterns": [
     {
-      "comment": "Comments",
       "name": "comment.line.number-sign.terraform",
       "begin": "#|//",
       "end": "$\\n?",
@@ -20,7 +13,6 @@
       }
     },
     {
-      "comment": "Block comments",
       "name": "comment.block.terraform",
       "begin": "/\\*",
       "end": "\\*/",
@@ -31,25 +23,20 @@
       }
     },
     {
-      "comment": "Language constants (true, false, yes, no, on, off)",
       "name": "constant.language.terraform",
       "match": "\\b(true|false|yes|no|on|off)\\b"
     },
     {
-      "comment": "Numbers",
       "name": "constant.numeric.terraform",
       "match": "\\b([0-9]+)([kKmMgG]b?)?\\b"
     },
     {
-      "comment": "Hex numbers",
       "name": "constant.numeric.terraform",
       "match": "\\b(0x[0-9A-Fa-f]+)([kKmMgG]b?)?\\b"
     },
     {
       "name": "meta.resource.terraform",
       "match": "(resource|data)\\s+(\")?(\\w+)(\")?\\s+(\")?([\\w\\-]+)(\")?\\s+({)",
-      "foldingStartMarker": "\\{\\s*$",
-      "foldingStopMarker": "^\\s*\\}",
       "captures": {
         "1": {
           "name": "storage.type.function.terraform"
@@ -79,8 +66,6 @@
     },
     {
       "match": "(provider|provisioner|variable|output|module|atlas)\\s+(\")?([\\w\\-]+)(\")?\\s+({)",
-      "foldingStartMarker": "\\{\\s*$",
-      "foldingStopMarker": "^\\s*\\}",
       "captures": {
         "1": {
           "name": "storage.type.function.terraform"
@@ -100,7 +85,6 @@
       }
     },
     {
-      "comment": "Value assignments (left hand side not in double quotes)",
       "match": "([\\w_-]+)\\s*(=)\\s*",
       "captures": {
         "1": {
@@ -112,7 +96,6 @@
       }
     },
     {
-      "comment": "Value assignments (left hand side in double quotes)",
       "match": "(\")([\\w_-]+)(\")\\s*(=)\\s*",
       "captures": {
         "1": {
@@ -130,7 +113,6 @@
       }
     },
     {
-      "comment": "Maps",
       "match": "([\\w\\-_]+)\\s+({)",
       "captures": {
         "1": {
@@ -146,7 +128,8 @@
     },
     {
       "name": "string.unquoted.heredoc.terraform",
-      "begin": "(?>\\s*<<(\\w+))",
+      "begin": "(?\u003e\\s*\u003c\u003c(\\w+))",
+      "end": "^\\s*\\1$",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.terraform"
@@ -155,7 +138,6 @@
           "name": "keyword.operator.heredoc.terraform"
         }
       },
-      "end": "^\\s*\\1$",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.terraform keyword.operator.heredoc.terraform"
@@ -164,33 +146,58 @@
     }
   ],
   "repository": {
-    "strings": {
-      "comment": "Strings",
-      "begin": "\\\"",
-      "beginCaptures": {
-        "0": {
-          "name": "string.terraform punctuation.definition.string.begin.terraform"
-        }
-      },
-      "end": "\\\"",
-      "endCaptures": {
-        "0": {
-          "name": "string.terraform punctuation.definition.string.end.terraform"
-        }
-      },
+    "string_interpolation": {
       "patterns": [
         {
-          "include": "#string_interpolation"
-        },
-        {
-          "match": "([\\w\\-\\/\\._\\\\%]+)",
-          "name": "string.quoted.double.terraform"
+          "name": "source.terraform.embedded.source",
+          "begin": "\\$\\{",
+          "end": "\\}",
+          "patterns": [
+            {
+              "include": "$self"
+            },
+            {
+              "include": "#string_interpolation_functions"
+            },
+            {
+              "include": "#string_interpolation_keywords"
+            },
+            {
+              "match": "(\\.)",
+              "captures": {
+                "0": {
+                  "name": "keyword.control.period.terraform"
+                }
+              }
+            },
+            {
+              "include": "#strings"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "entity.tag.embedded.start.terraform"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "entity.tag.embedded.end.terraform"
+            }
+          }
         }
       ]
     },
     "string_interpolation_functions": {
-      "comment": "Builtin functions",
       "begin": "(base64decode|base64encode|base64gzip|base64sha256|base64sha512|basename|bcrypt|ceil|chomp|cidrhost|cidrnetmask|cidrsubnet|coalesce|coalescelist|compact|concat|contains|dirname|distinct|element|file|flatten|floor|format|formatlist|index|join|jsonencode|keys|length|list|log|lookup|lower|map|matchkeys|max|md5|merge|min|pathexpand|pow|replace|sha1|sha256|sha512|signum|slice|sort|split|substr|timestamp|title|trimspace|upper|urlencode|uuid|values|zipmap)(\\()",
+      "end": "(\\))",
+      "patterns": [
+        {
+          "include": "#string_interpolation_functions"
+        },
+        {
+          "include": "#string_interpolation_keywords"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.function.inline.terraform"
@@ -199,20 +206,11 @@
           "name": "keyword.other.section.begin.terraform"
         }
       },
-      "end": "(\\))",
       "endCaptures": {
         "1": {
           "name": "keyword.other.section.end.terraform"
         }
-      },
-      "patterns": [
-        {
-          "include": "#string_interpolation_functions"
-        },
-        {
-          "include": "#string_interpolation_keywords"
-        }
-      ]
+      }
     },
     "string_interpolation_keywords": {
       "match": "(terraform|var|self|count|module|path|data)(\\.[\\w\\*]+)+",
@@ -222,46 +220,28 @@
         }
       }
     },
-    "string_interpolation": {
+    "strings": {
+      "begin": "\\\"",
+      "end": "\\\"",
       "patterns": [
         {
-          "name": "source.terraform.embedded.source",
-          "begin": "\\$\\{",
-          "beginCaptures": {
-            "0": {
-              "name": "entity.tag.embedded.start.terraform"
-            }
-          },
-          "end": "\\}",
-          "endCaptures": {
-            "0": {
-              "name": "entity.tag.embedded.end.terraform"
-            }
-          },
-          "patterns": [
-            {
-              "include": "$self"
-            },
-            {
-              "include": "#string_interpolation_functions"
-            },
-            {
-              "include": "#string_interpolation_keywords"
-            },
-            {
-              "match": "(\\.)",
-              "captures": {
-                "0": {
-                  "name": "keyword.control.period.terraform"
-                }
-              }
-            },
-            {
-              "include": "#strings"
-            }
-          ]
+          "include": "#string_interpolation"
+        },
+        {
+          "name": "string.quoted.double.terraform",
+          "match": "([\\w\\-\\/\\._\\\\%]+)"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "string.terraform punctuation.definition.string.begin.terraform"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "string.terraform punctuation.definition.string.end.terraform"
+        }
+      }
     }
   }
-}
+}

data/grammars/source.thrift.json

@@ -1,14 +1,13 @@
 {
-  "fileTypes": [
-    "thrift"
-  ],
-  "keyEquivalent": "^~T",
   "name": "Thrift",
+  "scopeName": "source.thrift",
   "patterns": [
     {
       "include": "#comments"
     },
     {
+      "name": "meta.include.thrift",
+      "match": "(?\u003c!\\S)(include)(?!\\S)(?:\\s+((['\"])(?\u003e.*?(\\3))))?",
       "captures": {
         "1": {
           "name": "keyword.other.include.thrift"
@@ -22,11 +21,11 @@
         "4": {
           "name": "punctuation.definition.string.end.thrift"
         }
-      },
-      "match": "(?<!\\S)(include)(?!\\S)(?:\\s+((['\"])(?>.*?(\\3))))?",
-      "name": "meta.include.thrift"
+      }
     },
     {
+      "name": "meta.cpp-include.thrift",
+      "match": "(?\u003c!\\S)(cpp_include)(?!\\S)(?:\\s+((['\"])(?\u003e.*?(\\3))))?",
       "captures": {
         "1": {
           "name": "keyword.other.cpp-include.thrift"
@@ -40,11 +39,11 @@
         "4": {
           "name": "punctuation.definition.string.end.thrift"
         }
-      },
-      "match": "(?<!\\S)(cpp_include)(?!\\S)(?:\\s+((['\"])(?>.*?(\\3))))?",
-      "name": "meta.cpp-include.thrift"
+      }
     },
     {
+      "name": "meta.namespace.thrift",
+      "match": "(?\u003c!\\S)(namespace)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)(?:\\s+([a-zA-Z_][\\w.]*))?)?",
       "captures": {
         "1": {
           "name": "keyword.other.namespace.thrift"
@@ -55,11 +54,11 @@
         "3": {
           "name": "variable.other.namespace.thrift"
         }
-      },
-      "match": "(?<!\\S)(namespace)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)(?:\\s+([a-zA-Z_][\\w.]*))?)?",
-      "name": "meta.namespace.thrift"
+      }
     },
     {
+      "name": "meta.namespace.thrift",
+      "match": "(?\u003c!\\S)((?:php|xsd)_namespace)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*))?",
       "captures": {
         "1": {
           "name": "keyword.other.namespace.thrift"
@@ -67,11 +66,10 @@
         "2": {
           "name": "variable.other.namespace.thrift"
         }
-      },
-      "match": "(?<!\\S)((?:php|xsd)_namespace)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*))?",
-      "name": "meta.namespace.thrift"
+      }
     },
     {
+      "match": "(?\u003c!\\S)((?:cpp|ruby|csharp)_namespace|py_module|(?:java|perl)_package|smalltalk_(?:category|prefix)|cocoa_prefix)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*))?",
       "captures": {
         "1": {
           "name": "invalid.deprecated.namespace.thrift"
@@ -79,19 +77,27 @@
         "2": {
           "name": "variable.other.namespace.thrift"
         }
-      },
-      "match": "(?<!\\S)((?:cpp|ruby|csharp)_namespace|py_module|(?:java|perl)_package|smalltalk_(?:category|prefix)|cocoa_prefix)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*))?"
+      }
     },
     {
       "begin": "(?=(struct|s?enum|union|service|const|typedef|exception)\\b)",
-      "comment": "begin the definition list",
       "end": "(?x)$.^ # this regex should never end",
       "patterns": [
         {
           "include": "#comments"
         },
         {
-          "begin": "(?<!\\S)(const)(?!\\S)(?:\\s+(?<ft>map\\s*<\\s*\\g<ft>\\s*,\\s*\\g<ft>\\s*>|set\\s*<\\s*\\g<ft>\\s*>|list\\s*<\\s*\\g<ft>\\s*>\\s*cpp_type|[a-zA-Z_][\\w.]*)(?:\\s+([a-zA-Z_][\\w.]*)(?:\\s*=)?)?)?",
+          "name": "meta.const.thrift",
+          "begin": "(?\u003c!\\S)(const)(?!\\S)(?:\\s+(?\u003cft\u003emap\\s*\u003c\\s*\\g\u003cft\u003e\\s*,\\s*\\g\u003cft\u003e\\s*\u003e|set\\s*\u003c\\s*\\g\u003cft\u003e\\s*\u003e|list\\s*\u003c\\s*\\g\u003cft\u003e\\s*\u003e\\s*cpp_type|[a-zA-Z_][\\w.]*)(?:\\s+([a-zA-Z_][\\w.]*)(?:\\s*=)?)?)?",
+          "end": "$|^",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#value"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.other.const.thrift"
@@ -102,20 +108,17 @@
             "3": {
               "name": "variable.other.const.thrift"
             }
-          },
+          }
+        },
+        {
+          "name": "meta.typedef.thrift",
+          "begin": "(?\u003c!\\S)(typedef)(?!\\S)(?:\\s+(?\u003cft\u003emap\\s*\u003c\\s*\\g\u003cft\u003e\\s*,\\s*\\g\u003cft\u003e\\s*\u003e|set\\s*\u003c\\s*\\g\u003cft\u003e\\s*\u003e|list\\s*\u003c\\s*\\g\u003cft\u003e\\s*\u003e\\s*cpp_type|[a-zA-Z_][\\w.]*)(?:\\s+([a-zA-Z_][\\w.]*))?)?",
           "end": "$|^",
-          "name": "meta.const.thrift",
           "patterns": [
             {
               "include": "#comments"
-            },
-            {
-              "include": "#value"
             }
-          ]
-        },
-        {
-          "begin": "(?<!\\S)(typedef)(?!\\S)(?:\\s+(?<ft>map\\s*<\\s*\\g<ft>\\s*,\\s*\\g<ft>\\s*>|set\\s*<\\s*\\g<ft>\\s*>|list\\s*<\\s*\\g<ft>\\s*>\\s*cpp_type|[a-zA-Z_][\\w.]*)(?:\\s+([a-zA-Z_][\\w.]*))?)?",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.other.typedef.thrift"
@@ -126,84 +129,60 @@
             "3": {
               "name": "variable.other.typedef.thrift"
             }
-          },
-          "end": "$|^",
-          "name": "meta.typedef.thrift",
-          "patterns": [
-            {
-              "include": "#comments"
-            }
-          ]
+          }
         },
         {
-          "begin": "(?<!\\S)(union)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)\\s*(?![^\\s{]))?",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.union.thrift"
-            },
-            "2": {
-              "name": "entity.name.type.union.thrift"
-            }
-          },
-          "end": "(?<=\\})|$",
           "name": "meta.union.thrift",
+          "begin": "(?\u003c!\\S)(union)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)\\s*(?![^\\s{]))?",
+          "end": "(?\u003c=\\})|$",
           "patterns": [
             {
-              "match": "(?<!\\S)xsd_all(?!\\S)",
-              "name": "keyword.other.xsd-all.thrift"
+              "name": "keyword.other.xsd-all.thrift",
+              "match": "(?\u003c!\\S)xsd_all(?!\\S)"
             },
             {
               "begin": "\\{",
+              "end": "\\}",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#field"
+                }
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.union.begin.thrift"
                 }
               },
-              "end": "\\}",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.union.end.thrift"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "#comments"
-                },
-                {
-                  "include": "#field"
-                }
-              ]
+              }
             }
-          ]
-        },
-        {
-          "begin": "(?<!\\S)(enum)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)\\s*(?![^\\s{]))?",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.enum.thrift"
+              "name": "keyword.other.union.thrift"
             },
             "2": {
-              "name": "entity.name.type.enum.thrift"
+              "name": "entity.name.type.union.thrift"
             }
-          },
-          "end": "(?<=\\})|$",
+          }
+        },
+        {
           "name": "meta.enum.thrift",
+          "begin": "(?\u003c!\\S)(enum)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)\\s*(?![^\\s{]))?",
+          "end": "(?\u003c=\\})|$",
           "patterns": [
             {
               "begin": "\\{",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.enum.begin.thrift"
-                }
-              },
               "end": "\\}",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.enum.end.thrift"
-                }
-              },
               "patterns": [
                 {
+                  "match": "(?\u003c!\\S)([a-zA-Z_][\\w.]*)(?:\\s*=\\s*(\\d*)(?:\\s*[,;])?)?",
                   "captures": {
                     "1": {
                       "name": "variable.other.enum.thrift"
@@ -211,212 +190,181 @@
                     "2": {
                       "name": "constant.numeric.integer.thrift"
                     }
-                  },
-                  "match": "(?<!\\S)([a-zA-Z_][\\w.]*)(?:\\s*=\\s*(\\d*)(?:\\s*[,;])?)?"
+                  }
                 },
                 {
                   "include": "#comments"
                 },
                 {
-                  "match": "\\S",
-                  "name": "invalid.illegal.thrift"
+                  "name": "invalid.illegal.thrift",
+                  "match": "\\S"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.enum.begin.thrift"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.section.enum.end.thrift"
+                }
+              }
             }
-          ]
-        },
-        {
-          "begin": "(?<!\\S)(senum)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)\\s*(?![^\\s{]))?",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.senum.thrift"
+              "name": "keyword.other.enum.thrift"
             },
             "2": {
-              "name": "entity.name.type.senum.thrift"
+              "name": "entity.name.type.enum.thrift"
             }
-          },
-          "end": "(?<=\\})|$",
+          }
+        },
+        {
           "name": "meta.senum.thrift",
+          "begin": "(?\u003c!\\S)(senum)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)\\s*(?![^\\s{]))?",
+          "end": "(?\u003c=\\})|$",
           "patterns": [
             {
               "begin": "\\{",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.senum.begin.thrift"
-                }
-              },
               "end": "\\}",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.senum.end.thrift"
-                }
-              },
               "patterns": [
                 {
+                  "match": "(?\u003c!\\S)([a-zA-Z_][\\w.]*)(?:\\s*[,;])?",
                   "captures": {
                     "1": {
                       "name": "variable.other.senum.thrift"
                     }
-                  },
-                  "match": "(?<!\\S)([a-zA-Z_][\\w.]*)(?:\\s*[,;])?"
+                  }
                 },
                 {
                   "include": "#comments"
                 },
                 {
-                  "match": "\\S",
-                  "name": "invalid.illegal.thrift"
+                  "name": "invalid.illegal.thrift",
+                  "match": "\\S"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.senum.begin.thrift"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.section.senum.end.thrift"
+                }
+              }
             }
-          ]
-        },
-        {
-          "begin": "(?<!\\S)(struct)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)\\s*(?![^\\s{]))?",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.struct.thrift"
+              "name": "keyword.other.senum.thrift"
             },
             "2": {
-              "name": "entity.name.type.struct.thrift"
+              "name": "entity.name.type.senum.thrift"
             }
-          },
-          "end": "(?<=\\})|$",
+          }
+        },
+        {
           "name": "meta.struct.thrift",
+          "begin": "(?\u003c!\\S)(struct)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)\\s*(?![^\\s{]))?",
+          "end": "(?\u003c=\\})|$",
           "patterns": [
             {
-              "match": "(?<!\\S)xsd_all(?!\\S)",
-              "name": "keyword.other.xsd-all.thrift"
+              "name": "keyword.other.xsd-all.thrift",
+              "match": "(?\u003c!\\S)xsd_all(?!\\S)"
             },
             {
               "begin": "\\{",
+              "end": "\\}",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#field"
+                }
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.struct.begin.thrift"
                 }
               },
-              "end": "\\}",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.struct.end.thrift"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "#comments"
-                },
-                {
-                  "include": "#field"
-                }
-              ]
+              }
             }
-          ]
-        },
-        {
-          "begin": "(?<!\\S)(exception)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)\\s*(?![^\\s{]))?",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.exception.thrift"
+              "name": "keyword.other.struct.thrift"
             },
             "2": {
-              "name": "entity.name.type.exception.thrift"
+              "name": "entity.name.type.struct.thrift"
             }
-          },
-          "end": "(?<=\\})|$",
+          }
+        },
+        {
           "name": "meta.exception.thrift",
+          "begin": "(?\u003c!\\S)(exception)(?!\\S)(?:\\s+([a-zA-Z_][\\w.]*)\\s*(?![^\\s{]))?",
+          "end": "(?\u003c=\\})|$",
           "patterns": [
             {
               "begin": "\\{",
+              "end": "\\}",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#field"
+                }
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.exception.begin.thrift"
                 }
               },
-              "end": "\\}",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.exception.end.thrift"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "#comments"
-                },
-                {
-                  "include": "#field"
-                }
-              ]
+              }
             }
-          ]
-        },
-        {
-          "begin": "(?<!\\S)(service)(?!\\S)(?:\\s+([a-zA-z_][\\w.]*)(?:\\s+(extends)(?:\\s+([a-zA-Z_][\\w.]*))?)?\\s*(?![^\\s{]))?",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.service.thrift"
+              "name": "keyword.other.exception.thrift"
             },
             "2": {
-              "name": "entity.name.type.service.thrift"
-            },
-            "3": {
-              "name": "keyword.other.service.extends.thrift"
-            },
-            "4": {
-              "name": "entity.other.inherited-class.thrift"
+              "name": "entity.name.type.exception.thrift"
             }
-          },
-          "end": "(?<=\\})|$",
+          }
+        },
+        {
           "name": "meta.service.thrift",
+          "begin": "(?\u003c!\\S)(service)(?!\\S)(?:\\s+([a-zA-z_][\\w.]*)(?:\\s+(extends)(?:\\s+([a-zA-Z_][\\w.]*))?)?\\s*(?![^\\s{]))?",
+          "end": "(?\u003c=\\})|$",
           "patterns": [
             {
               "begin": "\\{",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.service.begin.thrift"
-                }
-              },
               "end": "\\}",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.service.end.thrift"
-                }
-              },
               "patterns": [
                 {
                   "include": "#comments"
                 },
                 {
-                  "begin": "(?x)(?<!\\S)\n\t\t\t\t\t\t\t\t\t\t\t(async(?!\\S))?\\s*\n\t\t\t\t\t\t\t\t\t\t\t(?<ft>\n\t\t\t\t\t\t\t\t\t\t\t\tmap\\s*<\\s*\\g<ft>\\s*,\\s*\\g<ft>\\s*> |\n\t\t\t\t\t\t\t\t\t\t\t\tset\\s*<\\s*\\g<ft>\\s*> |\n\t\t\t\t\t\t\t\t\t\t\t\tlist\\s*<\\s*\\g<ft>\\s*>\\s*(cpp_type(?!\\S))? |\n\t\t\t\t\t\t\t\t\t\t\t\t(?!async\\b)[a-zA-Z_][\\w.]*\n\t\t\t\t\t\t\t\t\t\t\t)\\s*\n\t\t\t\t\t\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t\t\t\t\t\t(?<!\\S)([a-zA-Z_][\\w.]*)\\s*(?![^\\s(])\n\t\t\t\t\t\t\t\t\t\t\t)?",
-                  "beginCaptures": {
-                    "1": {
-                      "name": "keyword.other.async.thrift"
-                    },
-                    "2": {
-                      "name": "storage.type.function.thrift"
-                    },
-                    "3": {
-                      "name": "keyword.other.cpp_type.thrift"
-                    },
-                    "4": {
-                      "name": "entity.name.function.thrift"
-                    }
-                  },
-                  "end": "$|^",
                   "name": "meta.service.function.thrift",
+                  "begin": "(?x)(?\u003c!\\S)\n\t\t\t\t\t\t\t\t\t\t\t(async(?!\\S))?\\s*\n\t\t\t\t\t\t\t\t\t\t\t(?\u003cft\u003e\n\t\t\t\t\t\t\t\t\t\t\t\tmap\\s*\u003c\\s*\\g\u003cft\u003e\\s*,\\s*\\g\u003cft\u003e\\s*\u003e |\n\t\t\t\t\t\t\t\t\t\t\t\tset\\s*\u003c\\s*\\g\u003cft\u003e\\s*\u003e |\n\t\t\t\t\t\t\t\t\t\t\t\tlist\\s*\u003c\\s*\\g\u003cft\u003e\\s*\u003e\\s*(cpp_type(?!\\S))? |\n\t\t\t\t\t\t\t\t\t\t\t\t(?!async\\b)[a-zA-Z_][\\w.]*\n\t\t\t\t\t\t\t\t\t\t\t)\\s*\n\t\t\t\t\t\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t\t\t\t\t\t(?\u003c!\\S)([a-zA-Z_][\\w.]*)\\s*(?![^\\s(])\n\t\t\t\t\t\t\t\t\t\t\t)?",
+                  "end": "$|^",
                   "patterns": [
                     {
                       "begin": "\\(",
-                      "beginCaptures": {
-                        "0": {
-                          "name": "punctuation.definition.arguments.begin.thrift"
-                        }
-                      },
                       "end": "\\)",
-                      "endCaptures": {
-                        "0": {
-                          "name": "punctuation.definition.arguments.end.thrift"
-                        }
-                      },
                       "patterns": [
                         {
                           "include": "#comments"
@@ -424,49 +372,97 @@
                         {
                           "include": "#field"
                         }
-                      ]
-                    },
-                    {
-                      "begin": "(?<![^\\s)])(throws)(?![^\\s(])",
+                      ],
                       "beginCaptures": {
-                        "1": {
-                          "name": "keyword.other.service.function.throws.thrift"
+                        "0": {
+                          "name": "punctuation.definition.arguments.begin.thrift"
                         }
                       },
+                      "endCaptures": {
+                        "0": {
+                          "name": "punctuation.definition.arguments.end.thrift"
+                        }
+                      }
+                    },
+                    {
+                      "begin": "(?\u003c![^\\s)])(throws)(?![^\\s(])",
                       "end": "$",
                       "patterns": [
                         {
                           "begin": "\\(",
+                          "end": "\\)",
+                          "patterns": [
+                            {
+                              "include": "#comments"
+                            },
+                            {
+                              "include": "#field"
+                            }
+                          ],
                           "beginCaptures": {
                             "0": {
                               "name": "punctuation.definition.arguments.begin.thrift"
                             }
                           },
-                          "end": "\\)",
                           "endCaptures": {
                             "0": {
                               "name": "punctuation.definition.arguments.end.thrift"
                             }
-                          },
-                          "patterns": [
-                            {
-                              "include": "#comments"
-                            },
-                            {
-                              "include": "#field"
-                            }
-                          ]
+                          }
+                        }
+                      ],
+                      "beginCaptures": {
+                        "1": {
+                          "name": "keyword.other.service.function.throws.thrift"
                         }
-                      ]
+                      }
                     },
                     {
                       "include": "#comments"
                     }
-                  ]
+                  ],
+                  "beginCaptures": {
+                    "1": {
+                      "name": "keyword.other.async.thrift"
+                    },
+                    "2": {
+                      "name": "storage.type.function.thrift"
+                    },
+                    "3": {
+                      "name": "keyword.other.cpp_type.thrift"
+                    },
+                    "4": {
+                      "name": "entity.name.function.thrift"
+                    }
+                  }
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.service.begin.thrift"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.section.service.end.thrift"
+                }
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.service.thrift"
+            },
+            "2": {
+              "name": "entity.name.type.service.thrift"
+            },
+            "3": {
+              "name": "keyword.other.service.extends.thrift"
+            },
+            "4": {
+              "name": "entity.other.inherited-class.thrift"
+            }
+          }
         }
       ]
     }
@@ -476,109 +472,85 @@
       "patterns": [
         {
           "begin": "(^[ \\t]+)?(?=#)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.thrift"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.number-sign.thrift",
               "begin": "#",
+              "end": "\\n",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.thrift"
                 }
-              },
-              "end": "\\n",
-              "name": "comment.line.number-sign.thrift"
+              }
             }
-          ]
-        },
-        {
-          "begin": "(^[ \\t]+)?(?=//)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.whitespace.comment.leading.thrift"
             }
-          },
+          }
+        },
+        {
+          "begin": "(^[ \\t]+)?(?=//)",
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.double-slash.thrift",
               "begin": "//",
+              "end": "\\n",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.thrift"
                 }
-              },
-              "end": "\\n",
-              "name": "comment.line.double-slash.thrift"
+              }
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.thrift"
             }
-          ]
+          }
         },
         {
+          "name": "comment.block.documentation.thrift",
           "begin": "/\\*\\*",
+          "end": "\\*/",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.thrift"
             }
           },
-          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.thrift"
             }
-          },
-          "name": "comment.block.documentation.thrift"
+          }
         },
         {
+          "name": "comment.block.thrift",
           "begin": "/\\*",
+          "end": "\\*/",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.thrift"
             }
           },
-          "end": "\\*/",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.thrift"
             }
-          },
-          "name": "comment.block.thrift"
+          }
         }
       ]
     },
     "field": {
-      "begin": "(?x)\n\t\t\t\t\t\t(?<![^\\s{(])(?=\\S)\n\t\t\t\t\t\t(\\d+\\s*:)?[ \\t]*\n\t\t\t\t\t\t(?:\t(required|optional)(?!\\S)[ \\t]*\n\t\t\t\t\t\t|\t(?=\\S)(?!=required|optional|\\d)\n\t\t\t\t\t\t)",
-      "beginCaptures": {
-        "1": {
-          "name": "entity.other.field-id.thrift"
-        },
-        "2": {
-          "name": "keyword.other.requiredness.thrift"
-        }
-      },
-      "end": "[,;]|(?=[)#]|//|/\\*)|$",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.separator.fields.thrift"
-        }
-      },
       "name": "meta.field.thrift",
+      "begin": "(?x)\n\t\t\t\t\t\t(?\u003c![^\\s{(])(?=\\S)\n\t\t\t\t\t\t(\\d+\\s*:)?[ \\t]*\n\t\t\t\t\t\t(?:\t(required|optional)(?!\\S)[ \\t]*\n\t\t\t\t\t\t|\t(?=\\S)(?!=required|optional|\\d)\n\t\t\t\t\t\t)",
+      "end": "[,;]|(?=[)#]|//|/\\*)|$",
       "patterns": [
         {
-          "begin": "(?x)\n\t\t\t\t\t\t\t(?<ft>\n\t\t\t\t\t\t\t\tmap\\s*<\\s*\\g<ft>\\s*,\\s*\\g<ft>\\s*> |\n\t\t\t\t\t\t\t\tset\\s*<\\s*\\g<ft>\\s*> |\n\t\t\t\t\t\t\t\tlist\\s*<\\s*\\g<ft>\\s*>\\s*(cpp_type(?!\\S))? |\n\t\t\t\t\t\t\t\t[a-zA-Z_][\\w.]*\n\t\t\t\t\t\t\t)[ \\t]*\n\t\t\t\t\t\t\t(?:([a-zA-Z_][\\w.]*)[ \\t]*)? # identifier\n\t\t\t\t\t\t\t",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.field.thrift"
-            },
-            "2": {
-              "name": "keyword.other.cpp-type.thrift"
-            },
-            "3": {
-              "name": "variable.other.field-name.thrift"
-            }
-          },
+          "begin": "(?x)\n\t\t\t\t\t\t\t(?\u003cft\u003e\n\t\t\t\t\t\t\t\tmap\\s*\u003c\\s*\\g\u003cft\u003e\\s*,\\s*\\g\u003cft\u003e\\s*\u003e |\n\t\t\t\t\t\t\t\tset\\s*\u003c\\s*\\g\u003cft\u003e\\s*\u003e |\n\t\t\t\t\t\t\t\tlist\\s*\u003c\\s*\\g\u003cft\u003e\\s*\u003e\\s*(cpp_type(?!\\S))? |\n\t\t\t\t\t\t\t\t[a-zA-Z_][\\w.]*\n\t\t\t\t\t\t\t)[ \\t]*\n\t\t\t\t\t\t\t(?:([a-zA-Z_][\\w.]*)[ \\t]*)? # identifier\n\t\t\t\t\t\t\t",
           "end": "(?=[,;]|[)#]|//|/\\*)|$",
           "patterns": [
             {
@@ -586,119 +558,141 @@
               "end": "(?=[,;]|[)#]|//|/\\*)|$",
               "patterns": [
                 {
-                  "match": "(?<!\\S)(xsd_optional)\\b",
-                  "name": "keyword.other.xsd_optional.thrift"
+                  "name": "keyword.other.xsd_optional.thrift",
+                  "match": "(?\u003c!\\S)(xsd_optional)\\b"
                 },
                 {
-                  "match": "(?<!\\S)(xsd_nillable)\\b",
-                  "name": "keyword.other.xsd_nillable.thrift"
+                  "name": "keyword.other.xsd_nillable.thrift",
+                  "match": "(?\u003c!\\S)(xsd_nillable)\\b"
                 },
                 {
                   "include": "#value"
                 }
               ]
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.field.thrift"
+            },
+            "2": {
+              "name": "keyword.other.cpp-type.thrift"
+            },
+            "3": {
+              "name": "variable.other.field-name.thrift"
+            }
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "entity.other.field-id.thrift"
+        },
+        "2": {
+          "name": "keyword.other.requiredness.thrift"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.separator.fields.thrift"
+        }
+      }
     },
     "value": {
       "patterns": [
         {
-          "match": "[+-]?\\d*\\.\\d+([eE][+-]?\\d+)?",
-          "name": "constant.numeric.float.thrift"
+          "name": "constant.numeric.float.thrift",
+          "match": "[+-]?\\d*\\.\\d+([eE][+-]?\\d+)?"
         },
         {
-          "match": "[+-]?\\d+",
-          "name": "constant.numeric.integer.thrift"
+          "name": "constant.numeric.integer.thrift",
+          "match": "[+-]?\\d+"
         },
         {
-          "match": "[a-zA-Z_][\\w.]*",
-          "name": "constant.other.const-data.thrift"
+          "name": "constant.other.const-data.thrift",
+          "match": "[a-zA-Z_][\\w.]*"
         },
         {
+          "name": "string.quoted.single.thrift",
           "begin": "'",
+          "end": "'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.thrift"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.thrift"
             }
-          },
-          "name": "string.quoted.single.thrift"
+          }
         },
         {
+          "name": "string.quoted.double.thrift",
           "begin": "\"",
+          "end": "\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.thrift"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.thrift"
             }
-          },
-          "name": "string.quoted.double.thrift"
+          }
         },
         {
+          "name": "meta.array.thrift",
           "begin": "\\[",
+          "end": "\\]",
+          "patterns": [
+            {
+              "match": "[,;]"
+            },
+            {
+              "include": "#value"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.array.begin.thrift"
             }
           },
-          "end": "\\]",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.array.end.thrift"
             }
-          },
-          "name": "meta.array.thrift",
+          }
+        },
+        {
+          "name": "meta.map.thrift",
+          "begin": "\\{",
+          "end": "\\}",
           "patterns": [
             {
-              "match": "[,;]"
+              "match": "[:,;]"
             },
             {
               "include": "#value"
             }
-          ]
-        },
-        {
-          "begin": "\\{",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.map.begin.thrift"
             }
           },
-          "end": "\\}",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.map.end.thrift"
             }
-          },
-          "name": "meta.map.thrift",
-          "patterns": [
-            {
-              "match": "[:,;]"
-            },
-            {
-              "include": "#value"
-            }
-          ]
+          }
         },
         {
-          "match": "\\S",
-          "name": "invalid.illegal.thrift"
+          "name": "invalid.illegal.thrift",
+          "match": "\\S"
         }
       ]
     }
-  },
-  "scopeName": "source.thrift",
-  "uuid": "9E5704AC-54ED-4D7C-946C-6DC3727BDC4C"
-}
+  }
+}