github-linguist 5.3.3 → 6.0.0

data/grammars/source.ooc.json

@@ -1,11 +1,6 @@
 {
-  "fileTypes": [
-    "ooc"
-  ],
-  "foldingStartMarker": "/\\*\\*|\\{\\s*$",
-  "foldingStopMarker": "\\*\\*/|^\\s*\\}",
-  "keyEquivalent": "^~O",
   "name": "ooc",
+  "scopeName": "source.ooc",
   "patterns": [
     {
       "include": "#comments"
@@ -46,9 +41,9 @@
   ],
   "repository": {
     "block": {
+      "name": "meta.block.ooc",
       "begin": "\\{",
       "end": "}",
-      "name": "meta.block.ooc",
       "patterns": [
         {
           "include": "#comments"
@@ -77,6 +72,8 @@
       ]
     },
     "class_decl": {
+      "name": "meta.class.ooc",
+      "match": "(?mx)\n            ([_A-Z]\\w* \\s*) : \\s* (abstract\\s+)? (class)\n            (?:\n                \\s*\u003c\\s*([^\u003c]+)\\s*\u003e\\s*\n            )?\n\t\t   (?:\n                \\s* (extends)\n            )?\n            ",
       "captures": {
         "1": {
           "name": "entity.name.type.class.ooc"
@@ -96,63 +93,63 @@
         "6": {
           "name": "entity.other.inherited-class.ooc"
         }
-      },
-      "match": "(?mx)\n            ([_A-Z]\\w* \\s*) : \\s* (abstract\\s+)? (class)\n            (?:\n                \\s*<\\s*([^<]+)\\s*>\\s*\n            )?\n\t\t   (?:\n                \\s* (extends)\n            )?\n            ",
-      "name": "meta.class.ooc"
+      }
     },
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.ooc",
+          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
           "captures": {
             "1": {
               "name": "meta.toc-list.banner.block.ooc"
             }
-          },
-          "match": "^/\\* =(\\s*.*?)\\s*= \\*/$\\n?",
-          "name": "comment.block.ooc"
+          }
         },
         {
+          "name": "comment.block.ooc",
           "begin": "/\\*",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.ooc"
             }
-          },
-          "end": "\\*/",
-          "name": "comment.block.ooc"
+          }
         },
         {
-          "match": "\\*/.*\\n",
-          "name": "invalid.illegal.stray-comment-end.ooc"
+          "name": "invalid.illegal.stray-comment-end.ooc",
+          "match": "\\*/.*\\n"
         },
         {
+          "name": "comment.line.banner.ooc",
+          "match": "^// =(\\s*.*?)\\s*=\\s*$\\n?",
           "captures": {
             "1": {
               "name": "meta.toc-list.banner.line.ooc"
             }
-          },
-          "match": "^// =(\\s*.*?)\\s*=\\s*$\\n?",
-          "name": "comment.line.banner.ooc"
+          }
         },
         {
+          "name": "comment.line.double-slash.ooc",
           "begin": "//",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.ooc"
-            }
-          },
           "end": "$\\n?",
