tm-grammars 1.22.19 → 1.23.0

package/grammars/haml.json

@@ -4,7 +4,7 @@
     "haml",
     "html.haml"
   ],
-  "foldingStartMarker": "^\\s*([-%#\\:\\.\\w\\=].*)\\s$",
+  "foldingStartMarker": "^\\s*([\\-%#:.\\w=].*)\\s$",
   "foldingStopMarker": "^\\s*$",
   "name": "haml",
   "patterns": [
@@ -73,11 +73,11 @@
           "name": "punctuation.section.comment.haml"
         }
       },
-      "match": "^(\\s*)(\\/\\[[^\\]].*?$\\n?)",
+      "match": "^(\\s*)(/\\[[^\\]].*?$\\n?)",
       "name": "comment.line.slash.haml"
     },
     {
-      "begin": "^(\\s*)(\\-\\#|\\/|\\-\\s*\\/\\*+)",
+      "begin": "^(\\s*)(-#|/|-\\s*/\\*+)",
       "beginCaptures": {
         "2": {
           "name": "punctuation.section.comment.haml"
@@ -92,7 +92,7 @@
       ]
     },
     {
-      "begin": "^\\s*(?:((%)([-\\w:]+))|(?=\\.|#))",
+      "begin": "^\\s*(?:((%)([\\-\\w:]+))|(?=[.#]))",
       "captures": {
         "1": {
           "name": "meta.tag.haml"
@@ -104,7 +104,7 @@
           "name": "entity.name.tag.haml"
         }
       },
-      "end": "$|(?!\\.|#|\\{|\\(|\\[|&|=|-|~|!=|&=|/)",
+      "end": "$|(?![.#{(\\[]|&|[=\\-~]|!=|&=|/)",
       "patterns": [
         {
           "begin": "==",
@@ -122,7 +122,7 @@
               "name": "entity.other.attribute-name.class"
             }
           },
-          "match": "(\\.[\\w\\-\\:]+)",
+          "match": "(\\.[\\w\\-:]+)",
           "name": "meta.selector.css"
         },
         {
@@ -131,12 +131,12 @@
               "name": "entity.other.attribute-name.id"
             }
           },
