ver 2010.02 → 2010.08

data/config/syntax/AsciiDoc.rb

@@ -0,0 +1,21 @@
+# Encoding: UTF-8
+
+{
+  fileTypes: ['txt', 'asciidoc'],
+  name: 'AsciiDoc',
+  patterns: [
+    { name: 'entity.name.section.asciidoc',
+      match: /^=+.*/, },
+    { name: 'meta.tag.email.asciidoc',
+      match: /(\w(\w|[.-])*)@(\w|[.-])*[0-9A-Za-z_.]/ },
+    { name: 'keyword.other.asciidoc',
+      match: /TODO|FIXME|XXX|ZZZ/ },
+    { name: 'constant.character.backslash.asciidoc',
+      match: /\\/ },
+    { name: 'markup.underline.link.asciidoc',
+      match: /(http|https|ftp|file|irc):\/\/[^|\s]*(\w|\/)/ },
+  ],
+  repository: {
+  },
+  scopeName: 'text.plain.asciidoc',
+}

data/config/syntax/BibTeX.rb

@@ -3,7 +3,7 @@
 {comment: 
   "Grammar based on description from http://artis.imag.fr/~Xavier.Decoret/resources/xdkbibtex/bibtex_summary.html#comment\n\t\n\tTODO: Does not support @preamble\n\t",
  fileTypes: ["bib"],
- foldingStartMarker: /\@[a-zA-Z]+\s*[{(].+,/,
+ foldingStartMarker: /\@[a-zA-Z]+\s*[{(?<_1>].+,/,
  foldingStopMarker: /^\s*[)}]\s*$/,
  name: "BibTeX",
  patterns: 
@@ -11,7 +11,7 @@
     beginCaptures: {0 => {name: "punctuation.definition.comment.bibtex"}},
     end: "$\\n?",
     name: "comment.line.at-sign.bibtex"},
-   {begin: /((@)String)\s*(\{)\s*([a-zA-Z]*)/,
+   {begin: /(?<_1>(?<_2>@)String)\s*(?<_3>\{)\s*(?<_4>[a-zA-Z]*)/,
     beginCaptures: 
      {1 => {name: "keyword.other.string-constant.bibtex"},
       2 => {name: "punctuation.definition.keyword.bibtex"},
@@ -22,7 +22,7 @@
      {0 => {name: "punctuation.section.string-constant.end.bibtex"}},
     name: "meta.string-constant.braces.bibtex",
     patterns: [{include: "#string_content"}]},
-   {begin: /((@)String)\s*(\()\s*([a-zA-Z]*)/,
+   {begin: /(?<_1>(?<_2>@)String)\s*(?<_3>\()\s*(?<_4>[a-zA-Z]*)/,
     beginCaptures: 
      {1 => {name: "keyword.other.string-constant.bibtex"},
       2 => {name: "punctuation.definition.keyword.bibtex"},
@@ -33,7 +33,7 @@
      {0 => {name: "punctuation.section.string-constant.end.bibtex"}},
     name: "meta.string-constant.parenthesis.bibtex",
     patterns: [{include: "#string_content"}]},
-   {begin: /((@)[a-zA-Z]+)\s*(\{)\s*([^\s,]*)/,
+   {begin: /(?<_1>(?<_2>@)[a-zA-Z]+)\s*(?<_3>\{)\s*(?<_4>[^\s,]*)/,
     beginCaptures: 
      {1 => {name: "keyword.other.entry-type.bibtex"},
       2 => {name: "punctuation.definition.keyword.bibtex"},
@@ -43,14 +43,14 @@
     endCaptures: {0 => {name: "punctuation.section.entry.end.bibtex"}},
     name: "meta.entry.braces.bibtex",
     patterns: 
-     [{begin: /([a-zA-Z]+)\s*(\=)/,
+     [{begin: /(?<_1>[a-zA-Z]+)\s*(?<_2>\=)/,
        beginCaptures: 
         {1 => {name: "string.unquoted.key.bibtex"},
          2 => {name: "punctuation.separator.key-value.bibtex"}},
        end: "(?=[,}])",
        name: "meta.key-assignment.bibtex",
        patterns: [{include: "#string_content"}, {include: "#integer"}]}]},
-   {begin: /((@)[a-zA-Z]+)\s*(\()\s*([^\s,]*)/,
+   {begin: /(?<_1>(?<_2>@)[a-zA-Z]+)\s*(?<_3>\()\s*(?<_4>[^\s,]*)/,
     beginCaptures: 
      {1 => {name: "keyword.other.entry-type.bibtex"},
       2 => {name: "punctuation.definition.keyword.bibtex"},
@@ -60,7 +60,7 @@
     endCaptures: {0 => {name: "punctuation.section.entry.end.bibtex"}},
     name: "meta.entry.parenthesis.bibtex",
     patterns: 
-     [{begin: /([a-zA-Z]+)\s*(\=)/,
+     [{begin: /(?<_1>[a-zA-Z]+)\s*(?<_2>\=)/,
        beginCaptures: 
         {1 => {name: "string.unquoted.key.bibtex"},
          2 => {name: "punctuation.separator.key-value.bibtex"}},

data/config/syntax/Blog - HTML.rb

@@ -4,16 +4,16 @@
  firstLineMatch: "^Type: Blog Post \\(HTML\\)",
  foldingStartMarker: 
   /(?x)
-	(<(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\b.*?>
+	(?<_1><(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\b.*?>
 	|<!--(?!.*--\s*>)
-	|\{\{?(if|foreach|capture|literal|foreach|php|section|strip)
-	|\{\s*($|\?>\s*$|\/\/|\/\*(.*\*\/\s*$|(?!.*?\*\/)))
+	|\{\{?(?<_2>if|foreach|capture|literal|foreach|php|section|strip)
+	|\{\s*(?<_3>$|\?>\s*$|\/\/|\/\*(?<_4>.*\*\/\s*$|(?!.*?\*\/)))
 	)/,
  foldingStopMarker: 
   /(?x)
-	(<\/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)>
+	(?<_1><\/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)>
 	|^(?!.*?<!--).*?--\s*>
-	|\{\{?\/(if|foreach|capture|literal|foreach|php|section|strip)
+	|\{\{?\/(?<_2>if|foreach|capture|literal|foreach|php|section|strip)
 	|^[^{]*\}
 	)/,
  keyEquivalent: "^~B",
@@ -24,9 +24,9 @@
       2 => {name: "punctuation.separator.key-value.blog"},
       3 => {name: "string.unquoted.blog"}},
     match: 
-     /^([Tt]itle|[Dd]ate|[Bb]asename|[Ss]lug|[Kk]eywords|[Bb]log|[Tt]ype|[Ll]ink|[Pp]ost|[Tt]ags|[Cc]omments|[Pp]ings?|[Cc]ategory|[Ss]tatus|[Ff]ormat)(:)\s*(.*)$\n?/,
+     /^(?<_1>[Tt]itle|[Dd]ate|[Bb]asename|[Ss]lug|[Kk]eywords|[Bb]log|[Tt]ype|[Ll]ink|[Pp]ost|[Tt]ags|[Cc]omments|[Pp]ings?|[Cc]ategory|[Ss]tatus|[Ff]ormat)(?<_2>:)\s*(?<_3>.*)$\n?/,
     name: "meta.header.blog"},
-   {match: /^([A-Za-z0-9]+):\s*(.*)$\n?/,
+   {match: /^(?<_1>[A-Za-z0-9]+):\s*(?<_2>.*)$\n?/,
     name: "invalid.illegal.meta.header.blog"},
    {begin: /^(?![A-Za-z0-9]+:)/,
     end: "^(?=not)possible$",

data/config/syntax/Blog - Markdown.rb

@@ -4,15 +4,15 @@
  firstLineMatch: "^Type: Blog Post \\(Markdown\\)",
  foldingStartMarker: 
   /(?x)
-	(<(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\b.*?>
+	(?<_1><(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\b.*?>
 	|<!--(?!.*-->)
-	|\{\s*($|\?>\s*$|\/\/|\/\*(.*\*\/\s*$|(?!.*?\*\/)))
+	|\{\s*(?<_2>$|\?>\s*$|\/\/|\/\*(?<_3>.*\*\/\s*$|(?!.*?\*\/)))
 	)/,
  foldingStopMarker: 
   /(?x)
-	(<\/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)>
+	(?<_1><\/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)>
 	|^\s*-->
-	|(^|\s)\}
+	|(?<_2>^|\s)\}
 	)/,
  keyEquivalent: "^~B",
  name: "Blog — Markdown",
@@ -22,9 +22,9 @@
       2 => {name: "punctuation.separator.key-value.blog"},
       3 => {name: "string.unquoted.blog"}},
     match: 
-     /^([Tt]itle|[Dd]ate|[Bb]asename|[Ss]lug|[Kk]eywords|[Bb]log|[Tt]ype|[Ll]ink|[Pp]ost|[Tt]ags|[Cc]omments|[Pp]ings?|[Cc]ategory|[Ss]tatus|[Ff]ormat)(:)\s*(.*)$\n?/,
+     /^(?<_1>[Tt]itle|[Dd]ate|[Bb]asename|[Ss]lug|[Kk]eywords|[Bb]log|[Tt]ype|[Ll]ink|[Pp]ost|[Tt]ags|[Cc]omments|[Pp]ings?|[Cc]ategory|[Ss]tatus|[Ff]ormat)(?<_2>:)\s*(?<_3>.*)$\n?/,
     name: "meta.header.blog"},
-   {match: /^([A-Za-z0-9]+):\s*(.*)$\n?/,
+   {match: /^(?<_1>[A-Za-z0-9]+):\s*(?<_2>.*)$\n?/,
     name: "invalid.illegal.meta.header.blog"},
    {begin: /^(?![A-Za-z0-9]+:)/,
     end: "^(?=not)possible$",

data/config/syntax/Blog - Text.rb

@@ -10,9 +10,9 @@
       2 => {name: "punctuation.separator.key-value.blog"},
       3 => {name: "string.unquoted.blog"}},
     match: 
-     /^([Tt]itle|[Dd]ate|[Bb]asename|[Ss]lug|[Kk]eywords|[Bb]log|[Tt]ype|[Ll]ink|[Pp]ost|[Tt]ags|[Cc]omments|[Pp]ings?|[Cc]ategory|[Ss]tatus|[Ff]ormat)(:)\s*(.*)$\n?/,
+     /^(?<_1>[Tt]itle|[Dd]ate|[Bb]asename|[Ss]lug|[Kk]eywords|[Bb]log|[Tt]ype|[Ll]ink|[Pp]ost|[Tt]ags|[Cc]omments|[Pp]ings?|[Cc]ategory|[Ss]tatus|[Ff]ormat)(?<_2>:)\s*(?<_3>.*)$\n?/,
     name: "meta.header.blog"},
-   {match: /^([A-Za-z0-9]+):\s*(.*)$\n?/,
+   {match: /^(?<_1>[A-Za-z0-9]+):\s*(?<_2>.*)$\n?/,
     name: "invalid.illegal.meta.header.blog"},
    {begin: /^(?![A-Za-z0-9]+:)/,
     end: "^(?=not)possible$",

data/config/syntax/Blog - Textile.rb

@@ -10,9 +10,9 @@
       2 => {name: "punctuation.separator.key-value.blog"},
       3 => {name: "string.unquoted.blog"}},
     match: 
-     /^([Tt]itle|[Dd]ate|[Bb]asename|[Ss]lug|[Kk]eywords|[Bb]log|[Tt]ype|[Ll]ink|[Pp]ost|[Tt]ags|[Cc]omments|[Pp]ings?|[Cc]ategory|[Ss]tatus|[Ff]ormat)(:)\s*(.*)$\n?/,
+     /^(?<_1>[Tt]itle|[Dd]ate|[Bb]asename|[Ss]lug|[Kk]eywords|[Bb]log|[Tt]ype|[Ll]ink|[Pp]ost|[Tt]ags|[Cc]omments|[Pp]ings?|[Cc]ategory|[Ss]tatus|[Ff]ormat)(?<_2>:)\s*(?<_3>.*)$\n?/,
     name: "meta.header.blog"},
-   {match: /^([A-Za-z0-9]+):\s*(.*)$\n?/,
+   {match: /^(?<_1>[A-Za-z0-9]+):\s*(?<_2>.*)$\n?/,
     name: "invalid.illegal.meta.header.blog"},
    {begin: /^(?![A-Za-z0-9]+:)/,
     end: "^(?=not)possible$",

data/config/syntax/Bulletin Board.rb

@@ -3,34 +3,34 @@
 {fileTypes: ["bbcode"],
  foldingStartMarker: 
   /(?x)
-        (\[(?i:quote|code|list)\b.*?\]
+        (?<_1>\[(?i:quote|code|list)\b.*?\]
         |<!--(?!.*-->)
-        |\{\s*($|\?>\s*$|\/\/|\/\*(.*\*\/\s*$|(?!.*?\*\/)))
+        |\{\s*(?<_2>$|\?>\s*$|\/\/|\/\*(?<_3>.*\*\/\s*$|(?!.*?\*\/)))
         )/,
  foldingStopMarker: 
   /(?x)
-        (\[\/(?i:quote|code|list)\b.*?\]
+        (?<_1>\[\/(?i:quote|code|list)\b.*?\]
         |^\s*-->
-        |(^|\s)\}
+        |(?<_2>^|\s)\}
         )/,
  keyEquivalent: "^~B",
  name: "Bulletin Board",
  patterns: 
-  [{begin: /(\[)(?i:list)(\])/,
+  [{begin: /(?<_1>\[)(?i:list)(?<_2>\])/,
     captures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
       2 => {name: "punctuation.definition.tag.bbcode"}},
     end: "(\\[/)(?i:list)(\\])",
     patterns: 
-     [{begin: /(\[\*\])/,
+     [{begin: /(?<_1>\[\*\])/,
        captures: 
         {0 => {name: "meta.tag.bbcode"},
          1 => {name: "punctuation.definition.tag.bbcode"}},
        contentName: "markup.list.unnumbered.bbcode",
        end: "(?=\\[\\*\\]|\\[/(?i:list)\\])",
        patterns: [{include: "$self"}]}]},
-   {begin: /(\[)(?i:list)=(1|a)(\])/,
+   {begin: /(?<_1>\[)(?i:list)=(?<_2>1|a)(?<_3>\])/,
     beginCaptures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -42,14 +42,14 @@
       1 => {name: "punctuation.definition.tag.bbcode"},
       2 => {name: "punctuation.definition.tag.bbcode"}},
     patterns: 
-     [{begin: /(\[\*\])/,
+     [{begin: /(?<_1>\[\*\])/,
        captures: 
         {0 => {name: "meta.tag.bbcode"},
          1 => {name: "punctuation.definition.tag.bbcode"}},
        contentName: "markup.list.numbered.bbcode",
        end: "(?=\\[\\*\\]|\\[/(?i:list)\\])",
        patterns: [{include: "$self"}]}]},
-   {begin: /(\[)(?i:quote)(?:=[^\]]+)?(\])/,
+   {begin: /(?<_1>\[)(?i:quote)(?:=[^\]]+)?(?<_2>\])/,
     captures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -57,14 +57,14 @@
     contentName: "markup.quote.bbcode",
     end: "(\\[/)(?i:quote)(\\])",
     patterns: [{include: "$self"}]},
-   {begin: /(\[)(?i:code)(\])/,
+   {begin: /(?<_1>\[)(?i:code)(?<_2>\])/,
     captures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
       2 => {name: "punctuation.definition.tag.bbcode"}},
     contentName: "markup.raw.block.bbcode",
     end: "(\\[/)(?i:code)(\\])"},
-   {begin: /(\[)(?i:i)(\])/,
+   {begin: /(?<_1>\[)(?i:i)(?<_2>\])/,
     captures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -72,7 +72,7 @@
     contentName: "markup.italic.bbcode",
     end: "(\\[/)(?i:i)(\\])",
     patterns: [{include: "$self"}]},
-   {begin: /(\[)(?i:b)(\])/,
+   {begin: /(?<_1>\[)(?i:b)(?<_2>\])/,
     captures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -80,7 +80,7 @@
     contentName: "markup.bold.bbcode",
     end: "(\\[/)(?i:b)(\\])",
     patterns: [{include: "$self"}]},
-   {begin: /(\[)(?i:u)(\])/,
+   {begin: /(?<_1>\[)(?i:u)(?<_2>\])/,
     captures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -88,7 +88,7 @@
     contentName: "markup.underline.bbcode",
     end: "(\\[/)(?i:u)(\\])",
     patterns: [{include: "$self"}]},
-   {begin: /(\[)(?i:strike)(\])/,
+   {begin: /(?<_1>\[)(?i:strike)(?<_2>\])/,
     captures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -97,13 +97,13 @@
     end: "(\\[/)(?i:strike)(\\])",
     patterns: [{include: "$self"}]},
    {begin: 
-     /(?x)(\[)(?i:color)=(
-	            (?i:(red|green|blue|yellow
+     /(?x)(?<_1>\[)(?i:color)=(?<_2>
+	            (?i:(?<_3>red|green|blue|yellow
 	                |white|black|pink
 	                |purple|brown|grey))
-                    |(\#([0-9a-fA-F]{6}))
-                    |([^\]]+))
-                (\])/,
+                    |(?<_4>\#(?<_5>[0-9a-fA-F]{6}))
+                    |(?<_6>[^\]]+))
+                (?<_7>\])/,
     beginCaptures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -119,10 +119,10 @@
       2 => {name: "punctuation.definition.tag.bbcode"}},
     patterns: [{include: "$self"}]},
    {begin: 
-     /(?x)(\[)(?i:size)=
-                 (?i:([0-9]{1,3})\b
-                     |([^\]]+))
-                 (\])/,
+     /(?x)(?<_1>\[)(?i:size)=
+                 (?i:(?<_2>[0-9]{1,3})\b
+                     |(?<_3>[^\]]+))
+                 (?<_4>\])/,
     beginCaptures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -136,7 +136,7 @@
       1 => {name: "punctuation.definition.tag.bbcode"},
       2 => {name: "punctuation.definition.tag.bbcode"}},
     patterns: [{include: "$self"}]},
-   {begin: /(\[)(?i:url)=([^\]]+)(\])/,
+   {begin: /(?<_1>\[)(?i:url)=(?<_2>[^\]]+)(?<_3>\])/,
     beginCaptures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -150,7 +150,7 @@
       2 => {name: "punctuation.definition.tag.bbcode"}},
     name: "meta.link.inline.bbcode",
     patterns: [{include: "$self"}]},
-   {begin: /(\[)(?i:url)(\])/,
+   {begin: /(?<_1>\[)(?i:url)(?<_2>\])/,
     captures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -159,7 +159,7 @@
     end: "(\\[/)(?i:url)(\\])",
     name: "meta.link.inline.bbcode",
     patterns: [{match: /[\[\]]+/}]},
-   {begin: /(\[)(?i:email)(\])/,
+   {begin: /(?<_1>\[)(?i:email)(?<_2>\])/,
     captures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -168,7 +168,8 @@
     end: "(\\[/)(?i:email)(\\])",
     name: "meta.link.inline.bbcode",
     patterns: [{match: /[\[\]]+/}]},
-   {begin: /(\[)(?i:img)(:((?i:right|left|top))|([^\]]+))?(\])/,
+   {begin: 
+     /(?<_1>\[)(?i:img)(?<_2>:(?<_3>(?i:right|left|top))|(?<_4>[^\]]+))?(?<_5>\])/,
     beginCaptures: 
      {0 => {name: "meta.tag.bbcode"},
       1 => {name: "punctuation.definition.tag.bbcode"},
@@ -188,12 +189,12 @@
       5 => {name: "punctuation.definition.constant.bbcode"}},
     match: 
      /(?x)
-	(
-	(
-	(:)
-	(mad|rolleyes|cool|eek|confused|devious|
+	(?<_1>
+	(?<_2>
+	(?<_3>:)
+	(?<_4>mad|rolleyes|cool|eek|confused|devious|
 	judge|scared|eyebrow|bigdumbgrin)
-	(:)
+	(?<_5>:)
 	)
 	  | (?::\)|;\)|:D|:\(|:p|:o)
 	)/,

data/config/syntax/C++ Qt.rb

@@ -5,23 +5,24 @@
  foldingStartMarker: 
   /(?x)
 	 \/\*\*(?!\*)
-	|^(?![^{]*?\/\/|[^{]*?\/\*(?!.*?\*\/.*?\{)).*?\{\s*($|\/\/|\/\*(?!.*?\*\/.*\S))
+	|^(?![^{]*?\/\/|[^{]*?\/\*(?!.*?\*\/.*?\{)).*?\{\s*(?<_1>$|\/\/|\/\*(?!.*?\*\/.*\S))
 	/,
  foldingStopMarker: /(?<!\*)\*\*\/|^\s*\}/,
  keyEquivalent: "^~Q",
  name: "C++ Qt",
  patterns: 
-  [{match: /\bQ_(CLASSINFO|ENUMS|FLAGS|INTERFACES|OBJECT|PROPERTY)\b/,
+  [{match: /\bQ_(?<_1>CLASSINFO|ENUMS|FLAGS|INTERFACES|OBJECT|PROPERTY)\b/,
     name: "support.other.macro.qt"},
-   {match: /\b((dis)?connect|emit|fore(ach|ver)|tr(Utf8)?|qobject_cast)\b/,
+   {match: 
+     /\b(?<_1>(?<_2>dis)?connect|emit|fore(?<_3>ach|ver)|tr(?<_4>Utf8)?|qobject_cast)\b/,
     name: "support.function.qt"},
    {match: 
-     /\bQ(Abstract(Button|EventDispatcher|Extension(Factory|Manager)|FileEngine(Handler)?|FormBuilder|GraphicsShapeItem|Item(Delegate|Model|View)|ListModel|PrintDialog|ProxyModel|ScrollArea|Slider|Socket|SpinBox|TableModel|TextDocumentLayout)|Accessible(Bridge|BridgePlugin|Event|Interface|Object|Plugin|Widget)?|Action(Event|Group)?|(Core)?Application|AssistantClient|Ax(Aggregated|Base|Bindable|Factory|Object|Script|ScriptEngine|ScriptManager|Widget)|BasicTimer|Bit(Array|map)|BoxLayout|Brush|Buffer|ButtonGroup|ByteArray(Matcher)?|(CDE|Windows(XP)?|Cleanlooks|Common|Mac|Plastique|Motif)Style|Cache|CalendarWidget|Char|CheckBox|ChildEvent|Clipboard|CloseEvent|Color(Dialog|map)?|ComboBox|Completer|ConicalGradient|ContextMenuEvent|CopChannel|Cursor|CustomRasterPaintDevice|DBus(AbstractAdaptor|AbstractInterface|Argument|Connection(Interface)?|Error|Interface|Message|ObjectPath|Reply|Server|Signature|Variant)|Data(Stream|WidgetMapper)|Date((Time)?(Edit)?)|Decoration(Factory|Plugin)?|Designer(ActionEditorInterface|ContainerExtension|CustomWidgetCollectionInterface|CustomWidgetInterface|FormEditorInterface|FormWindowCursorInterface|FormWindowInterface|FormWindowManagerInterface|MemberSheetExtension|ObjectInspectorInterface|PropertyEditorInterface|PropertySheetExtension|TaskMenuExtension|WidgetBoxInterface)|Desktop(Services|Widget)|Dial(og|ogButtonBox)?|Dir(Model|ectPainter)?|DockWidget|Dom(Attr|CDATASection|CharacterData|Comment|Document|DocumentFragment|DocumentType|Element|Entity|EntityReference|Implementation|NamedNodeMap|Node|NodeList|Notation|ProcessingInstruction|Text)|Double(SpinBox|Validator)|Drag((Enter|Leave|Move)Event)?|(Drop|DynamicPropertyChange)Event|ErrorMessage|Event(Loop)?|Extension(Factory|Manager)|FSFileEngine|File(Dialog|IconProvider|Info|OpenEvent|SystemWatcher)?|Flags?|Focus(Event|Frame)|Font(ComboBox|Database|Dialog|Info|MetricsF?)?|FormBuilder|Frame|Ftp|GL(Colormap|Context|Format|FramebufferObject|PixelBuffer|Widget)|Generic(Return)?Argument|Gradient|Graphics(EllipseItem|Item|ItemAnimation|ItemGroup|LineItem|PathItem|PixmapItem|PolygonItem|RectItem|Scene((ContextMenu|Hover|Mouse|Wheel)?Event)?|SimpleTextItem|SvgItem|TextItem|View)|GridLayout|GroupBox|HBoxLayout|Hash(Iterator)?|HeaderView|(Help|Hide|Hover)Event|Host(Address|Info)|Http((Response|Request)?Header)?|IODevice|Icon(DragEvent|Engine(Plugin)?)?|Image(IO(Handler|Plugin)|Reader|Writer)?|Input(Context(Factory|Plugin)?|Dialog|Event|MethodEvent)|IntValidator|Item(Delegate|Editor(CreatorBase|Factory)|Selection(Model|Range)?)|KbdDriver(Factory|Plugin)|Key(Event|Sequence)|LCDNumber|Label|Latin1(Char|String)|Layout(Item)?|Library(Info)?|Line(Edit|F)?|LinearGradient|LinkedList(Iterator)?|LinuxFbScreen|List(View|Iterator|Widget(Item)?)?|Locale|MacPasteboardMime|MainWindow|Map(Iterator)?|Matrix|Menu(Bar)?|MessageBox|Meta(ClassInfo|Enum|Method|Object|Property|Type)|Mime(Data|Source)|ModelIndex|MouseDriver(Factory|Plugin)|(Move|Mouse)Event|Movie|Multi(Hash|Map)|Mutable(Hash|(Linked)?List|Map|Set|Vector)Iterator|Mutex(Locker)?|Network(AddressEntry|Interface|Proxy)|Object(CleanupHandler)?|PageSetupDialog|Paint(Device|Engine(State)?|Event|er(Path(Stroker)?)?)|Pair|Palette|Pen|PersistentModelIndex|Picture(FormatPlugin|IO)?|Pixmap(Cache)?|PluginLoader|PointF?|Pointer|PolygonF?|Print(Dialog|Engine|er)|Process|Progress(Bar|Dialog)|ProxyModel|PushButton|Queue|RadialGradient|RadioButton|RasterPaintEngine|ReadLocker|ReadWriteLock|RectF?|RegExp(Validator)?|Region|ResizeEvent|Resource|RubberBand|Screen(Cursor|Driver(Factory|Plugin))?|Scroll(Area|Bar)|Semaphore|SessionManager|Set(Iterator)?|Settings|SharedData(Pointer)?|Shortcut(Event)?|ShowEvent|Signal(Mapper|Spy)|Size(Grip|Policy|F)?|Slider|SocketNotifier|SortFilterProxyModel|Sound|SpacerItem|SpinBox|SplashScreen|Splitter(Handle)?|Sql(Database|Driver(Creator(Base)?|Plugin)?|Error|Field|Index|Query(Model)?|Record|Relation|Relational(Delegate|TableModel)|Result|TableModel)|Stack(ed(Layout|Widget))?|StandardItem(EditorCreator|Model)?|Status(Bar|TipEvent)|String(List(Model)?|Matcher)?|Style(Factory|HintReturn(Mask)?|Option(Button|ComboBox|Complex|DockWidget|FocusRect|Frame(V2)?|GraphicsItem|GroupBox|Header|MenuItem|ProgressBar(V2)?|Q3(DockWindow|ListView|ListViewItem)|RubberBand|SizeGrip|Slider|SpinBox|Tab(BarBase|V2|WidgetFrame)?|TitleBar|Tool(Bar|Box|Button)|ViewItem(V2)?)?|Painter|Plugin)?|Svg(Renderer|Widget)|SyntaxHighlighter|SysInfo|System(Locale|TrayIcon)|Tab(Bar|Widget)|Table(Widget(Item|SelectionRange)?|View)|TabletEvent|Tcp(Server|Socket)|TemporaryFile|TestEventList|Text(Block(Format|Group|UserData)?|Browser|CharFormat|Codec(Plugin)?|Cursor|(De|En)coder|Document(Fragment)?|Edit|Fragment|Frame(Format)?|(Image)?Format|InlineObject|Layout|Length|Line|List(Format)?|Object|Option|Stream|Table(Cell|Format)?)|Thread(Storage)?|Time(Edit|Line)?|Timer(Event)?|Tool(Bar|Box|Button|Tip)|TransformedScreen|Translator|Tree(Widget(Item(Iterator)?)?|View)|UdpSocket|UiLoader|Undo(Command|Group|Stack|View)|Url(Info)?|Uuid|VBoxLayout|(VNC|VFb)Screen|Validator|VarLengthArray|Variant|Vector(Iterator)?|WS(Client|EmbedWidget|Event|InputMethod|(Keyboard|(Tslib|Calibrated)?Mouse)Handler|PointerCalibrationData|ScreenSaver|Server|Window(Surface)?)|WaitCondition|WhatsThis(ClickedEvent)?|WheelEvent|Widget(Action|Item)?|Window(StateChangeEvent|sMime)|Workspace|WriteLocker|X11Embed(Container|Widget)|X11Info|Xml(Attributes|(Content|DTD|Decl|Default|Error|Lexical)Handler|EntityResolver|InputSource|Locator|NamespaceSupport|ParseException|Reader|SimpleReader))\b/,
+     /\bQ(?<_1>Abstract(?<_2>Button|EventDispatcher|Extension(?<_3>Factory|Manager)|FileEngine(?<_4>Handler)?|FormBuilder|GraphicsShapeItem|Item(?<_5>Delegate|Model|View)|ListModel|PrintDialog|ProxyModel|ScrollArea|Slider|Socket|SpinBox|TableModel|TextDocumentLayout)|Accessible(?<_6>Bridge|BridgePlugin|Event|Interface|Object|Plugin|Widget)?|Action(?<_7>Event|Group)?|(?<_8>Core)?Application|AssistantClient|Ax(?<_9>Aggregated|Base|Bindable|Factory|Object|Script|ScriptEngine|ScriptManager|Widget)|BasicTimer|Bit(?<_10>Array|map)|BoxLayout|Brush|Buffer|ButtonGroup|ByteArray(?<_11>Matcher)?|(?<_12>CDE|Windows(?<_13>XP)?|Cleanlooks|Common|Mac|Plastique|Motif)Style|Cache|CalendarWidget|Char|CheckBox|ChildEvent|Clipboard|CloseEvent|Color(?<_14>Dialog|map)?|ComboBox|Completer|ConicalGradient|ContextMenuEvent|CopChannel|Cursor|CustomRasterPaintDevice|DBus(?<_15>AbstractAdaptor|AbstractInterface|Argument|Connection(?<_16>Interface)?|Error|Interface|Message|ObjectPath|Reply|Server|Signature|Variant)|Data(?<_17>Stream|WidgetMapper)|Date(?<_18>(?<_19>Time)?(?<_20>Edit)?)|Decoration(?<_21>Factory|Plugin)?|Designer(?<_22>ActionEditorInterface|ContainerExtension|CustomWidgetCollectionInterface|CustomWidgetInterface|FormEditorInterface|FormWindowCursorInterface|FormWindowInterface|FormWindowManagerInterface|MemberSheetExtension|ObjectInspectorInterface|PropertyEditorInterface|PropertySheetExtension|TaskMenuExtension|WidgetBoxInterface)|Desktop(?<_23>Services|Widget)|Dial(?<_24>og|ogButtonBox)?|Dir(?<_25>Model|ectPainter)?|DockWidget|Dom(?<_26>Attr|CDATASection|CharacterData|Comment|Document|DocumentFragment|DocumentType|Element|Entity|EntityReference|Implementation|NamedNodeMap|Node|NodeList|Notation|ProcessingInstruction|Text)|Double(?<_27>SpinBox|Validator)|Drag(?<_28>(?<_29>Enter|Leave|Move)Event)?|(?<_30>Drop|DynamicPropertyChange)Event|ErrorMessage|Event(?<_31>Loop)?|Extension(?<_32>Factory|Manager)|FSFileEngine|File(?<_33>Dialog|IconProvider|Info|OpenEvent|SystemWatcher)?|Flags?|Focus(?<_34>Event|Frame)|Font(?<_35>ComboBox|Database|Dialog|Info|MetricsF?)?|FormBuilder|Frame|Ftp|GL(?<_36>Colormap|Context|Format|FramebufferObject|PixelBuffer|Widget)|Generic(?<_37>Return)?Argument|Gradient|Graphics(?<_38>EllipseItem|Item|ItemAnimation|ItemGroup|LineItem|PathItem|PixmapItem|PolygonItem|RectItem|Scene(?<_39>(?<_40>ContextMenu|Hover|Mouse|Wheel)?Event)?|SimpleTextItem|SvgItem|TextItem|View)|GridLayout|GroupBox|HBoxLayout|Hash(?<_41>Iterator)?|HeaderView|(?<_42>Help|Hide|Hover)Event|Host(?<_43>Address|Info)|Http(?<_44>(?<_45>Response|Request)?Header)?|IODevice|Icon(?<_46>DragEvent|Engine(?<_47>Plugin)?)?|Image(?<_48>IO(?<_49>Handler|Plugin)|Reader|Writer)?|Input(?<_50>Context(?<_51>Factory|Plugin)?|Dialog|Event|MethodEvent)|IntValidator|Item(?<_52>Delegate|Editor(?<_53>CreatorBase|Factory)|Selection(?<_54>Model|Range)?)|KbdDriver(?<_55>Factory|Plugin)|Key(?<_56>Event|Sequence)|LCDNumber|Label|Latin1(?<_57>Char|String)|Layout(?<_58>Item)?|Library(?<_59>Info)?|Line(?<_60>Edit|F)?|LinearGradient|LinkedList(?<_61>Iterator)?|LinuxFbScreen|List(?<_62>View|Iterator|Widget(?<_63>Item)?)?|Locale|MacPasteboardMime|MainWindow|Map(?<_64>Iterator)?|Matrix|Menu(?<_65>Bar)?|MessageBox|Meta(?<_66>ClassInfo|Enum|Method|Object|Property|Type)|Mime(?<_67>Data|Source)|ModelIndex|MouseDriver(?<_68>Factory|Plugin)|(?<_69>Move|Mouse)Event|Movie|Multi(?<_70>Hash|Map)|Mutable(?<_71>Hash|(?<_72>Linked)?List|Map|Set|Vector)Iterator|Mutex(?<_73>Locker)?|Network(?<_74>AddressEntry|Interface|Proxy)|Object(?<_75>CleanupHandler)?|PageSetupDialog|Paint(?<_76>Device|Engine(?<_77>State)?|Event|er(?<_78>Path(?<_79>Stroker)?)?)|Pair|Palette|Pen|PersistentModelIndex|Picture(?<_80>FormatPlugin|IO)?|Pixmap(?<_81>Cache)?|PluginLoader|PointF?|Pointer|PolygonF?|Print(?<_82>Dialog|Engine|er)|Process|Progress(?<_83>Bar|Dialog)|ProxyModel|PushButton|Queue|RadialGradient|RadioButton|RasterPaintEngine|ReadLocker|ReadWriteLock|RectF?|RegExp(?<_84>Validator)?|Region|ResizeEvent|Resource|RubberBand|Screen(?<_85>Cursor|Driver(?<_86>Factory|Plugin))?|Scroll(?<_87>Area|Bar)|Semaphore|SessionManager|Set(?<_88>Iterator)?|Settings|SharedData(?<_89>Pointer)?|Shortcut(?<_90>Event)?|ShowEvent|Signal(?<_91>Mapper|Spy)|Size(?<_92>Grip|Policy|F)?|Slider|SocketNotifier|SortFilterProxyModel|Sound|SpacerItem|SpinBox|SplashScreen|Splitter(?<_93>Handle)?|Sql(?<_94>Database|Driver(?<_95>Creator(?<_96>Base)?|Plugin)?|Error|Field|Index|Query(?<_97>Model)?|Record|Relation|Relational(?<_98>Delegate|TableModel)|Result|TableModel)|Stack(?<_99>ed(?<_100>Layout|Widget))?|StandardItem(?<_101>EditorCreator|Model)?|Status(?<_102>Bar|TipEvent)|String(?<_103>List(?<_104>Model)?|Matcher)?|Style(?<_105>Factory|HintReturn(?<_106>Mask)?|Option(?<_107>Button|ComboBox|Complex|DockWidget|FocusRect|Frame(?<_108>V2)?|GraphicsItem|GroupBox|Header|MenuItem|ProgressBar(?<_109>V2)?|Q3(?<_110>DockWindow|ListView|ListViewItem)|RubberBand|SizeGrip|Slider|SpinBox|Tab(?<_111>BarBase|V2|WidgetFrame)?|TitleBar|Tool(?<_112>Bar|Box|Button)|ViewItem(?<_113>V2)?)?|Painter|Plugin)?|Svg(?<_114>Renderer|Widget)|SyntaxHighlighter|SysInfo|System(?<_115>Locale|TrayIcon)|Tab(?<_116>Bar|Widget)|Table(?<_117>Widget(?<_118>Item|SelectionRange)?|View)|TabletEvent|Tcp(?<_119>Server|Socket)|TemporaryFile|TestEventList|Text(?<_120>Block(?<_121>Format|Group|UserData)?|Browser|CharFormat|Codec(?<_122>Plugin)?|Cursor|(?<_123>De|En)coder|Document(?<_124>Fragment)?|Edit|Fragment|Frame(?<_125>Format)?|(?<_126>Image)?Format|InlineObject|Layout|Length|Line|List(?<_127>Format)?|Object|Option|Stream|Table(?<_128>Cell|Format)?)|Thread(?<_129>Storage)?|Time(?<_130>Edit|Line)?|Timer(?<_131>Event)?|Tool(?<_132>Bar|Box|Button|Tip)|TransformedScreen|Translator|Tree(?<_133>Widget(?<_134>Item(?<_135>Iterator)?)?|View)|UdpSocket|UiLoader|Undo(?<_136>Command|Group|Stack|View)|Url(?<_137>Info)?|Uuid|VBoxLayout|(?<_138>VNC|VFb)Screen|Validator|VarLengthArray|Variant|Vector(?<_139>Iterator)?|WS(?<_140>Client|EmbedWidget|Event|InputMethod|(?<_141>Keyboard|(?<_142>Tslib|Calibrated)?Mouse)Handler|PointerCalibrationData|ScreenSaver|Server|Window(?<_143>Surface)?)|WaitCondition|WhatsThis(?<_144>ClickedEvent)?|WheelEvent|Widget(?<_145>Action|Item)?|Window(?<_146>StateChangeEvent|sMime)|Workspace|WriteLocker|X11Embed(?<_147>Container|Widget)|X11Info|Xml(?<_148>Attributes|(?<_149>Content|DTD|Decl|Default|Error|Lexical)Handler|EntityResolver|InputSource|Locator|NamespaceSupport|ParseException|Reader|SimpleReader))\b/,
     name: "support.class.qt"},
    {match: 
-     /\b(q(int8|int16|int32|int64|longlong|real|uint8|uint16|uint32|uint64|ulonglong)|u(char|int|long|short))\b/,
+     /\b(?<_1>q(?<_2>int8|int16|int32|int64|longlong|real|uint8|uint16|uint32|uint64|ulonglong)|u(?<_3>char|int|long|short))\b/,
     name: "storage.type.qt"},
-   {match: /\b(slots|signals)\b/, name: "storage.modifier.qt"},
+   {match: /\b(?<_1>slots|signals)\b/, name: "storage.modifier.qt"},
    {include: "source.c++"}],
  scopeName: "source.c++.qt",
  uuid: "C0D24A46-0534-11DB-8949-0011242E4184"}

data/config/syntax/C++.rb

@@ -7,38 +7,41 @@
  foldingStartMarker: 
   /(?x)
 	 \/\*\*(?!\*)
-	|^(?![^{]*?\/\/|[^{]*?\/\*(?!.*?\*\/.*?\{)).*?\{\s*($|\/\/|\/\*(?!.*?\*\/.*\S))
+	|^(?![^{]*?\/\/|[^{]*?\/\*(?!.*?\*\/.*?\{)).*?\{\s*(?<_1>$|\/\/|\/\*(?!.*?\*\/.*\S))
 	/,
  foldingStopMarker: /(?<!\*)\*\*\/|^\s*\}/,
- keyEquivalent: /^~C/,
+ keyEquivalent: "^~C",
  name: "C++",
  patterns: 
   [{include: "#special_block"},
    {include: "source.c"},
-   {match: /\b(friend|explicit|virtual)\b/, name: "storage.modifier.c++"},
-   {match: /\b(private:|protected:|public:)/, name: "storage.modifier.c++"},
-   {match: /\b(catch|operator|try|throw|using)\b/,
+   {match: /\b(?<_1>friend|explicit|virtual)\b/, name: "storage.modifier.c++"},
+   {match: /\b(?<_1>private:|protected:|public:)/,
+    name: "storage.modifier.c++"},
+   {match: /\b(?<_1>catch|operator|try|throw|using)\b/,
+    name: "keyword.control.c++"},
+   {match: /\bdelete\b(?<_1>\s*\[\])?|\bnew\b(?!\])/,
     name: "keyword.control.c++"},
-   {match: /\bdelete\b(\s*\[\])?|\bnew\b(?!\])/, name: "keyword.control.c++"},
    {comment: "common C++ instance var naming idiom -- fMemberName",
-    match: /\b(f|m)[A-Z]\w*\b/,
+    match: /\b(?<_1>f|m)[A-Z]\w*\b/,
     name: "variable.other.readwrite.member.c++"},
-   {match: /\b(this)\b/, name: "variable.language.c++"},
+   {match: /\b(?<_1>this)\b/, name: "variable.language.c++"},
    {match: /\btemplate\b\s*/, name: "storage.type.template.c++"},
-   {match: /\b(const_cast|dynamic_cast|reinterpret_cast|static_cast)\b\s*/,
+   {match: 
+     /\b(?<_1>const_cast|dynamic_cast|reinterpret_cast|static_cast)\b\s*/,
     name: "keyword.operator.cast.c++"},
    {match: 
-     /\b(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq)\b/,
+     /\b(?<_1>and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq)\b/,
     name: "keyword.operator.c++"},
-   {match: /\b(class|wchar_t)\b/, name: "storage.type.c++"},
-   {match: /\b(export|mutable|typename)\b/, name: "storage.modifier.c++"},
+   {match: /\b(?<_1>class|wchar_t)\b/, name: "storage.type.c++"},
+   {match: /\b(?<_1>export|mutable|typename)\b/, name: "storage.modifier.c++"},
    {begin: 
      /(?x)
     				(?:  ^                                 # begin-of-line
     				  |  (?: (?<!else|new|=) )             #  or word + space before name
     				)
-    				((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name
-    				 \s*(\()                           # start bracket or end-of-line
+    				(?<_1>(?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name
+    				 \s*(?<_2>\()                           # start bracket or end-of-line
     			/,
     beginCaptures: 
      {1 => {name: "entity.name.function.c++"},
@@ -52,8 +55,8 @@
     				(?:  ^                                 # begin-of-line
     				  |  (?: (?<!else|new|=) )             #  or word + space before name
     				)
-    				((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name
-    				 \s*(\()                           # terminating semi-colon
+    				(?<_1>(?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name
+    				 \s*(?<_2>\()                           # terminating semi-colon
     			/,
     beginCaptures: 
      {1 => {name: "entity.name.function.c++"},
@@ -78,10 +81,10 @@
           2 => {name: "punctuation.definition.parameters.c"}},
         match: 
          /(?x)
-    				(
+    				(?<_1>
     					(?!while|for|do|if|else|switch|catch|enumerate|return|r?iterate)(?: \b[A-Za-z_][A-Za-z0-9_]*+\b | :: )*+                  # actual name
     				)
-    				 \s*(\()/,
+    				 \s*(?<_2>\()/,
         name: "meta.function-call.c"},
        {include: "$base"}]},
    constructor: 
@@ -89,8 +92,8 @@
       [{begin: 
          /(?x)
     				(?:  ^\s*)                             # begin-of-line
-    				((?!while|for|do|if|else|switch|catch|enumerate|r?iterate)[A-Za-z_][A-Za-z0-9_:]*) # actual name
-    				 \s*(\()                            # start bracket or end-of-line
+    				(?<_1>(?!while|for|do|if|else|switch|catch|enumerate|r?iterate)[A-Za-z_][A-Za-z0-9_:]*) # actual name
+    				 \s*(?<_2>\()                            # start bracket or end-of-line
     			/,
         beginCaptures: 
          {1 => {name: "entity.name.function.c++"},
@@ -101,9 +104,9 @@
         patterns: [{include: "$base"}]},
        {begin: 
          /(?x)
-    				(:)                            # begin-of-line
-    				((?=\s*[A-Za-z_][A-Za-z0-9_:]* # actual name
-    				 \s*(\()))                      # start bracket or end-of-line
+    				(?<_1>:)                            # begin-of-line
+    				(?<_2>(?=\s*[A-Za-z_][A-Za-z0-9_:]* # actual name
+    				 \s*(?<_3>\()))                      # start bracket or end-of-line
     			/,
         beginCaptures: {1 => {name: "punctuation.definition.parameters.c"}},
         end: "(?=\\{)",
@@ -111,14 +114,14 @@
         patterns: [{include: "$base"}]}]},
    special_block: 
     {patterns: 
-      [{begin: /\b(namespace)\b\s*([_A-Za-z][_A-Za-z0-9]*\b)?+/,
+      [{begin: /\b(?<_1>namespace)\b\s*(?<_2>[_A-Za-z][_A-Za-z0-9]*\b)?+/,
         beginCaptures: 
          {1 => {name: "storage.type.c++"},
           2 => {name: "entity.name.type.c++"}},
         end: "(?<=\\})|(?=(;|,|\\(|\\)|>|\\[|\\]|=))",
         name: "meta.namespace-block.c++",
         patterns: 
-         [{begin: /(\{)/,
+         [{begin: /(?<_1>\{)/,
            beginCaptures: {1 => {name: "punctuation.definition.scope.c++"}},
            end: "(\\})",
            endCaptures: {1 => {name: "punctuation.definition.invalid.c++"}},
@@ -127,7 +130,7 @@
              {include: "#constructor"},
              {include: "$base"}]},
           {include: "$base"}]},
-       {begin: /\b(class|struct)\b\s*([_A-Za-z][_A-Za-z0-9]*\b)?+/,
+       {begin: /\b(?<_1>class|struct)\b\s*(?<_2>[_A-Za-z][_A-Za-z0-9]*\b)?+/,
         beginCaptures: 
          {1 => {name: "storage.type.c++"},
           2 => {name: "entity.name.type.c++"}},
@@ -135,7 +138,7 @@
         name: "meta.class-struct-block.c++",
         patterns: 
          [{include: "#angle_brackets"},
-          {begin: /(\{)/,
+          {begin: /(?<_1>\{)/,
            beginCaptures: {1 => {name: "punctuation.definition.scope.c++"}},
            end: "(\\})(\\s*\\n)?",
            endCaptures: 
@@ -146,7 +149,7 @@
              {include: "#constructor"},
              {include: "$base"}]},
           {include: "$base"}]},
-       {begin: /\b(extern)(?=\s*")/,
+       {begin: /\b(?<_1>extern)(?=\s*")/,
         beginCaptures: {1 => {name: "storage.modifier.c++"}},
         end: "(?<=\\})|(?=\\w)",
         name: "meta.extern-block.c++",