github-linguist 5.3.3 → 6.0.0

data/grammars/source.bsv.json

@@ -1,12 +1,10 @@
 {
-  "fileTypes": [
-    "bsv"
-  ],
-  "foldingStartMarker": "(begin)\\s*(//.*)?$",
-  "foldingStopMarker": "^\\s*(end)$",
   "name": "BSV",
+  "scopeName": "source.bsv",
   "patterns": [
     {
+      "name": "meta.entity.package.bsv",
+      "match": "^\\s*(import|export|package)\\s+\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
       "captures": {
         "1": {
           "name": "keyword.control.import.bsv"
@@ -14,11 +12,11 @@
         "2": {
           "name": "entity.name.package.bsv"
         }
-      },
-      "match": "^\\s*(import|export|package)\\s+\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
-      "name": "meta.entity.package.bsv"
+      }
     },
     {
+      "name": "meta.definition.defparam.bsv",
+      "match": "^\\s*(defparam)\\s+([a-zA-Z_][a-zA-Z0-9_]*)(.[a-zA-Z_][a-zA-Z0-9_]*)\\s*(=)",
       "captures": {
         "1": {
           "name": "keyword.other.bsv"
@@ -32,43 +30,43 @@
         "4": {
           "name": "keyword.other.bsv"
         }
-      },
-      "match": "^\\s*(defparam)\\s+([a-zA-Z_][a-zA-Z0-9_]*)(.[a-zA-Z_][a-zA-Z0-9_]*)\\s*(=)",
-      "name": "meta.definition.defparam.bsv"
+      }
     },
     {
-      "match": "\\b(automatic|cell|config|deassign|defparam|design|disable|edge|endconfig|endgenerate|endspecify|endtable|endtask|event|generate|genvar|ifnone|incdir|include|liblist|library|localparam|macromodule|negedge|noshowcancelled|posedge|pulsestyle_onevent|pulsestyle_ondetect|real|realtime|scalared|showcancelled|specify|specparam|table|task|time|use|vectored)\\b",
-      "name": "keyword.other.bsv"
+      "name": "keyword.other.bsv",
+      "match": "\\b(automatic|cell|config|deassign|defparam|design|disable|edge|endconfig|endgenerate|endspecify|endtable|endtask|event|generate|genvar|ifnone|incdir|include|liblist|library|localparam|macromodule|negedge|noshowcancelled|posedge|pulsestyle_onevent|pulsestyle_ondetect|real|realtime|scalared|showcancelled|specify|specparam|table|task|time|use|vectored)\\b"
     },
     {
-      "match": "\\b(initial|always|wait|force|release|assign)\\b",
-      "name": "keyword.control.bsv"
+      "name": "keyword.control.bsv",
+      "match": "\\b(initial|always|wait|force|release|assign)\\b"
     },
     {
-      "match": "\\b(begin|end|fork|join)\\b",
-      "name": "keyword.other.bsv"
+      "name": "keyword.other.bsv",
+      "match": "\\b(begin|end|fork|join)\\b"
     },
     {
-      "match": "\\b(matches|action|endaction|actionvalue|endactionvalue|ancestor|deriving|return|match|par|endpar|provisos|dependencies|determines|seq|endseq|schedule|port|clock|reset|no_reset|clocked_by|reset_by|default_clock|default_reset|output_clock|output_reset|input_clock|input_reset|same_family|import|numeric|type)\\b",
-      "name": "keyword.control.bsv"
+      "name": "keyword.control.bsv",
+      "match": "\\b(matches|action|endaction|actionvalue|endactionvalue|ancestor|deriving|return|match|par|endpar|provisos|dependencies|determines|seq|endseq|schedule|port|clock|reset|no_reset|clocked_by|reset_by|default_clock|default_reset|output_clock|output_reset|input_clock|input_reset|same_family|import|numeric|type)\\b"
     },
     {
-      "match": "\\b(TAdd|TSub|TLog|TExp|TMul|TDiv|TMin|TMax)\\b",
-      "name": "keyword.typesystem.math.bsv"
+      "name": "keyword.typesystem.math.bsv",
+      "match": "\\b(TAdd|TSub|TLog|TExp|TMul|TDiv|TMin|TMax)\\b"
     },
     {
-      "match": "\\b(Bits|DefaultValue|Eq|Ord|Bounded|Arith|Literal|Bitwise|BitReduction|BitExtend|FShow|IsModule|Add|Max|Log|Mul|Div)\\b",
-      "name": "keyword.typesystem.typeclass.bsv"
+      "name": "keyword.typesystem.typeclass.bsv",
+      "match": "\\b(Bits|DefaultValue|Eq|Ord|Bounded|Arith|Literal|Bitwise|BitReduction|BitExtend|FShow|IsModule|Add|Max|Log|Mul|Div)\\b"
     },
     {
-      "match": "\\b(forever|repeat|while|for|if|else|case|casex|casez|default|endcase)\\b",
-      "name": "keyword.control.bsv"
+      "name": "keyword.control.bsv",
+      "match": "\\b(forever|repeat|while|for|if|else|case|casex|casez|default|endcase)\\b"
     },
     {
-      "match": "\\b(endpackage)\\b",
-      "name": "keyword.control.import.bsv"
+      "name": "keyword.control.import.bsv",
+      "match": "\\b(endpackage)\\b"
     },
     {
+      "name": "meta.include.bsv",
+      "match": "^\\s*(`include)\\s+([\"\u003c].*[\"\u003e])",
       "captures": {
         "1": {
           "name": "meta.preprocessor.bsv"
@@ -76,11 +74,11 @@
         "2": {
           "name": "entity.name.type.include.bsv"
         }
-      },
-      "match": "^\\s*(`include)\\s+([\"<].*[\">])",
-      "name": "meta.include.bsv"
+      }
     },
     {
+      "name": "meta.preprocessor.ifdef.bsv",
+      "match": "^\\s*(`ifdef|`ifndef|`undef|`define)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\b",
       "captures": {
         "1": {
           "name": "meta.preprocessor.bsv"
@@ -88,25 +86,23 @@
         "2": {
           "name": "constant.other.define.bsv"
         }
-      },
-      "match": "^\\s*(`ifdef|`ifndef|`undef|`define)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\b",
-      "name": "meta.preprocessor.ifdef.bsv"
+      }
     },
     {
-      "match": "`(celldefine|default_nettype|define|else|elsif|endcelldefine|endif|ifdef|ifndef|include|line|nounconnected_drive|resetall|timescale|unconnected_drive|undef)\\b",
-      "name": "meta.preprocessor.bsv"
+      "name": "meta.preprocessor.bsv",
+      "match": "`(celldefine|default_nettype|define|else|elsif|endcelldefine|endif|ifdef|ifndef|include|line|nounconnected_drive|resetall|timescale|unconnected_drive|undef)\\b"
     },
     {
-      "match": "[.][_a-zA-Z0-9]+",
-      "name": "meta.module.parameters.bsv"
+      "name": "meta.module.parameters.bsv",
+      "match": "[.][_a-zA-Z0-9]+"
     },
     {
-      "match": "\\b(True|False)\\b",
-      "name": "constant.language.bsv"
+      "name": "constant.language.bsv",
+      "match": "\\b(True|False)\\b"
     },
     {
-      "match": "`\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
-      "name": "constant.other.define.bsv"
+      "name": "constant.other.define.bsv",
+      "match": "`\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b"
     },
     {
       "include": "#comments"
@@ -115,10 +111,12 @@
       "include": "#pragma-compiler-bsv"
     },
     {
-      "match": "\\b(let|module|endmodule|rule|endrule|rules|endrules|interface|endinterface|method|endmethod|function|endfunction|instance|endinstance|typeclass|endtypeclass|primitive|endprimitive)\\b",
-      "name": "storage.type.bsv"
+      "name": "storage.type.bsv",
+      "match": "\\b(let|module|endmodule|rule|endrule|rules|endrules|interface|endinterface|method|endmethod|function|endfunction|instance|endinstance|typeclass|endtypeclass|primitive|endprimitive)\\b"
     },
     {
+      "name": "meta.case.bsv",
+      "match": "(?:^|\\{|,)\\s*\\b(?!endmodule|endrule|endinterface|endmethod|endfunction|endinstance|endtypeclass)\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b\\s*(:)(?!:)\\s*",
       "captures": {
         "1": {
           "name": "entity.name.state.bsv"
@@ -126,67 +124,65 @@
         "2": {
           "name": "keyword.operator.bitwise.bsv"
         }
-      },
-      "match": "(?:^|\\{|,)\\s*\\b(?!endmodule|endrule|endinterface|endmethod|endfunction|endinstance|endtypeclass)\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b\\s*(:)(?!:)\\s*",
-      "name": "meta.case.bsv"
+      }
     },
     {
       "include": "#all-types"
     },
     {
-      "match": "(==|===|!=|!==|<=|>=|<|>)",
-      "name": "keyword.operator.comparison.bsv"
+      "name": "keyword.operator.comparison.bsv",
+      "match": "(==|===|!=|!==|\u003c=|\u003e=|\u003c|\u003e)"
     },
     {
-      "match": "(\\-|\\+|\\*|\\/|%)",
-      "name": "keyword.operator.arithmetic.bsv"
+      "name": "keyword.operator.arithmetic.bsv",
+      "match": "(\\-|\\+|\\*|\\/|%)"
     },
     {
-      "match": "(!|&&|\\|\\||\\bor\\b)",
-      "name": "keyword.operator.logical.bsv"
+      "name": "keyword.operator.logical.bsv",
+      "match": "(!|\u0026\u0026|\\|\\||\\bor\\b)"
     },
     {
-      "match": "(&|\\||\\^|~|<<|>>|\\?|:)",
-      "name": "keyword.operator.bitwise.bsv"
+      "name": "keyword.operator.bitwise.bsv",
+      "match": "(\u0026|\\||\\^|~|\u003c\u003c|\u003e\u003e|\\?|:)"
     },
     {
-      "match": "({|})",
-      "name": "keyword.operator.parenthesis.curly.bsv"
+      "name": "keyword.operator.parenthesis.curly.bsv",
+      "match": "({|})"
     },
     {
-      "match": "(\\(|\\))",
-      "name": "keyword.operator.parenthesis.round.bsv"
+      "name": "keyword.operator.parenthesis.round.bsv",
+      "match": "(\\(|\\))"
     },
     {
-      "match": "(\\[|\\])",
-      "name": "keyword.operator.parenthesis.square.bsv"
+      "name": "keyword.operator.parenthesis.square.bsv",
+      "match": "(\\[|\\])"
     },
     {
-      "match": "([;,])",
-      "name": "keyword.delimiter.bsv"
+      "name": "keyword.delimiter.bsv",
+      "match": "([;,])"
     },
     {
-      "match": "(#|@|=)",
-      "name": "keyword.other.bsv"
+      "name": "keyword.other.bsv",
+      "match": "(#|@|=)"
     },
     {
-      "match": "\\b(output|input|inout|and|nand|nor|or|xor|xnor|buf|not|bufif[01]|notif[01]|r?[npc]mos|tran|r?tranif[01]|pullup|pulldown)\\b",
-      "name": "support.type.bsv"
+      "name": "support.type.bsv",
+      "match": "\\b(output|input|inout|and|nand|nor|or|xor|xnor|buf|not|bufif[01]|notif[01]|r?[npc]mos|tran|r?tranif[01]|pullup|pulldown)\\b"
     },
     {
-      "match": "\\b(?i:(\\d+\\.\\d*(e[\\-\\+]?\\d+)?))(?=[^a-zA-Z_])",
-      "name": "constant.numeric.real.bsv"
+      "name": "constant.numeric.real.bsv",
+      "match": "\\b(?i:(\\d+\\.\\d*(e[\\-\\+]?\\d+)?))(?=[^a-zA-Z_])"
     },
     {
-      "match": "((\\b\\d+)?'s?([bB]\\s*(([0-1_xXzZ?]+)|(`[A-Z]+[_0-9a-zA-Z]*))|[oO]\\s*(([0-7_xXzZ?]+)|(`[A-Z]+[_0-9a-zA-Z]*))|[dD]\\s*(([0-9_xXzZ?]+)|(`[A-Z]+[_0-9a-zA-Z]*))|[hH]\\s*(([0-9a-fA-F_xXzZ?]+)|(`[A-Z]+[_0-9a-zA-Z]*)))((e|E)(\\+|-)?[0-9]+)?\\b)|(\\b\\d+\\b)",
-      "name": "constant.numeric.bsv"
+      "name": "constant.numeric.bsv",
+      "match": "((\\b\\d+)?'s?([bB]\\s*(([0-1_xXzZ?]+)|(`[A-Z]+[_0-9a-zA-Z]*))|[oO]\\s*(([0-7_xXzZ?]+)|(`[A-Z]+[_0-9a-zA-Z]*))|[dD]\\s*(([0-9_xXzZ?]+)|(`[A-Z]+[_0-9a-zA-Z]*))|[hH]\\s*(([0-9a-fA-F_xXzZ?]+)|(`[A-Z]+[_0-9a-zA-Z]*)))((e|E)(\\+|-)?[0-9]+)?\\b)|(\\b\\d+\\b)"
     },
     {
       "include": "#strings"
     },
     {
-      "match": "\\$\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
-      "name": "support.function.bsv"
+      "name": "support.function.bsv",
+      "match": "\\$\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b"
     }
   ],
   "repository": {
@@ -206,78 +202,76 @@
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.bsv",
           "begin": "/\\*",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.bsv"
             }
-          },
-          "end": "\\*/",
-          "name": "comment.block.bsv"
+          }
         },
         {
+          "name": "comment.line.double-slash.bsv",
+          "match": "(//).*$\\n?",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.bsv"
             }