-          "name": "comment.line.double-slash.ooc",
           "patterns": [
             {
-              "match": "(?>\\\\\\s*\\n)",
-              "name": "punctuation.separator.continuation.ooc"
+              "name": "punctuation.separator.continuation.ooc",
+              "match": "(?\u003e\\\\\\s*\\n)"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.ooc"
             }
-          ]
+          }
         }
       ]
     },
     "cover_decl": {
+      "name": "meta.definition.cover.ooc",
+      "match": "(?mx)\n            ([_A-Z]\\w* \\s*) : \\s* (cover)\n            (?:\n            (?:\n                \\s+(from)\\s+(?:([\\s\\w\\d_\\*]+?)\\s*(?= \\s extends | [/{;] | $) )\n            )\n            |\n            (?:\n                \\s+(extends)\\s+([_A-Z]\\w*)\\s*\n            )\n            )*\n            ",
       "captures": {
         "1": {
           "name": "entity.name.type.cover.ooc"
@@ -172,26 +169,16 @@
         "6": {
           "name": "entity.other.inherited-class.supertype.ooc"
         }
-      },
-      "match": "(?mx)\n            ([_A-Z]\\w* \\s*) : \\s* (cover)\n            (?:\n            (?:\n                \\s+(from)\\s+(?:([\\s\\w\\d_\\*]+?)\\s*(?= \\s extends | [/{;] | $) )\n            )\n            |\n            (?:\n                \\s+(extends)\\s+([_A-Z]\\w*)\\s*\n            )\n            )*\n            ",
-      "name": "meta.definition.cover.ooc"
+      }
     },
     "escaped_char": {
-      "match": "\\\\.",
-      "name": "constant.character.escape.ooc"
+      "name": "constant.character.escape.ooc",
+      "match": "\\\\."
     },
     "function_call": {
+      "name": "meta.function.call.ooc",
       "begin": "(?:((?:\\.[a-z_]\\w*)|(?:[a-z_]\\w*)(?:~[a-z_]\\w*)?))\\(",
-      "beginCaptures": {
-        "1": {
-          "name": "support.function.any-method.ooc"
-        },
-        "2": {
-          "name": "support.function.any-method.ooc"
-        }
-      },
       "end": "\\)",
-      "name": "meta.function.call.ooc",
       "patterns": [
         {
           "include": "#comments"
@@ -211,18 +198,38 @@
         {
           "include": "#member_access"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "support.function.any-method.ooc"
+        },
+        "2": {
+          "name": "support.function.any-method.ooc"
+        }
+      }
     },
     "function_decl": {
       "patterns": [
         {
-          "begin": "(?mx)\n            \t        (operator\\s+(?:(?:[+\\-/\\*=!<>]|\\[\\])=?|\\[\\]|[<>=]|=|as))\n        \t            [\\s\\w~]*?\n        \t            \\(",
+          "name": "meta.function.operator.ooc",
+          "begin": "(?mx)\n            \t        (operator\\s+(?:(?:[+\\-/\\*=!\u003c\u003e]|\\[\\])=?|\\[\\]|[\u003c\u003e=]|=|as))\n        \t            [\\s\\w~]*?\n        \t            \\(",
+          "end": "(?mx)\\)\n\n        \t\t\t(?:\\s*(-\u003e) \\s*\n        \t\t    (?:\n\t\t\t\t\t\t(?:(This) |\n        \t\t        ([A-Z_]\\w*))\n        \t\t        ([@*]*)\n        \t\t    ))?",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#keywords"
+            },
+            {
+              "include": "#parameters"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.ooc"
             }
           },
-          "end": "(?mx)\\)\n\n        \t\t\t(?:\\s*(->) \\s*\n        \t\t    (?:\n\t\t\t\t\t\t(?:(This) |\n        \t\t        ([A-Z_]\\w*))\n        \t\t        ([@*]*)\n        \t\t    ))?",
           "endCaptures": {
             "1": {
               "name": "keyword.other.return-type.ooc"
@@ -236,8 +243,12 @@
             "4": {
               "name": "storage.modifier.pointer-arith.ooc"
             }
-          },
-          "name": "meta.function.operator.ooc",
+          }
+        },
+        {
+          "name": "meta.function.params.ooc",
+          "begin": "(?mx)\n        \t\t        ([_a-z]\\w*) \\s* : \\s*\n        \t\t            ((?:(?:static|proto|inline|final|abstract)\\s+)*)\n        \t\t            (?:(extern|unmangled)(?:\\s*\\(([^\\)]+)\\))?\\s+\n        \t\t                ((?:(?:static|proto|inline|final|abstract)\\s+)*)\n        \t\t            )?\n        \t\t            \n        \t\t            (func)\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t(?:\\s*@)?\n\t\t\t\t\t\t\t\n        \t\t            (?:\\s*(~[A-Za-z_]\\w*))?\n                        \n                            (?:\n                                \\s*\u003c\\s*([^\u003c]+)\\s*\u003e\n                            )?\n                            \n        \t\t            \\s* \\(",
+          "end": "(?mx)\\)\n\t\t\t\t\t(?:\\s*(-\u003e) \\s*\n        \t\t    (?:\n\t\t\t\t\t\t(?:(This) | \n        \t\t        ([A-Z_]\\w*))\n        \t\t        ([@*]*)\n        \t\t    ))?",
           "patterns": [
             {
               "include": "#comments"
@@ -248,10 +259,7 @@
             {
               "include": "#parameters"
             }
-          ]
-        },
-        {
-          "begin": "(?mx)\n        \t\t        ([_a-z]\\w*) \\s* : \\s*\n        \t\t            ((?:(?:static|proto|inline|final|abstract)\\s+)*)\n        \t\t            (?:(extern|unmangled)(?:\\s*\\(([^\\)]+)\\))?\\s+\n        \t\t                ((?:(?:static|proto|inline|final|abstract)\\s+)*)\n        \t\t            )?\n        \t\t            \n        \t\t            (func)\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t(?:\\s*@)?\n\t\t\t\t\t\t\t\n        \t\t            (?:\\s*(~[A-Za-z_]\\w*))?\n                        \n                            (?:\n                                \\s*<\\s*([^<]+)\\s*>\n                            )?\n                            \n        \t\t            \\s* \\(",
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.ooc"
@@ -287,7 +295,6 @@
               "name": "keyword.other.return-type.ooc"
             }
           },
-          "end": "(?mx)\\)\n\t\t\t\t\t(?:\\s*(->) \\s*\n        \t\t    (?:\n\t\t\t\t\t\t(?:(This) | \n        \t\t        ([A-Z_]\\w*))\n        \t\t        ([@*]*)\n        \t\t    ))?",
           "endCaptures": {
             "1": {
               "name": "keyword.other.ooc"
@@ -301,21 +308,11 @@
             "4": {
               "name": "storage.modifier.pointer-arith.ooc"
             }
-          },
-          "name": "meta.function.params.ooc",
-          "patterns": [
-            {
-              "include": "#comments"
-            },
-            {
-              "include": "#keywords"
-            },
-            {
-              "include": "#parameters"
-            }
-          ]
+          }
         },
         {
+          "name": "meta.function.noparams.ooc",
+          "match": "(?mx)\n        \t\t        ([_a-z]\\w*) \\s* : \\s*\n        \t\t            \n        \t\t            ((?:(?:static|proto|inline|final|abstract)\\s+)*)\n        \t\t            (?:(extern|unmangled)(?:\\s*\\(([^\\)]+)\\))?\\s+\n        \t\t                ((?:(?:static|proto|inline|final|abstract)\\s+)*)\n        \t\t            )?\n        \t\t            \n        \t\t            (func)\n\n        \t\t            (?:\\s*(~[A-Za-z_]\\w*))?\n                        \n                            (?:\n                                \\s*\u003c\\s*([^\u003c]+)\\s*\u003e\n                            )?\n                            \n                            (?:\\s*(-\u003e) \\s*\n                \t\t    (?:\n\t\t\t\t\t\t\t\t(?:(This) |\n                \t\t        ([A-Z_]\\w*))\n                \t\t        ([@*]*)\n                \t\t    ))?\n        \t\t            ",
           "captures": {
             "1": {
               "name": "entity.name.function.ooc"
@@ -353,16 +350,14 @@
             "9": {
               "name": "keyword.other.return-type.ooc"
             }
-          },
-          "match": "(?mx)\n        \t\t        ([_a-z]\\w*) \\s* : \\s*\n        \t\t            \n        \t\t            ((?:(?:static|proto|inline|final|abstract)\\s+)*)\n        \t\t            (?:(extern|unmangled)(?:\\s*\\(([^\\)]+)\\))?\\s+\n        \t\t                ((?:(?:static|proto|inline|final|abstract)\\s+)*)\n        \t\t            )?\n        \t\t            \n        \t\t            (func)\n\n        \t\t            (?:\\s*(~[A-Za-z_]\\w*))?\n                        \n                            (?:\n                                \\s*<\\s*([^<]+)\\s*>\n                            )?\n                            \n                            (?:\\s*(->) \\s*\n                \t\t    (?:\n\t\t\t\t\t\t\t\t(?:(This) |\n                \t\t        ([A-Z_]\\w*))\n                \t\t        ([@*]*)\n                \t\t    ))?\n        \t\t            ",
-          "name": "meta.function.noparams.ooc"
+          }
         }
       ]
     },
     "imports": {
+      "name": "keyword.control.import.ooc",
       "begin": "\\b(?:use|include|import)\\b",
       "end": ";|$",
-      "name": "keyword.control.import.ooc",
       "patterns": [
         {
           "include": "#comments"
@@ -370,6 +365,8 @@
       ]
     },
     "interface_decl": {
+      "name": "meta.interface.ooc",
+      "match": "(?mx)\n            ([_A-Z]\\w* \\s*) : \\s* (interface)\n            (?:\n                \\s*\u003c\\s*([^\u003c]+)\\s*\u003e\\s*\n            )?\n            ",
       "captures": {
         "1": {
           "name": "entity.name.type.class.ooc"
@@ -389,21 +386,21 @@
         "6": {
           "name": "entity.other.inherited-class.ooc"
         }
-      },
-      "match": "(?mx)\n            ([_A-Z]\\w* \\s*) : \\s* (interface)\n            (?:\n                \\s*<\\s*([^<]+)\\s*>\\s*\n            )?\n            ",
-      "name": "meta.interface.ooc"
+      }
     },
     "keywords": {
       "patterns": [
         {
-          "match": "\\b(?:if|else|while|do|for|in|switch|match|case|return|break|continue|default)\\b",
-          "name": "keyword.control.ooc"
+          "name": "keyword.control.ooc",
+          "match": "\\b(?:if|else|while|do|for|in|switch|match|case|return|break|continue|default)\\b"
         },
         {
-          "match": "\\bthis\\b",
-          "name": "variable.language.this.ooc"
+          "name": "variable.language.this.ooc",
+          "match": "\\bthis\\b"
         },
         {
+          "name": "meta.type.class.this.ooc",
+          "match": "\\b(This)([@\u0026*]*|\\b)",
           "captures": {
             "1": {
               "name": "storage.type.class.this.ooc"
@@ -411,46 +408,46 @@
             "2": {
               "name": "storage.modifier.pointer-arith.ooc"
             }
-          },
-          "match": "\\b(This)([@&*]*|\\b)",
-          "name": "meta.type.class.this.ooc"
+          }
         },
         {
-          "match": "(?:&&|\\|\\||\\#|!)",
-          "name": "keyword.operator.logical.ooc"
+          "name": "keyword.operator.logical.ooc",
+          "match": "(?:\u0026\u0026|\\|\\||\\#|!)"
         },
         {
           "include": "#return_type"
         },
         {
-          "match": "(?:[<>!=]=|=>|[><])",
-          "name": "keyword.operator.comparison.ooc"
+          "name": "keyword.operator.comparison.ooc",
+          "match": "(?:[\u003c\u003e!=]=|=\u003e|[\u003e\u003c])"
         },
         {
-          "match": "(?:[\\*+\\-/|&:]|<{2,3}|>{2,3})?=",
-          "name": "keyword.operator.assignment.ooc"
+          "name": "keyword.operator.assignment.ooc",
+          "match": "(?:[\\*+\\-/|\u0026:]|\u003c{2,3}|\u003e{2,3})?="
         },
         {
-          "match": "(?:[\\*\\-\\+/|&]|<{2,3}|>{2,3})",
-          "name": "keyword.operator.arithmetic.ooc"
+          "name": "keyword.operator.arithmetic.ooc",
+          "match": "(?:[\\*\\-\\+/|\u0026]|\u003c{2,3}|\u003e{2,3})"
         },
         {
-          "match": "\\b(?:true|false)\\b",
-          "name": "constant.language.boolean.ooc"
+          "name": "constant.language.boolean.ooc",
+          "match": "\\b(?:true|false)\\b"
         },
         {
-          "match": "\\bnull\\b",
-          "name": "constant.language.null.ooc"
+          "name": "constant.language.null.ooc",
+          "match": "\\bnull\\b"
         },
         {
-          "match": "\\bconst\\b",
-          "name": "keyword.other.directive.const.ooc"
+          "name": "keyword.other.directive.const.ooc",
+          "match": "\\bconst\\b"
         },
         {
-          "match": "\\bstatic\\b",
-          "name": "keyword.other.directive.static.ooc"
+          "name": "keyword.other.directive.static.ooc",
+          "match": "\\bstatic\\b"
         },
         {
+          "name": "meta.operator.as.ooc",
+          "match": "\\b(as)\\s*([A-Z_]\\w*)([@\u0026]*)",
           "captures": {
             "1": {
               "name": "keyword.operator.logical.as.ooc"
@@ -461,19 +458,12 @@
             "3": {
               "name": "storage.modifier.pointer-arith.ooc"
             }
-          },
-          "match": "\\b(as)\\s*([A-Z_]\\w*)([@&]*)",
-          "name": "meta.operator.as.ooc"
+          }
         },
         {
+          "name": "meta.function.pointer.ooc",
           "begin": "\\b(Func)\\s*\\(",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.function.pointer.ooc"
-            }
-          },
           "end": "\\)",
-          "name": "meta.function.pointer.ooc",
           "patterns": [
             {
               "include": "#keywords"
@@ -481,16 +471,21 @@
             {
               "include": "#parameters"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.function.pointer.ooc"
+            }
+          }
         },
         {
+          "name": "meta.function.pointer.ooc",
+          "match": "(?mx)\\bFunc\\b",
           "captures": {
             "1": {
               "name": "storage.type.function.pointer.ooc"
             }
-          },
-          "match": "(?mx)\\bFunc\\b",
-          "name": "meta.function.pointer.ooc"
+          }
         }
       ]
     },
