ver 2010.02 → 2010.08

data/config/syntax/HTML (Rails).rb

@@ -3,15 +3,15 @@
 {fileTypes: ["rhtml", "erb", "html.erb"],
  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: "^~R",
  name: "HTML (Rails)",
@@ -26,7 +26,7 @@
     name: "source.ruby.rails.embedded.html",
     patterns: 
      [{captures: {1 => {name: "punctuation.definition.comment.ruby"}},
-       match: /(#).*?(?=-?%>)/,
+       match: /(?<_1>#).*?(?=-?%>)/,
        name: "comment.line.number-sign.ruby"},
       {include: "source.ruby.rails"}]},
    {include: "text.html.basic"}],

data/config/syntax/HTML (Tcl).rb

@@ -2,9 +2,9 @@
 
 {fileTypes: ["tcl", "adp", "inc"],
  foldingStartMarker: 
-  /(<(?i:(head|table|div|style|script|ul|ol|form|dl))\b.*?>|\{)/,
+  /(?<_1><(?i:(?<_2>head|table|div|style|script|ul|ol|form|dl))\b.*?>|\{)/,
  foldingStopMarker: 
-  /(<\/(?i:(head|table|div|style|script|ul|ol|form|dl))>|\})/,
+  /(?<_1><\/(?i:(?<_2>head|table|div|style|script|ul|ol|form|dl))>|\})/,
  keyEquivalent: "^~T",
  name: "HTML (Tcl)",
  patterns: 
@@ -15,7 +15,7 @@
     name: "source.tcl.embedded.html",
     patterns: 
      [{match: 
-        /(env|ns_adp_argc|ns_adp_argv|ns_adp_bind_args|ns_adp_break|ns_adp_debug|ns_adp_dir|ns_adp_dump|ns_adp_eval|ns_adp_exception|ns_adp_include|ns_adp_parse|ns_adp_puts|ns_adp_registertag|ns_adp_return|ns_adp_stream|ns_adp_tell|ns_adp_trunc|ns_atclose|ns_atexit|ns_atshutdown|ns_atsignal|ns_cache_flush|ns_cache_names|ns_cache_size|ns_cache_stats|ns_checkurl|ns_chmod|ns_cond|ns_config|ns_configsection|ns_configsections|ns_conn|ns_conncptofp|ns_connsendfp|ns_cp|ns_cpfp|ns_critsec|ns_crypt|ns_db|ns_dbconfigpath|ns_dberror|ns_dbformvalue|ns_dbformvalueput|ns_dbquotename|ns_dbquotevalue|ns_deleterow|ns_eval|ns_event|ns_ext|ns_findrowbyid|ns_fmttime|ns_ftruncate|ns_getcsv|ns_getform|ns_get_multipart_formdata|ns_geturl|ns_gifsize|ns_gmtime|ns_guesstype|ns_hostbyaddr|ns_hrefs|ns_httpget|ns_httpopen|ns_httptime|ns_info|ns_insertrow|ns_jpegsize|ns_kill|ns_library|ns_link|ns_localsqltimestamp|ns_localtime|ns_log|ns_logroll|ns_markfordelete|ns_mkdir|ns_mktemp|ns_modulepath|ns_mutex|ns_normalizepath|ns_param|ns_parseheader|ns_parsehttptime|ns_parsequery|ns_passwordcheck|ns_perm|ns_permpasswd|ns_pooldescription|ns_puts|ns_queryexists|ns_queryget|ns_querygetall|ns_quotehtml|ns_rand|ns_register_adptag|ns_register_filter|ns_register_proc|ns_register_trace|ns_rename|ns_requestauthorize|ns_respond|ns_return|ns_returnredirect|ns_rmdir|ns_rollfile|ns_rwlock|ns_schedule_daily|ns_schedule_proc|ns_schedule_weekly|ns_section|ns_sema|ns_sendmail|ns_server|ns_set|ns_setexpires|ns_set_precision|ns_share|ns_shutdown|ns_sleep|ns_sockaccept|ns_sockblocking|ns_sockcallback|ns_sockcheck|ns_socketpair|ns_socklistencallback|ns_socknonblocking|ns_socknread|ns_sockopen|ns_sockselect|ns_striphtml|ns_symlink|ns_thread|ns_time|ns_tmpnam|ns_truncate|ns_unlink|ns_unschedule_proc|ns_url2file|ns_urldecode|ns_urlencode|ns_uudecode|ns_uuencode|ns_write|ns_writecontent|ns_writefp|nsv_incr)\b/,
+        /(?<_1>env|ns_adp_argc|ns_adp_argv|ns_adp_bind_args|ns_adp_break|ns_adp_debug|ns_adp_dir|ns_adp_dump|ns_adp_eval|ns_adp_exception|ns_adp_include|ns_adp_parse|ns_adp_puts|ns_adp_registertag|ns_adp_return|ns_adp_stream|ns_adp_tell|ns_adp_trunc|ns_atclose|ns_atexit|ns_atshutdown|ns_atsignal|ns_cache_flush|ns_cache_names|ns_cache_size|ns_cache_stats|ns_checkurl|ns_chmod|ns_cond|ns_config|ns_configsection|ns_configsections|ns_conn|ns_conncptofp|ns_connsendfp|ns_cp|ns_cpfp|ns_critsec|ns_crypt|ns_db|ns_dbconfigpath|ns_dberror|ns_dbformvalue|ns_dbformvalueput|ns_dbquotename|ns_dbquotevalue|ns_deleterow|ns_eval|ns_event|ns_ext|ns_findrowbyid|ns_fmttime|ns_ftruncate|ns_getcsv|ns_getform|ns_get_multipart_formdata|ns_geturl|ns_gifsize|ns_gmtime|ns_guesstype|ns_hostbyaddr|ns_hrefs|ns_httpget|ns_httpopen|ns_httptime|ns_info|ns_insertrow|ns_jpegsize|ns_kill|ns_library|ns_link|ns_localsqltimestamp|ns_localtime|ns_log|ns_logroll|ns_markfordelete|ns_mkdir|ns_mktemp|ns_modulepath|ns_mutex|ns_normalizepath|ns_param|ns_parseheader|ns_parsehttptime|ns_parsequery|ns_passwordcheck|ns_perm|ns_permpasswd|ns_pooldescription|ns_puts|ns_queryexists|ns_queryget|ns_querygetall|ns_quotehtml|ns_rand|ns_register_adptag|ns_register_filter|ns_register_proc|ns_register_trace|ns_rename|ns_requestauthorize|ns_respond|ns_return|ns_returnredirect|ns_rmdir|ns_rollfile|ns_rwlock|ns_schedule_daily|ns_schedule_proc|ns_schedule_weekly|ns_section|ns_sema|ns_sendmail|ns_server|ns_set|ns_setexpires|ns_set_precision|ns_share|ns_shutdown|ns_sleep|ns_sockaccept|ns_sockblocking|ns_sockcallback|ns_sockcheck|ns_socketpair|ns_socklistencallback|ns_socknonblocking|ns_socknread|ns_sockopen|ns_sockselect|ns_striphtml|ns_symlink|ns_thread|ns_time|ns_tmpnam|ns_truncate|ns_unlink|ns_unschedule_proc|ns_url2file|ns_urldecode|ns_urlencode|ns_uudecode|ns_uuencode|ns_write|ns_writecontent|ns_writefp|nsv_incr)\b/,
        name: "keyword.other.tcl.aolserver"},
       {include: "source.tcl"}]},
    {include: "text.html.basic"}],