-          },
-          "match": "(//).*$\\n?",
-          "name": "comment.line.double-slash.bsv"
+          }
         }
       ]
     },
     "pragma-compiler-bsv": {
       "patterns": [
         {
+          "name": "pragma.compiler.bsv",
           "begin": "\\(\\*",
+          "end": "\\*\\)",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.bsv"
             }
-          },
-          "end": "\\*\\)",
-          "name": "pragma.compiler.bsv"
+          }
         }
       ]
     },
+    "storage-modifier-bsv": {
+      "name": "storage.modifier.bsv",
+      "match": "\\b(signed|unsigned|small|medium|large|supply[01]|strong[01]|pull[01]|weak[01]|highz[01])\\b"
+    },
     "storage-type-bsv": {
-      "match": "\\b(wire|tri|tri[01]|supply[01]|wand|triand|wor|trior|trireg|reg|parameter|integer|typedef|struct|enum|tagged|union)\\b",
-      "name": "storage.type.bsv"
+      "name": "storage.type.bsv",
+      "match": "\\b(wire|tri|tri[01]|supply[01]|wand|triand|wor|trior|trireg|reg|parameter|integer|typedef|struct|enum|tagged|union)\\b"
     },
     "storage-type-standard-bsv": {
-      "match": "\\b(void|Action|ActionValue|Integer|Nat|Real|Inout|Bit|UInt|Int|Bool|Maybe|String|Either|Rules|Module|Clock|Reset|Power|Empty|Array|Reg|RWire|Wire|BypassWire|DWire|PulseWire|ReadOnly|WriteOnly|Vector|List|RegFile|FIFO|FIFOF|Stmt)\\b",
-      "name": "storage.type.standard.bsv"
-    },
-    "storage-modifier-bsv": {
-      "match": "\\b(signed|unsigned|small|medium|large|supply[01]|strong[01]|pull[01]|weak[01]|highz[01])\\b",
-      "name": "storage.modifier.bsv"
+      "name": "storage.type.standard.bsv",
+      "match": "\\b(void|Action|ActionValue|Integer|Nat|Real|Inout|Bit|UInt|Int|Bool|Maybe|String|Either|Rules|Module|Clock|Reset|Power|Empty|Array|Reg|RWire|Wire|BypassWire|DWire|PulseWire|ReadOnly|WriteOnly|Vector|List|RegFile|FIFO|FIFOF|Stmt)\\b"
     },
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.double.bsv",
           "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "name": "constant.character.escape.bsv",