-          "match": "(#[\\w-]+)",
+          "match": "(#[\\w\\-]+)",
           "name": "meta.selector.css"
         },
         {
-          "begin": "(?<!\\#)\\{(?=.*(,|(do)|\\{|\\}|\\||(\\#.*)|\\R)\\s*)",
-          "end": "\\s*\\}(?!\\s*\\,)(?!\\s*\\|)(?!\\#\\{.*\\})",
+          "begin": "(?<!#)\\{(?=.*(,|(do)|[{}|]|(#.*)|\\R)\\s*)",
+          "end": "\\s*}(?!\\s*,)(?!\\s*\\|)(?!#\\{.*})",
           "name": "meta.section.attributes.haml",
           "patterns": [
             {
@@ -156,11 +156,11 @@
           "name": "meta.section.attributes.plain.haml",
           "patterns": [
             {
-              "match": "([\\w-]+)",
+              "match": "([\\w\\-]+)",
               "name": "constant.other.symbol.ruby"
             },
             {
-              "match": "\\=",
+              "match": "=",
               "name": "punctuation"
             },
             {
@@ -186,8 +186,8 @@
           ]
         },
         {
-          "begin": "\\[(?=.+(,|\\[|\\]|\\||(\\#.*))\\s*)",
-          "end": "\\s*\\](?!.*(?!\\#\\[)\\])",
+          "begin": "\\[(?=.+([,\\[\\]|]|(#.*))\\s*)",
+          "end": "\\s*](?!.*(?!#\\[)])",
           "name": "meta.section.object.haml",
           "patterns": [
             {
@@ -234,7 +234,7 @@
       ]
     },
     {
-      "begin": "^(\\s*):(style|sass)$",
+      "begin": "^(\\s*):(s(?:tyle|ass))$",
       "end": "^(?=\\1\\s+|$\\n*)",
       "name": "source.sass.embedded.filter.haml",
       "patterns": [
@@ -294,7 +294,7 @@
       ]
     },
     {
-      "begin": "^(\\s*):(styles|sass)$",
+      "begin": "^(\\s*):(s(?:tyles|ass))$",
       "end": "^(?=\\1\\s+|$\\n*)",
       "name": "source.sass.embedded.filter.haml",
       "patterns": [
@@ -322,7 +322,7 @@
       "match": "^\\s*(\\.)"
     },
     {
-      "begin": "^\\s*(?==|-|~|!=|&=)",
+      "begin": "^\\s*(?=[=\\-~]|!=|&=)",
       "end": "$",
       "patterns": [
         {
@@ -429,7 +429,7 @@
               "name": "source.ruby.embedded.source.empty"
             }
           },
-          "match": "#\\{(\\})",
+          "match": "#\\{(})",
           "name": "source.ruby.embedded.source"
         },
         {
@@ -439,7 +439,7 @@
               "name": "punctuation.section.embedded.ruby"
             }
           },
-          "end": "(\\})",
+          "end": "(})",
           "name": "source.ruby.embedded.source",
           "patterns": [
             {
@@ -478,7 +478,7 @@
               "name": "punctuation.section.scope.ruby"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "patterns": [
             {
               "include": "#nest_curly_and_self"
@@ -491,7 +491,7 @@
       ]
     },
     "rubyline": {
-      "begin": "(&amp|!)?(=|-|~)",
+      "begin": "(&amp|!)?([=\\-~])",
       "contentName": "source.ruby.embedded.haml",
       "end": "((do|\\{)( \\|[.*]+\\|)?)$|$|^(?!.*\\|\\s*)$\\n?",
       "endCaptures": {
@@ -510,7 +510,7 @@
               "name": "keyword.control.php"
             }
           },
-          "match": "\\s+((elseif|foreach|switch|declare|default|use))(?=\\s|\\()"
+          "match": "\\s+((elseif|foreach|switch|declare|default|use))(?=[\\s(])"
         },
         {
           "captures": {
@@ -518,10 +518,10 @@
               "name": "keyword.control.import.include.php"
             }
           },
-          "match": "\\s+(require_once|include_once)(?=\\s|\\()"
+          "match": "\\s+(require_once|include_once)(?=[\\s(])"
         },
         {
-          "match": "\\s+(catch|try|throw|exception|finally|die)(?=\\s|\\(|\\n*)",
+          "match": "\\s+(catch|try|throw|exception|finally|die)(?=[\\s(]|\\n*)",
           "name": "keyword.control.exception.php"
         },
         {
@@ -541,7 +541,7 @@
           "match": "\\s+(use\\s*)((?=\\())"
         },
         {
-          "match": "(\\||,|<|do|\\{)\\s*(\\#.*)?$\\n*",
+          "match": "([|,<]|do|\\{)\\s*(#.*)?$\\n*",
           "name": "source.ruby",
           "patterns": [
             {

package/grammars/handlebars.json

@@ -41,7 +41,7 @@
       "patterns": [
         {
           "begin": "\\{\\{!--",
-          "end": "--\\}\\}",
+          "end": "--}}",
           "name": "comment.block.handlebars",
           "patterns": [
             {
@@ -72,7 +72,7 @@
       ]
     },
     "block_helper": {
-      "begin": "(\\{\\{)(~?\\#)([-a-zA-Z0-9_\\./>]+)\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*",
+      "begin": "(\\{\\{)(~?#)([\\-a-zA-Z0-9_./>]+)\\s?(@?[\\-a-zA-Z0-9_./]+)*\\s?(@?[\\-a-zA-Z0-9_./]+)*\\s?(@?[\\-a-zA-Z0-9_./]+)*",
       "beginCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -96,7 +96,7 @@
           "name": "support.constant.handlebars"
         }
       },
-      "end": "(~?\\}\\})",
+      "end": "(~?}})",
       "endCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -116,7 +116,7 @@
       "patterns": [
         {
           "begin": "\\{\\{!",
-          "end": "\\}\\}",
+          "end": "}}",
           "name": "comment.block.handlebars",
           "patterns": [
             {
@@ -147,7 +147,7 @@
       ]
     },
     "else_token": {
-      "begin": "(\\{\\{)(~?else)(@?\\s(if)\\s([-a-zA-Z0-9_\\.\\(\\s\\)/]+))?",
+      "begin": "(\\{\\{)(~?else)(@?\\s(if)\\s([\\-a-zA-Z0-9_.(\\s)/]+))?",
       "beginCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -162,7 +162,7 @@
           "name": "variable.parameter.handlebars"
         }
       },
-      "end": "(~?\\}\\}\\}*)",
+      "end": "(~?}}}*)",
       "endCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -171,7 +171,7 @@
       "name": "meta.function.inline.else.handlebars"
     },
     "end_block": {
-      "begin": "(\\{\\{)(~?/)([a-zA-Z0-9/_\\.-]+)\\s*",
+      "begin": "(\\{\\{)(~?/)([a-zA-Z0-9/_.\\-]+)\\s*",
       "beginCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -183,7 +183,7 @@
           "name": "support.constant.handlebars keyword.control"
         }
       },
-      "end": "(~?\\}\\})",
+      "end": "(~?}})",
       "endCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -204,7 +204,7 @@
               "name": "punctuation.definition.entity.html"
             }
           },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.html"
         },
         {
@@ -224,7 +224,7 @@
     "extends": {
       "patterns": [
         {
-          "begin": "(\\{\\{!<)\\s([-a-zA-Z0-9_\\./]+)",
+          "begin": "(\\{\\{!<)\\s([\\-a-zA-Z0-9_./]+)",
           "beginCaptures": {
             "1": {
               "name": "support.function.handlebars"
@@ -233,7 +233,7 @@
               "name": "support.class.handlebars"
             }
           },
-          "end": "(\\}\\})",
+          "end": "(}})",
           "endCaptures": {
             "1": {
               "name": "support.function.handlebars"
@@ -254,23 +254,23 @@
       ]
     },
     "handlebars_attribute_name": {
-      "begin": "\\b([-a-zA-Z0-9_\\.]+)\\b=",
+      "begin": "\\b([\\-a-zA-Z0-9_.]+)\\b=",
       "captures": {
         "1": {
           "name": "variable.parameter.handlebars"
         }
       },
-      "end": "(?='|\"|)",
+      "end": "(?=['\"]|)",
       "name": "entity.other.attribute-name.handlebars"
     },
     "handlebars_attribute_value": {
-      "begin": "([-a-zA-Z0-9_\\./]+)\\b",
+      "begin": "([\\-a-zA-Z0-9_./]+)\\b",
       "captures": {
         "1": {
           "name": "variable.parameter.handlebars"
         }
       },
-      "end": "('|\"|)",
+      "end": "(['\"]|)",
       "name": "entity.other.attribute-value.handlebars",
       "patterns": [
         {
@@ -281,7 +281,7 @@
     "html_tags": {
       "patterns": [
         {
-          "begin": "(<)([a-zA-Z0-9:-]+)(?=[^>]*></\\2>)",
+          "begin": "(<)([a-zA-Z0-9:\\-]+)(?=[^>]*></\\2>)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.html"
@@ -517,7 +517,7 @@
           ]
         },
         {
-          "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)",
+          "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|[qs]|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b)",
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.html"
@@ -535,7 +535,7 @@
           ]
         },
         {
-          "begin": "(</?)([a-zA-Z0-9:-]+)",
+          "begin": "(</?)([a-zA-Z0-9:\\-]+)",
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.html"
@@ -553,7 +553,7 @@
           ]
         },
         {
-          "begin": "(</?)([a-zA-Z0-9{}:-]+)",
+          "begin": "(</?)([a-zA-Z0-9{}:\\-]+)",
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.html"
@@ -584,7 +584,7 @@
       ]
     },
     "inline_script": {
-      "begin": "(?:^\\s+)?(<)((?i:script))\\b(?:.*(type)=([\"'](?:text/x-handlebars-template|text/x-handlebars|text/template|x-tmpl-handlebars)[\"']))(?![^>]*/>)",
+      "begin": "(?:^\\s+)?(<)((?i:script))\\b.*(type)=([\"'](?:text/x-handlebars-template|text/x-handlebars|text/template|x-tmpl-handlebars)[\"'])(?![^>]*/>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.html"
@@ -651,7 +651,7 @@
       ]
     },
     "partial_and_var": {
-      "begin": "(\\{\\{~?\\{*(>|!<)*)\\s*(@?[-a-zA-Z0-9$_\\./]+)*",
+      "begin": "(\\{\\{~?\\{*(>|!<)*)\\s*(@?[\\-a-zA-Z0-9$_./]+)*",
       "beginCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -660,7 +660,7 @@
           "name": "variable.parameter.handlebars"
         }
       },
-      "end": "(~?\\}\\}\\}*)",
+      "end": "(~?}}}*)",
       "endCaptures": {
         "1": {
           "name": "support.constant.handlebars"
@@ -794,7 +794,7 @@
       ]
     },
     "tag_generic_attribute": {
-      "begin": "\\b([a-zA-Z0-9_-]+)\\b\\s*(=)",
+      "begin": "\\b([a-zA-Z0-9_\\-]+)\\b\\s*(=)",
       "captures": {
         "1": {
           "name": "entity.other.attribute-name.generic.html"
@@ -803,7 +803,7 @@
           "name": "punctuation.separator.key-value.html"
         }
       },
-      "end": "(?<='|\"|)",
+      "end": "(?<=['\"]|)",
       "name": "entity.other.attribute-name.html",
       "patterns": [
         {
@@ -821,7 +821,7 @@
           "name": "punctuation.separator.key-value.html"
         }
       },
-      "end": "(?<='|\"|)",
+      "end": "(?<=['\"]|)",
       "name": "meta.attribute-with-value.id.html",
       "patterns": [
         {