@@ -508,13 +503,13 @@
       ]
     },
     "member_access": {
-      "match": "([a-zA-Z_]\\w*)\\s+(?=[a-zA-Z_])",
-      "name": "variable.other.accessed.ooc"
+      "name": "variable.other.accessed.ooc",
+      "match": "([a-zA-Z_]\\w*)\\s+(?=[a-zA-Z_])"
     },
     "ooc_char": {
+      "name": "string.quoted.single.ooc",
       "begin": "'",
       "end": "'",
-      "name": "string.quoted.single.ooc",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -524,31 +519,31 @@
     "ooc_numbers": {
       "patterns": [
         {
-          "match": "(0c[0-7]+)",
-          "name": "constant.numeric.integer.octal.ooc"
+          "name": "constant.numeric.integer.octal.ooc",
+          "match": "(0c[0-7]+)"
         },
         {
-          "match": "(0x[0-9a-fA-F]+)",
-          "name": "constant.numeric.integer.hexadecimal.ooc"
+          "name": "constant.numeric.integer.hexadecimal.ooc",
+          "match": "(0x[0-9a-fA-F]+)"
         },
         {
-          "match": "(0b[01]+)",
-          "name": "constant.numeric.integer.binary.ooc"
+          "name": "constant.numeric.integer.binary.ooc",
+          "match": "(0b[01]+)"
         },
         {
-          "match": "(?x) (?<! 0[bcx] ) (\n                            (?: (?:[0-9]*)\\.(?:[0-9]+) | (?:[0-9]+)\\.(?:[0-9]*) )\n                            (?: [eE][+\\-]?\\d+)?\n                        )",
-          "name": "constant.numeric.float.ooc"
+          "name": "constant.numeric.float.ooc",
+          "match": "(?x) (?\u003c! 0[bcx] ) (\n                            (?: (?:[0-9]*)\\.(?:[0-9]+) | (?:[0-9]+)\\.(?:[0-9]*) )\n                            (?: [eE][+\\-]?\\d+)?\n                        )"
         },
         {
-          "match": "(?x)\\b([0-9]+)(?: [eE][+\\-]?\\d+)?",
-          "name": "constant.numeric.integer.ooc"
+          "name": "constant.numeric.integer.ooc",
+          "match": "(?x)\\b([0-9]+)(?: [eE][+\\-]?\\d+)?"
         }
       ]
     },
     "ooc_string": {
+      "name": "string.quoted.double.ooc",
       "begin": "\"",
       "end": "\"",
-      "name": "string.quoted.double.ooc",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -564,6 +559,8 @@
           "include": "#keywords"
         },
         {
+          "name": "meta.function.nameless-typed.ooc",
+          "match": "([_A-Z]\\w*)([\u0026@*]*)",
           "captures": {
             "1": {
               "name": "storage.type.ooc"
@@ -571,11 +568,11 @@
             "2": {
               "name": "storage.modifier.pointer-arith.ooc"
             }
-          },
-          "match": "([_A-Z]\\w*)([&@*]*)",
-          "name": "meta.function.nameless-typed.ooc"
+          }
         },
         {
+          "name": "meta.function.parameter.type.ooc",
+          "match": ":\\s*([A-Z_]\\w*([@\u0026*]*))",
           "captures": {
             "1": {
               "name": "storage.type.ooc"
@@ -583,11 +580,11 @@
             "2": {
               "name": "storage.modifier.pointer-arith.ooc"
             }
-          },
-          "match": ":\\s*([A-Z_]\\w*([@&*]*))",
-          "name": "meta.function.parameter.type.ooc"
+          }
         },
         {
+          "name": "meta.function.parameter.name.ooc",
+          "match": "([=.])?([a-zA-Z_]\\w*)",
           "captures": {
             "1": {
               "name": "keyword.operator.assignment.parameter.ooc"
@@ -595,13 +592,13 @@
             "2": {
               "name": "variable.parameter.ooc"
             }
-          },
-          "match": "([=.])?([a-zA-Z_]\\w*)",
-          "name": "meta.function.parameter.name.ooc"
+          }
         }
       ]
     },
     "return_type": {
+      "name": "meta.function.return-type.ooc",
+      "match": "(?mx)\n\t\t    (\\-\\\u003e) \\s*\n\t\t    (?:\n\t\t\t\t(?:(This) |\n\t\t        ([A-Z_]\\w*))\n\t\t        ([@*]*)\n\t\t    )",
       "captures": {
         "1": {
           "name": "keyword.other.return-type.ooc"
@@ -615,18 +612,26 @@
         "4": {
           "name": "storage.modifier.pointer-arith.ooc"
         }
-      },
-      "match": "(?mx)\n\t\t    (\\-\\>) \\s*\n\t\t    (?:\n\t\t\t\t(?:(This) |\n\t\t        ([A-Z_]\\w*))\n\t\t        ([@*]*)\n\t\t    )",
-      "name": "meta.function.return-type.ooc"
+      }
     },
     "var_explicit_decl": {
+      "name": "meta.definition.variable.explicit.ooc",
       "begin": "[_a-zA-Z]\\w*\\s*(?=,|:[^=])",
+      "end": "(?mx)(?:\n\t\t\t(?:\n\t\t\t    :\\s*\n\t\t\t    (?:\n\t\t\t        (?:\n\t\t\t            (?:\n\t\t\t                (static) |\n\t\t\t                (const) |\n\t\t\t                (extern) (?:\\s* \\( \\s* ([^\\)]+) \\s* \\) )?\n\t\t\t            ) \\s+\n\t\t\t        )*\n                )\n\t\t\t    (?: (?: (This) | ([A-Z_]\\w*)) ([@\u0026]*) )\n\t\t\t\t(?: \\s* \\\u003c\\s*([A-Z_]\\w*)\\s*\\\u003e )?\n\t\t\t) | ; | $ )",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "name": "variable.other.ooc",
+          "match": "[_a-zA-Z]\\w*"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "variable.other.ooc"
         }
       },