+              "match": "\\\\."
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.bsv"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.bsv"
             }
-          },
-          "name": "string.quoted.double.bsv",
-          "patterns": [
-            {
-              "match": "\\\\.",
-              "name": "constant.character.escape.bsv"
-            }
-          ]
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.bsv",
-  "uuid": "7038ab7c-665d-45a4-a700-4ca5e113d9a6"
-}
+  }
+}

data/grammars/source.c++.json

@@ -1,20 +1,6 @@
 {
-  "comment": "I don't think anyone uses .hp. .cp tends to be paired with .h. (I could be wrong. :) -- chris",
-  "fileTypes": [
-    "cc",
-    "cpp",
-    "cp",
-    "cxx",
-    "c++",
-    "C",
-    "h",
-    "hh",
-    "hpp",
-    "h++"
-  ],
-  "firstLineMatch": "-\\*- C\\+\\+ -\\*-",
-  "keyEquivalent": "^~C",
   "name": "C++",
+  "scopeName": "source.c++",
   "patterns": [
     {
       "include": "#special_block"
@@ -26,52 +12,58 @@
       "include": "source.c"
     },
     {
-      "match": "\\b(friend|explicit|virtual)\\b",
-      "name": "storage.modifier.$1.c++"
+      "name": "storage.modifier.$1.c++",
+      "match": "\\b(friend|explicit|virtual)\\b"
     },
     {
-      "match": "\\b(private|protected|public):",
-      "name": "storage.modifier.$1.c++"
+      "name": "storage.modifier.$1.c++",
+      "match": "\\b(private|protected|public):"
     },
     {
-      "match": "\\b(catch|operator|try|throw|using)\\b",
-      "name": "keyword.control.c++"
+      "name": "keyword.control.c++",
+      "match": "\\b(catch|operator|try|throw|using)\\b"
     },
     {
-      "match": "\\bdelete\\b(\\s*\\[\\])?|\\bnew\\b(?!])",
-      "name": "keyword.control.c++"
+      "name": "keyword.control.c++",
+      "match": "\\bdelete\\b(\\s*\\[\\])?|\\bnew\\b(?!])"
     },
     {
-      "comment": "common C++ instance var naming idiom -- fMemberName",
-      "match": "\\b(f|m)[A-Z]\\w*\\b",
-      "name": "variable.other.readwrite.member.c++"
+      "name": "variable.other.readwrite.member.c++",
+      "match": "\\b(f|m)[A-Z]\\w*\\b"
     },
     {
-      "match": "\\b(this|nullptr)\\b",
-      "name": "variable.language.c++"
+      "name": "variable.language.c++",
+      "match": "\\b(this|nullptr)\\b"
     },
     {
-      "match": "\\btemplate\\b\\s*",
-      "name": "storage.type.template.c++"
+      "name": "storage.type.template.c++",
+      "match": "\\btemplate\\b\\s*"
     },
     {
-      "match": "\\b(const_cast|dynamic_cast|reinterpret_cast|static_cast)\\b\\s*",
-      "name": "keyword.operator.cast.c++"
+      "name": "keyword.operator.cast.c++",
+      "match": "\\b(const_cast|dynamic_cast|reinterpret_cast|static_cast)\\b\\s*"
     },
     {
-      "match": "\\b(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq)\\b",
-      "name": "keyword.operator.c++"
+      "name": "keyword.operator.c++",
+      "match": "\\b(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq)\\b"
     },
     {
-      "match": "\\b(class|wchar_t)\\b",
-      "name": "storage.type.c++"
+      "name": "storage.type.c++",
+      "match": "\\b(class|wchar_t)\\b"
     },
     {
-      "match": "\\b(constexpr|export|mutable|typename|thread_local)\\b",
-      "name": "storage.modifier.c++"
+      "name": "storage.modifier.c++",
+      "match": "\\b(constexpr|export|mutable|typename|thread_local)\\b"
     },
     {
-      "begin": "(?x)\n    \t\t\t\t(?:  ^                                 # begin-of-line\n    \t\t\t\t  |  (?: (?<!else|new|=) )             #  or word + space before name\n    \t\t\t\t)\n    \t\t\t\t((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n    \t\t\t\t \\s*(\\()                           # start bracket or end-of-line\n    \t\t\t",
+      "name": "meta.function.destructor.c++",
+      "begin": "(?x)\n    \t\t\t\t(?:  ^                                 # begin-of-line\n    \t\t\t\t  |  (?: (?\u003c!else|new|=) )             #  or word + space before name\n    \t\t\t\t)\n    \t\t\t\t((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n    \t\t\t\t \\s*(\\()                           # start bracket or end-of-line\n    \t\t\t",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "$base"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.c++"
@@ -80,21 +72,21 @@
           "name": "punctuation.definition.parameters.begin.c"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.parameters.end.c"
         }
-      },
-      "name": "meta.function.destructor.c++",
+      }
+    },
+    {
+      "name": "meta.function.destructor.prototype.c++",
+      "begin": "(?x)\n    \t\t\t\t(?:  ^                                 # begin-of-line\n    \t\t\t\t  |  (?: (?\u003c!else|new|=) )             #  or word + space before name\n    \t\t\t\t)\n    \t\t\t\t((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n    \t\t\t\t \\s*(\\()                           # terminating semi-colon\n    \t\t\t",
+      "end": "\\)",
       "patterns": [
         {
           "include": "$base"
         }
-      ]
-    },
-    {
-      "begin": "(?x)\n    \t\t\t\t(?:  ^                                 # begin-of-line\n    \t\t\t\t  |  (?: (?<!else|new|=) )             #  or word + space before name\n    \t\t\t\t)\n    \t\t\t\t((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n    \t\t\t\t \\s*(\\()                           # terminating semi-colon\n    \t\t\t",
+      ],
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.c++"
@@ -103,25 +95,18 @@
           "name": "punctuation.definition.parameters.begin.c"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.parameters.end.c"
         }