data/config/syntax/HTML (Template Toolkit).rb

@@ -3,10 +3,10 @@
 {fileTypes: ["tt"],
  firstLineMatch: "\\[%.+?%\\]",
  foldingStartMarker: 
-  /(<(?i:(head|table|tr|div|style|script|ul|ol|form|dl))\b.*?>|^ *\[%[^%]*\b(?:FOR|WRAPPER|SWITCH|FOREACH|IF|UNLESS|BLOCK|MACRO|FILTER|PERL|TRY)\b(?!.*END *%\]))/,
+  /(?<_1><(?i:(?<_2>head|table|tr|div|style|script|ul|ol|form|dl))\b.*?>|^ *\[%[^%]*\b(?:FOR|WRAPPER|SWITCH|FOREACH|IF|UNLESS|BLOCK|MACRO|FILTER|PERL|TRY)\b(?!.*END *%\]))/,
  foldingStopMarker: 
-  /(<\/(?i:(head|table|tr|div|style|script|ul|ol|form|dl))>|^ *\[% *END *%\])/,
- keyEquivalent: /^~T/,
+  /(?<_1><\/(?i:(?<_2>head|table|tr|div|style|script|ul|ol|form|dl))>|^ *\[% *END *%\])/,
+ keyEquivalent: "^~T",
  name: "HTML (Template Toolkit)",
  patterns: 
   [{begin: /(?=\[% *(?:RAW)?PERL\b.*? *%\])/,
@@ -27,10 +27,10 @@
       [{captures: 
          {1 => {name: "punctuation.definition.constant.html"},
           3 => {name: "punctuation.definition.constant.html"}},
-        match: /(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)/,
+        match: /(?<_1>&)(?<_2>[a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(?<_3>;)/,
         name: "constant.character.entity.html"},
        {match: /&/, name: "invalid.illegal.bad-ampersand.html"}]},
-   keyword: {match: /\b([A-Za-z0-9_]+)/, name: "string.unquoted.tt"},
+   keyword: {match: /\b(?<_1>[A-Za-z0-9_]+)/, name: "string.unquoted.tt"},
    :"string-double-quoted" => 
     {begin: /"/,
      beginCaptures: {0 => {name: "punctuation.definition.string.begin.tt"}},
@@ -47,7 +47,7 @@
      patterns: [{include: "#embedded-code"}, {include: "#entities"}]},
    :"tag-generic-attribute" => 
     {captures: {2 => {name: "punctuation.separator.key-value.tt"}},
-     match: /\b([a-zA-Z_:-]+)\s*(=)/,
+     match: /\b(?<_1>[a-zA-Z_:-]+)\s*(?<_2>=)/,
      name: "entity.other.attribute-name.tt"},
    :"tag-stuff" => 
     {patterns: 
@@ -65,7 +65,7 @@
    :"tt-stuff" => 
     {patterns: 
       [{captures: {1 => {name: "punctuation.definition.comment.tt"}},
-        match: /(#).*?(?=%\])/,
+        match: /(?<_1>#).*?(?=%\])/,
         name: "comment.line.number-sign.tt"},
        {captures: 
          {1 => {name: "string.quoted.double.filename.tt"},
@@ -73,11 +73,11 @@
           4 => {name: "punctuation.definition.string.begin.tt"},
           5 => {name: "string.unquoted.other.filename.tt"}},
         match: 
-         /((")([a-z][a-z0-9_]+\/)+[a-z0-9_\.]+("))|(\b([a-z][a-z0-9_]+\/)+[a-z0-9_\.]+\b)/},
+         /(?<_1>(?<_2>")(?<_3>[a-z][a-z0-9_]+\/)+[a-z0-9_\.]+(?<_4>"))|(?<_5>\b(?<_6>[a-z][a-z0-9_]+\/)+[a-z0-9_\.]+\b)/},
        {include: "#string-double-quoted"},
        {include: "#string-single-quoted"},
        {captures: {1 => {name: "punctuation.definition.variable.tt"}},
-        match: /(\$?)\b[a-z]([a-z0-9_]\.?)*\b/,
+        match: /(?<_1>\$?)\b[a-z](?<_2>[a-z0-9_]\.?)*\b/,
         name: "variable.other.tt"},
        {match: 
          /\b(?:IF|END|BLOCK|INCLUDE|ELSE|ELSIF|SWITCH|CASE|UNLESS|WRAPPER|FOR|FOREACH|LAST|NEXT|USE|WHILE|FILTER|IN|GET|CALL|SET|INSERT|MACRO|PERL|TRY|CATCH|THROW|FINAL|STOP|META|DEBUG|RAWPERL)\b/,

data/config/syntax/HTML.rb

@@ -14,26 +14,26 @@
  firstLineMatch: "<!DOCTYPE|<(?i:html)|<\\?(?i:php)",
  foldingStartMarker: 
   /(?x)
-	(<(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)\b.*?>
+	(?<_1><(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)\b.*?>
 	|<!--(?!.*--\s*>)
 	|^<!--\ \#tminclude\ (?>.*?-->)$
-	|<\?(?:php)?.*\b(if|for(each)?|while)\b.+:
-	|\{\{?(if|foreach|capture|literal|foreach|php|section|strip)
-	|\{\s*($|\?>\s*$|\/\/|\/\*(.*\*\/\s*$|(?!.*?\*\/)))
+	|<\?(?:php)?.*\b(?<_2>if|for(?<_3>each)?|while)\b.+:
+	|\{\{?(?<_4>if|foreach|capture|literal|foreach|php|section|strip)
+	|\{\s*(?<_5>$|\?>\s*$|\/\/|\/\*(?<_6>.*\*\/\s*$|(?!.*?\*\/)))
 	)/,
  foldingStopMarker: 
   /(?x)
-	(<\/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)>
+	(?<_1><\/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)>
 	|^(?!.*?<!--).*?--\s*>
 	|^<!--\ end\ tminclude\ -->$
-	|<\?(?:php)?.*\bend(if|for(each)?|while)\b
-	|\{\{?\/(if|foreach|capture|literal|foreach|php|section|strip)
+	|<\?(?:php)?.*\bend(?<_2>if|for(?<_3>each)?|while)\b
+	|\{\{?\/(?<_4>if|foreach|capture|literal|foreach|php|section|strip)
 	|^[^{]*\}
 	)/,
  keyEquivalent: "^~H",
  name: "HTML",
  patterns: 
-  [{begin: /(<)([a-zA-Z0-9:]++)(?=[^>]*><\/\2>)/,
+  [{begin: /(?<_1><)(?<_2>[a-zA-Z0-9:]++)(?=[^>]*><\/\k<_2>>)/,
     beginCaptures: 
      {1 => {name: "punctuation.definition.tag.html"},
       2 => {name: "entity.name.tag.html"}},
@@ -45,7 +45,7 @@
       4 => {name: "punctuation.definition.tag.html"}},
     name: "meta.tag.any.html",
     patterns: [{include: "#tag-stuff"}]},
-   {begin: /(<\?)(xml)/,
+   {begin: /(?<_1><\?)(?<_2>xml)/,
     captures: 
      {1 => {name: "punctuation.definition.tag.html"},
       2 => {name: "entity.name.tag.xml.html"}},
@@ -67,7 +67,7 @@
     end: ">",
     name: "meta.tag.sgml.html",
     patterns: 
-     [{begin: /(DOCTYPE)/,
+     [{begin: /(?<_1>DOCTYPE)/,
        captures: {1 => {name: "entity.name.tag.doctype.html"}},
        end: "(?=>)",
        name: "meta.tag.sgml.doctype.html",
@@ -77,10 +77,10 @@
       {begin: /\[CDATA\[/,
        end: "]](?=>)",
        name: "constant.other.inline-data.html"},
-      {match: /(\s*)(?!--|>)\S(\s*)/,
+      {match: /(?<_1>\s*)(?!--|>)\S(?<_2>\s*)/,
        name: "invalid.illegal.bad-comments-or-CDATA.html"}]},
    {include: "#embedded-code"},
-   {begin: /(?:^\s+)?(<)((?i:style))\b(?![^>]*\/>)/,
+   {begin: /(?:^\s+)?(?<_1><)(?<_2>(?i:style))\b(?![^>]*\/>)/,
     captures: 
      {1 => {name: "punctuation.definition.tag.html"},
       2 => {name: "entity.name.tag.style.html"},
@@ -89,11 +89,11 @@
     name: "source.css.embedded.html",
     patterns: 
      [{include: "#tag-stuff"},
-      {begin: /(>)/,
+      {begin: /(?<_1>>)/,
        beginCaptures: {1 => {name: "punctuation.definition.tag.html"}},
        end: "(?=</(?i:style))",
        patterns: [{include: "#embedded-code"}, {include: "source.css"}]}]},
-   {begin: /(?:^\s+)?(<)((?i:script))\b(?![^>]*\/>)/,
+   {begin: /(?:^\s+)?(?<_1><)(?<_2>(?i:script))\b(?![^>]*\/>)/,
     beginCaptures: 
      {1 => {name: "punctuation.definition.tag.html"},
       2 => {name: "entity.name.tag.script.html"}},
@@ -102,14 +102,14 @@
     name: "source.js.embedded.html",
     patterns: 
      [{include: "#tag-stuff"},
-      {begin: /(?<!<\/(?:script|SCRIPT))(>)/,
+      {begin: /(?<!<\/(?:script|SCRIPT))(?<_1>>)/,
        captures: 
         {1 => {name: "punctuation.definition.tag.html"},
          2 => {name: "entity.name.tag.script.html"}},
        end: "(</)((?i:script))",
        patterns: 
         [{captures: {1 => {name: "punctuation.definition.comment.js"}},
-          match: /(\/\/).*?((?=<\/script)|$\n?)/,
+          match: /(?<_1>\/\/).*?(?<_2>(?=<\/script)|$\n?)/,
           name: "comment.line.double-slash.js"},
          {begin: /\/\*/,
           captures: {0 => {name: "punctuation.definition.comment.js"}},
@@ -117,7 +117,7 @@
           name: "comment.block.js"},
          {include: "#php"},
          {include: "source.js"}]}]},
-   {begin: /(<\/?)((?i:body|head|html)\b)/,
+   {begin: /(?<_1><\/?)(?<_2>(?i:body|head|html)\b)/,
     captures: 
      {1 => {name: "punctuation.definition.tag.html"},
       2 => {name: "entity.name.tag.structure.any.html"}},
@@ -125,7 +125,7 @@
     name: "meta.tag.structure.any.html",
     patterns: [{include: "#tag-stuff"}]},
    {begin: 
-     /(<\/?)((?i:address|blockquote|dd|div|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|menu|pre)\b)/,
+     /(?<_1><\/?)(?<_2>(?i:address|blockquote|dd|div|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|menu|pre)\b)/,
     beginCaptures: 
      {1 => {name: "punctuation.definition.tag.begin.html"},
       2 => {name: "entity.name.tag.block.any.html"}},
@@ -134,7 +134,7 @@
     name: "meta.tag.block.any.html",
     patterns: [{include: "#tag-stuff"}]},
    {begin: 
-     /(<\/?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\b)/,
+     /(?<_1><\/?)(?<_2>(?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\b)/,
     beginCaptures: 
      {1 => {name: "punctuation.definition.tag.begin.html"},
       2 => {name: "entity.name.tag.inline.any.html"}},
@@ -142,7 +142,7 @@
     endCaptures: {1 => {name: "punctuation.definition.tag.end.html"}},
     name: "meta.tag.inline.any.html",
     patterns: [{include: "#tag-stuff"}]},
-   {begin: /(<\/?)([a-zA-Z0-9:]+)/,
+   {begin: /(?<_1><\/?)(?<_2>[a-zA-Z0-9:]+)/,
     beginCaptures: 
      {1 => {name: "punctuation.definition.tag.begin.html"},
       2 => {name: "entity.name.tag.other.html"}},
@@ -165,11 +165,11 @@
       [{captures: 
          {1 => {name: "punctuation.definition.entity.html"},
           3 => {name: "punctuation.definition.entity.html"}},
-        match: /(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)/,
+        match: /(?<_1>&)(?<_2>[a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(?<_3>;)/,
         name: "constant.character.entity.html"},
        {match: /&/, name: "invalid.illegal.bad-ampersand.html"}]},
    php: 
-    {begin: /(?=(^\s*)?<\?)/,
+    {begin: /(?=(?<_1>^\s*)?<\?)/,
      end: "(?!(^\\s*)?<\\?)",
      patterns: [{include: "source.php"}]},
    python: 
@@ -189,7 +189,7 @@
         name: "source.ruby.embedded.html",
         patterns: 
          [{captures: {1 => {name: "punctuation.definition.comment.ruby"}},
-           match: /(#).*?(?=-?%>)/,
+           match: /(?<_1>#).*?(?=-?%>)/,
            name: "comment.line.number-sign.ruby"},
           {include: "source.ruby"}]},
        {begin: /<\?r(?!>)=?/,
@@ -199,12 +199,12 @@
         patterns: 
          [{captures: 
             {1 => {name: "punctuation.definition.comment.ruby.nitro"}},
-           match: /(#).*?(?=-?\?>)/,
+           match: /(?<_1>#).*?(?=-?\?>)/,
            name: "comment.line.number-sign.ruby.nitro"},
           {include: "source.ruby"}]}]},
    smarty: 
     {patterns: 
-      [{begin: /(\{(literal)\})/,
+      [{begin: /(?<_1>\{(?<_2>literal)\})/,
         captures: 
          {1 => {name: "source.smarty.embedded.html"},
           2 => {name: "support.function.built-in.smarty"}},
@@ -229,9 +229,9 @@
      name: "string.quoted.single.html",
      patterns: [{include: "#embedded-code"}, {include: "#entities"}]},
    :"tag-generic-attribute" => 
-    {match: /\b([a-zA-Z\-:]+)/, name: "entity.other.attribute-name.html"},
+    {match: /\b(?<_1>[a-zA-Z\-:]+)/, name: "entity.other.attribute-name.html"},
    :"tag-id-attribute" => 
-    {begin: /\b(id)\b\s*(=)/,
+    {begin: /\b(?<_1>id)\b\s*(?<_2>=)/,
      captures: 
       {1 => {name: "entity.other.attribute-name.id.html"},
        2 => {name: "punctuation.separator.key-value.html"}},

data/config/syntax/Haskell.rb

@@ -9,11 +9,11 @@
       2 => {name: "punctuation.definition.entity.haskell"}},
     comment: 
      "In case this regex seems unusual for an infix operator, note that Haskell allows any ordinary function application (elem 4 [1..10]) to be rewritten as an infix expression (4 `elem` [1..10]).",
-    match: /(`)[a-zA-Z_']*?(`)/,
+    match: /(?<_1>`)[a-zA-Z_']*?(?<_2>`)/,
     name: "keyword.operator.function.infix.haskell"},
    {match: /\(\)/, name: "constant.language.unit.haskell"},
    {match: /\[\]/, name: "constant.language.empty-list.haskell"},
-   {begin: /(module)/,
+   {begin: /(?<_1>module)/,
     beginCaptures: {1 => {name: "keyword.other.haskell"}},
     end: "(where)",
     endCaptures: {1 => {name: "keyword.other.haskell"}},
@@ -22,53 +22,55 @@
      [{include: "#module_name"},
       {include: "#module_exports"},
       {match: /[a-z]+/, name: "invalid"}]},
-   {begin: /\b(class)\b/,
+   {begin: /\b(?<_1>class)\b/,
     beginCaptures: {1 => {name: "keyword.other.haskell"}},
     end: "\\b(where)\\b",
     endCaptures: {1 => {name: "keyword.other.haskell"}},
     name: "meta.declaration.class.haskell",
     patterns: 
      [{match: 
-        /\b(Monad|Functor|Eq|Ord|Read|Show|Num|(Frac|Ra)tional|Enum|Bounded|Real(Frac|Float)?|Integral|Floating)\b/,
+        /\b(?<_1>Monad|Functor|Eq|Ord|Read|Show|Num|(?<_2>Frac|Ra)tional|Enum|Bounded|Real(?<_3>Frac|Float)?|Integral|Floating)\b/,
        name: "support.class.prelude.haskell"},
       {match: /[A-Z][A-Za-z_']*/,
        name: "entity.other.inherited-class.haskell"},
       {match: /\b[a-z][a-zA-Z0-9_']*\b/,
        name: "variable.other.generic-type.haskell"}]},
-   {begin: /\b(instance)\b/,
+   {begin: /\b(?<_1>instance)\b/,
     beginCaptures: {1 => {name: "keyword.other.haskell"}},
     end: "\\b(where)\\b|$",
     endCaptures: {1 => {name: "keyword.other.haskell"}},
     name: "meta.declaration.instance.haskell",
     patterns: [{include: "#type_signature"}]},
-   {begin: /(import)/,
+   {begin: /(?<_1>import)/,
     beginCaptures: {1 => {name: "keyword.other.haskell"}},
     end: "($|;)",
     name: "meta.import.haskell",
     patterns: 
-     [{match: /(qualified|as|hiding)/, name: "keyword.other.haskell"},
+     [{match: /(?<_1>qualified|as|hiding)/, name: "keyword.other.haskell"},
       {include: "#module_name"},
       {include: "#module_exports"}]},
-   {begin: /(deriving)\s*\(/,
+   {begin: /(?<_1>deriving)\s*\(/,
     beginCaptures: {1 => {name: "keyword.other.haskell"}},
     end: "\\)",
     name: "meta.deriving.haskell",
     patterns: 
      [{match: /\b[A-Z][a-zA-Z_']*/,
        name: "entity.other.inherited-class.haskell"}]},
-   {match: /\b(deriving|where|data|type|case|of|let|in|newtype|default)\b/,
+   {match: 
+     /\b(?<_1>deriving|where|data|type|case|of|let|in|newtype|default)\b/,
     name: "keyword.other.haskell"},
    {match: /\binfix[lr]?\b/, name: "keyword.operator.haskell"},
-   {match: /\b(do|if|then|else)\b/, name: "keyword.control.haskell"},
+   {match: /\b(?<_1>do|if|then|else)\b/, name: "keyword.control.haskell"},
    {comment: "Floats are always decimal",
-    match: /\b([0-9]+\.[0-9]+([eE][+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+)\b/,
+    match: 
+     /\b(?<_1>[0-9]+\.[0-9]+(?<_2>[eE][+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+)\b/,
     name: "constant.numeric.float.haskell"},
-   {match: /\b([0-9]+|0([xX][0-9a-fA-F]+|[oO][0-7]+))\b/,
+   {match: /\b(?<_1>[0-9]+|0(?<_2>[xX][0-9a-fA-F]+|[oO][0-7]+))\b/,
     name: "constant.numeric.haskell"},
    {captures: {1 => {name: "punctuation.definition.preprocessor.c"}},
     comment: 
      "In addition to Haskell's \"native\" syntax, GHC permits the C preprocessor to be run on a source file.",
-    match: /^\s*(#)\s*\w+/,
+    match: /^\s*(?<_1>#)\s*\w+/,
     name: "meta.preprocessor.c"},
    {include: "#pragma"},
    {begin: /"/,
@@ -79,7 +81,7 @@
     name: "string.quoted.double.haskell",
     patterns: 
      [{match: 
-        /\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\"'\&])/,
+        /\\(?<_1>NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\"'\&])/,
        name: "constant.character.escape.haskell"},
       {match: /\\o[0-7]+|\\x[0-9A-Fa-f]+|\\[0-9]+/,
        name: "constant.character.escape.octal.haskell"},
@@ -94,32 +96,32 @@
       6 => {name: "punctuation.definition.string.end.haskell"}},
     match: 
      /(?x)
-	(')
+	(?<_1>')
 	(?:
 	[\ -\[\]-~]								# Basic Char
-	  | (\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE
+	  | (?<_2>\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE
 	|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS
 	|US|SP|DEL|[abfnrtv\\\"'\&]))		# Escapes
-	  | (\\o[0-7]+)								# Octal Escapes
-	  | (\\x[0-9A-Fa-f]+)						# Hexadecimal Escapes
-	  | (\^[A-Z@\[\]\\\^_])						# Control Chars
+	  | (?<_3>\\o[0-7]+)								# Octal Escapes
+	  | (?<_4>\\x[0-9A-Fa-f]+)						# Hexadecimal Escapes
+	  | (?<_5>\^[A-Z@\[\]\\\^_])						# Control Chars
 	)
-	(')
+	(?<_6>')
 	/,
     name: "string.quoted.single.haskell"},
-   {begin: /^\s*([a-z_][a-zA-Z0-9_']*|\([|!%$+\-.,=<\/>]+\))\s*(::)/,
+   {begin: /^\s*(?<_1>[a-z_][a-zA-Z0-9_']*|\([|!%$+\-.,=<\/>]+\))\s*(?<_2>::)/,
     beginCaptures: 
      {1 => {name: "entity.name.function.haskell"},
       2 => {name: "keyword.other.double-colon.haskell"}},
     end: "$\\n?",
     name: "meta.function.type-declaration.haskell",
     patterns: [{include: "#type_signature"}]},
-   {match: /\b(Just|Nothing|Left|Right|True|False|LT|EQ|GT|\(\)|\[\])\b/,
+   {match: /\b(?<_1>Just|Nothing|Left|Right|True|False|LT|EQ|GT|\(\)|\[\])\b/,
     name: "support.constant.haskell"},
    {match: /\b[A-Z]\w*\b/, name: "constant.other.haskell"},
    {include: "#comments"},
    {match: 
-     /\b(abs|acos|acosh|all|and|any|appendFile|applyM|asTypeOf|asin|asinh|atan|atan2|atanh|break|catch|ceiling|compare|concat|concatMap|const|cos|cosh|curry|cycle|decodeFloat|div|divMod|drop|dropWhile|elem|encodeFloat|enumFrom|enumFromThen|enumFromThenTo|enumFromTo|error|even|exp|exponent|fail|filter|flip|floatDigits|floatRadix|floatRange|floor|fmap|foldl|foldl1|foldr|foldr1|fromEnum|fromInteger|fromIntegral|fromRational|fst|gcd|getChar|getContents|getLine|head|id|init|interact|ioError|isDenormalized|isIEEE|isInfinite|isNaN|isNegativeZero|iterate|last|lcm|length|lex|lines|log|logBase|lookup|map|mapM|mapM_|max|maxBound|maximum|maybe|min|minBound|minimum|mod|negate|not|notElem|null|odd|or|otherwise|pi|pred|print|product|properFraction|putChar|putStr|putStrLn|quot|quotRem|read|readFile|readIO|readList|readLn|readParen|reads|readsPrec|realToFrac|recip|rem|repeat|replicate|return|reverse|round|scaleFloat|scanl|scanl1|scanr|scanr1|seq|sequence|sequence_|show|showChar|showList|showParen|showString|shows|showsPrec|significand|signum|sin|sinh|snd|span|splitAt|sqrt|subtract|succ|sum|tail|take|takeWhile|tan|tanh|toEnum|toInteger|toRational|truncate|uncurry|undefined|unlines|until|unwords|unzip|unzip3|userError|words|writeFile|zip|zip3|zipWith|zipWith3)\b/,
+     /\b(?<_1>abs|acos|acosh|all|and|any|appendFile|applyM|asTypeOf|asin|asinh|atan|atan2|atanh|break|catch|ceiling|compare|concat|concatMap|const|cos|cosh|curry|cycle|decodeFloat|div|divMod|drop|dropWhile|elem|encodeFloat|enumFrom|enumFromThen|enumFromThenTo|enumFromTo|error|even|exp|exponent|fail|filter|flip|floatDigits|floatRadix|floatRange|floor|fmap|foldl|foldl1|foldr|foldr1|fromEnum|fromInteger|fromIntegral|fromRational|fst|gcd|getChar|getContents|getLine|head|id|init|interact|ioError|isDenormalized|isIEEE|isInfinite|isNaN|isNegativeZero|iterate|last|lcm|length|lex|lines|log|logBase|lookup|map|mapM|mapM_|max|maxBound|maximum|maybe|min|minBound|minimum|mod|negate|not|notElem|null|odd|or|otherwise|pi|pred|print|product|properFraction|putChar|putStr|putStrLn|quot|quotRem|read|readFile|readIO|readList|readLn|readParen|reads|readsPrec|realToFrac|recip|rem|repeat|replicate|return|reverse|round|scaleFloat|scanl|scanl1|scanr|scanr1|seq|sequence|sequence_|show|showChar|showList|showParen|showString|shows|showsPrec|significand|signum|sin|sinh|snd|span|splitAt|sqrt|subtract|succ|sum|tail|take|takeWhile|tan|tanh|toEnum|toInteger|toRational|truncate|uncurry|undefined|unlines|until|unwords|unzip|unzip3|userError|words|writeFile|zip|zip3|zipWith|zipWith3)\b/,
     name: "support.function.prelude.haskell"},
    {include: "#infix_op"},
    {comment: 
@@ -138,11 +140,11 @@
    comments: 
     {patterns: 
       [{captures: {1 => {name: "punctuation.definition.comment.haskell"}},
-        match: /(--).*$\n?/,
+        match: /(?<_1>--).*$\n?/,
         name: "comment.line.double-dash.haskell"},
        {include: "#block_comment"}]},
    infix_op: 
-    {match: /(\([|!%$+:\-.=<\/>]+\)|\(,+\))/,
+    {match: /(?<_1>\([|!%$+:\-.=<\/>]+\)|\(,+\))/,
      name: "entity.name.function.infix.haskell"},
    module_exports: 
     {begin: /\(/,
@@ -163,7 +165,7 @@
      end: "#-\\}",
      name: "meta.preprocessor.haskell",
      patterns: 
-      [{match: /\b(LANGUAGE|UNPACK|INLINE)\b/,
+      [{match: /\b(?<_1>LANGUAGE|UNPACK|INLINE)\b/,
         name: "keyword.other.preprocessor.haskell"}]},
    type_signature: 
     {patterns: 
@@ -171,13 +173,14 @@
          {1 => {name: "entity.other.inherited-class.haskell"},
           2 => {name: "variable.other.generic-type.haskell"},
           3 => {name: "keyword.other.big-arrow.haskell"}},
-        match: /\(\s*([A-Z][A-Za-z]*)\s+([a-z][A-Za-z_']*)\)\s*(=>)/,
+        match: 
+         /\(\s*(?<_1>[A-Z][A-Za-z]*)\s+(?<_2>[a-z][A-Za-z_']*)\)\s*(?<_3>=>)/,
         name: "meta.class-constraint.haskell"},
        {include: "#pragma"},
        {match: /->/, name: "keyword.other.arrow.haskell"},
        {match: /=>/, name: "keyword.other.big-arrow.haskell"},
        {match: 
-         /\b(Int(eger)?|Maybe|Either|Bool|Float|Double|Char|String|Ordering|ShowS|ReadS|FilePath|IO(Error)?)\b/,
+         /\b(?<_1>Int(?<_2>eger)?|Maybe|Either|Bool|Float|Double|Char|String|Ordering|ShowS|ReadS|FilePath|IO(?<_3>Error)?)\b/,
         name: "support.type.prelude.haskell"},
        {match: /\b[a-z][a-zA-Z0-9_']*\b/,
         name: "variable.other.generic-type.haskell"},