-      "end": "(?mx)(?:\n\t\t\t(?:\n\t\t\t    :\\s*\n\t\t\t    (?:\n\t\t\t        (?:\n\t\t\t            (?:\n\t\t\t                (static) |\n\t\t\t                (const) |\n\t\t\t                (extern) (?:\\s* \\( \\s* ([^\\)]+) \\s* \\) )?\n\t\t\t            ) \\s+\n\t\t\t        )*\n                )\n\t\t\t    (?: (?: (This) | ([A-Z_]\\w*)) ([@&]*) )\n\t\t\t\t(?: \\s* \\<\\s*([A-Z_]\\w*)\\s*\\> )?\n\t\t\t) | ; | $ )",
       "endCaptures": {
         "1": {
           "name": "keyword.other.ooc"
@@ -652,19 +657,11 @@
         "8": {
           "name": "support.type.generic.ooc"
         }
-      },
-      "name": "meta.definition.variable.explicit.ooc",
-      "patterns": [
-        {
-          "include": "#comments"
-        },
-        {
-          "match": "[_a-zA-Z]\\w*",
-          "name": "variable.other.ooc"
-        }
-      ]
+      }
     },
     "var_inferred_decl": {
+      "name": "meta.definition.variable.inferred.ooc",
+      "match": "(?x)([a-zA-Z_]\\w*)\\s*(?= := )",
       "captures": {
         "1": {
           "name": "variable.other.ooc"
@@ -672,9 +669,7 @@
         "2": {
           "name": "storage.type.ooc"
         }
-      },
-      "match": "(?x)([a-zA-Z_]\\w*)\\s*(?= := )",
-      "name": "meta.definition.variable.inferred.ooc"
+      }
     },
     "variable_decl": {
       "patterns": [
@@ -686,7 +681,5 @@
         }
       ]
     }
-  },
-  "scopeName": "source.ooc",
-  "uuid": "EECF47FE-041D-4F42-B64C-414A1EFD807F"
-}
+  }
+}