-      },
-      "name": "meta.function.destructor.prototype.c++",
-      "patterns": [
-        {
-          "include": "$base"
-        }
-      ]
+      }
     }
   ],
   "repository": {
     "angle_brackets": {
-      "begin": "<",
-      "end": ">",
       "name": "meta.angle-brackets.c++",
+      "begin": "\u003c",
+      "end": "\u003e",
       "patterns": [
         {
           "include": "#angle_brackets"
@@ -132,21 +117,13 @@
       ]
     },
     "block": {
+      "name": "meta.block.c++",
       "begin": "\\{",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.block.begin.c"
-        }
-      },
       "end": "\\}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.block.end.c"
-        }
-      },
-      "name": "meta.block.c++",
       "patterns": [
         {
+          "name": "meta.function-call.c",
+          "match": "(?x)\n    \t\t\t\t(\n    \t\t\t\t\t(?!while|for|do|if|else|switch|catch|enumerate|return|r?iterate)(?: \\b[A-Za-z_][A-Za-z0-9_]*+\\b | :: )*+                  # actual name\n    \t\t\t\t)\n    \t\t\t\t \\s*(\\()",
           "captures": {
             "1": {
               "name": "support.function.any-method.c"
@@ -154,19 +131,34 @@
             "2": {
               "name": "punctuation.definition.parameters.c"
             }
-          },
-          "match": "(?x)\n    \t\t\t\t(\n    \t\t\t\t\t(?!while|for|do|if|else|switch|catch|enumerate|return|r?iterate)(?: \\b[A-Za-z_][A-Za-z0-9_]*+\\b | :: )*+                  # actual name\n    \t\t\t\t)\n    \t\t\t\t \\s*(\\()",
-          "name": "meta.function-call.c"
+          }
         },
         {
           "include": "$base"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.block.begin.c"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.block.end.c"
+        }
+      }
     },
     "constructor": {
       "patterns": [
         {
+          "name": "meta.function.constructor.c++",
           "begin": "(?x)\n    \t\t\t\t(?:  ^\\s*)                             # begin-of-line\n    \t\t\t\t((?!while|for|do|if|else|switch|catch|enumerate|r?iterate)[A-Za-z_][A-Za-z0-9_:]*) # actual name\n    \t\t\t\t \\s*(\\()                            # start bracket or end-of-line\n    \t\t\t",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "$base"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.c++"
@@ -175,69 +167,39 @@
               "name": "punctuation.definition.parameters.begin.c"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.parameters.end.c"
             }
-          },
-          "name": "meta.function.constructor.c++",
-          "patterns": [
-            {
-              "include": "$base"
-            }
-          ]
+          }
         },
         {
+          "name": "meta.function.constructor.initializer-list.c++",
           "begin": "(?x)\n    \t\t\t\t(:)                            # begin-of-line\n    \t\t\t\t((?=\\s*[A-Za-z_][A-Za-z0-9_:]* # actual name\n    \t\t\t\t \\s*(\\()))                      # start bracket or end-of-line\n    \t\t\t",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.parameters.c"
-            }
-          },
           "end": "(?=\\{)",
-          "name": "meta.function.constructor.initializer-list.c++",
           "patterns": [
             {
               "include": "$base"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.parameters.c"
+            }
+          }
         }
       ]
     },
     "special_block": {
       "patterns": [
         {
-          "begin": "\\b(namespace)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.c++"
-            },
-            "2": {
-              "name": "entity.name.type.c++"
-            }
-          },
-          "captures": {
-            "1": {
-              "name": "keyword.control.namespace.$2"
-            }
-          },
-          "end": "(?<=\\})|(?=(;|,|\\(|\\)|>|\\[|\\]|=))",
           "name": "meta.namespace-block${2:+.$2}.c++",
+          "begin": "\\b(namespace)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+",
+          "end": "(?\u003c=\\})|(?=(;|,|\\(|\\)|\u003e|\\[|\\]|=))",
           "patterns": [
             {
               "begin": "\\{",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.scope.c++"
-                }
-              },
               "end": "\\}",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.scope.c++"
-                }
-              },
               "patterns": [
                 {
                   "include": "#special_block"
@@ -248,55 +210,63 @@
                 {
                   "include": "$base"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.scope.c++"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.scope.c++"
+                }
+              }
             },
             {
               "include": "$base"
             }
-          ]
-        },
-        {
-          "begin": "\\b(class|struct)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(public|protected|private)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(public|protected|private)\\b\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?",
+          ],
+          "captures": {
+            "1": {
+              "name": "keyword.control.namespace.$2"
+            }
+          },
           "beginCaptures": {
             "1": {
               "name": "storage.type.c++"
             },
             "2": {
               "name": "entity.name.type.c++"
-            },
-            "4": {
-              "name": "storage.type.modifier.c++"
-            },
-            "5": {
-              "name": "entity.name.type.inherited.c++"
-            },
-            "6": {
-              "patterns": [
-                {
-                  "match": "\\b(public|protected|private)\\b",
-                  "name": "storage.type.modifier.c++"
-                },
-                {
-                  "match": "[_A-Za-z][_A-Za-z0-9]*",
-                  "name": "entity.name.type.inherited.c++"
-                }
-              ]
             }
-          },
-          "end": "(?<=\\})|(?=(;|\\(|\\)|>|\\[|\\]|=))",
+          }
+        },
+        {
           "name": "meta.class-struct-block.c++",
+          "begin": "\\b(class|struct)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(public|protected|private)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(public|protected|private)\\b\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?",
+          "end": "(?\u003c=\\})|(?=(;|\\(|\\)|\u003e|\\[|\\]|=))",
           "patterns": [
             {
               "include": "#angle_brackets"
             },
             {
               "begin": "\\{",
+              "end": "(\\})(\\s*\\n)?",
+              "patterns": [
+                {
+                  "include": "#special_block"
+                },
+                {
+                  "include": "#constructor"
+                },
+                {
+                  "include": "$base"
+                }
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.c++"
                 }
               },
-              "end": "(\\})(\\s*\\n)?",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.invalid.c++"
@@ -304,67 +274,102 @@
                 "2": {
                   "name": "invalid.illegal.you-forgot-semicolon.c++"
                 }
-              },
+              }
+            },
+            {
+              "include": "$base"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.c++"
+            },
+            "2": {
+              "name": "entity.name.type.c++"
+            },
+            "4": {
+              "name": "storage.type.modifier.c++"
+            },
+            "5": {
+              "name": "entity.name.type.inherited.c++"
+            },
+            "6": {
               "patterns": [
                 {
-                  "include": "#special_block"
-                },
-                {
-                  "include": "#constructor"
+                  "name": "storage.type.modifier.c++",
+                  "match": "\\b(public|protected|private)\\b"
                 },
                 {
-                  "include": "$base"
+                  "name": "entity.name.type.inherited.c++",
+                  "match": "[_A-Za-z][_A-Za-z0-9]*"
                 }
               ]
-            },
-            {
-              "include": "$base"
             }
-          ]
+          }
         },
         {
-          "begin": "\\b(extern)(?=\\s*\")",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.modifier.c++"
-            }
-          },
-          "end": "(?<=\\})|(?=\\w)",
           "name": "meta.extern-block.c++",
+          "begin": "\\b(extern)(?=\\s*\")",
+          "end": "(?\u003c=\\})|(?=\\w)",
           "patterns": [
             {
               "begin": "\\{",
+              "end": "\\}",
+              "patterns": [
+                {
+                  "include": "#special_block"
+                },
+                {
+                  "include": "$base"
+                }
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.block.begin.c"
                 }
               },
-              "end": "\\}",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.block.end.c"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "#special_block"
-                },
-                {
-                  "include": "$base"
-                }
-              ]
+              }
             },
             {
               "include": "$base"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.modifier.c++"
+            }
+          }
         }
       ]
     },
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.double.c++",
           "begin": "(u|u8|U|L)?\"",
+          "end": "\"",
+          "patterns": [
+            {
+              "name": "constant.character.escape.c++",
+              "match": "\\\\u[0-9A-Fa-f]{4}|\\\\U[0-9A-Fa-f]{8}"
+            },
+            {
+              "name": "constant.character.escape.c++",
+              "match": "\\\\['\"?\\\\abfnrtv]"
+            },
+            {
+              "name": "constant.character.escape.c++",
+              "match": "\\\\[0-7]{1,3}"
+            },
+            {
+              "name": "constant.character.escape.c++",
+              "match": "\\\\x[0-9A-Fa-f]+"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.c++"
@@ -373,34 +378,16 @@
               "name": "meta.encoding.c++"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.c++"
             }
-          },
-          "name": "string.quoted.double.c++",
-          "patterns": [
-            {
-              "match": "\\\\u[0-9A-Fa-f]{4}|\\\\U[0-9A-Fa-f]{8}",
-              "name": "constant.character.escape.c++"
-            },
-            {
-              "match": "\\\\['\"?\\\\abfnrtv]",
-              "name": "constant.character.escape.c++"
-            },
-            {
-              "match": "\\\\[0-7]{1,3}",
-              "name": "constant.character.escape.c++"
-            },
-            {
-              "match": "\\\\x[0-9A-Fa-f]+",
-              "name": "constant.character.escape.c++"
-            }
-          ]
+          }
         },
         {
+          "name": "string.quoted.double.raw.c++",
           "begin": "(u|u8|U|L)?R\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
+          "end": "\\)\\2(\\3)\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.c++"
@@ -412,7 +399,6 @@
               "name": "invalid.illegal.delimiter-too-long.c++"
             }
           },
-          "end": "\\)\\2(\\3)\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.c++"
@@ -420,12 +406,9 @@
             "1": {
               "name": "invalid.illegal.delimiter-too-long.c++"
             }
-          },
-          "name": "string.quoted.double.raw.c++"
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.c++",
-  "uuid": "26251B18-6B1D-11D9-AFDB-000D93589AF6"
-}
+  }
+}