tm-grammars 1.23.3 → 1.23.4

package/grammars/narrat.json

@@ -127,7 +127,7 @@
           "name": "invalid.label.narrat"
         },
         {
-          "match": "(?<=\\w)[^\\^](\\b\\w+\\b)(?=([\\s\\w])*:)",
+          "match": "(?<=\\w)[^^](\\b\\w+\\b)(?=([\\s\\w])*:)",
           "name": "entity.other.attribute-name"
         }
       ]

package/grammars/nim.json

@@ -146,7 +146,7 @@
       "name": "keyword.boolean.nim"
     },
     {
-      "match": "([=+\\-*/<>@$~\\&%!?\\^.:\\\\])+",
+      "match": "([=+\\-*/<>@$~\\&%!?^.:\\\\])+",
       "name": "keyword.operator.nim"
     },
     {
@@ -1104,7 +1104,7 @@
     "float_literal": {
       "patterns": [
         {
-          "match": "\\b\\d[_\\d]*((\\.\\d[_\\d]*([eE][+\\-]?\\d[_\\d]*)?)|([eE][+\\-]?\\d[_\\d]*))('([fF](32|64|128)|[fFdD]))?",
+          "match": "\\b\\d[_\\d]*((\\.\\d[_\\d]*([eE][+-]?\\d[_\\d]*)?)|([eE][+-]?\\d[_\\d]*))('([fF](32|64|128)|[fFdD]))?",
           "name": "constant.numeric.float.decimal.nim"
         },
         {

package/grammars/nix.json

@@ -110,7 +110,7 @@
     "attribute-name": {
       "patterns": [
         {
-          "match": "\\b[a-zA-Z_][a-zA-Z0-9_'\\-]*",
+          "match": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*",
           "name": "entity.other.attribute-name.multipart.nix"
         },
         {
@@ -125,7 +125,7 @@
       ]
     },
     "attribute-name-single": {
-      "match": "\\b[a-zA-Z_][a-zA-Z0-9_'\\-]*",
+      "match": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*",
       "name": "entity.other.attribute-name.single.nix"
     },
     "attrset-contents": {
@@ -257,7 +257,7 @@
       "end": "(?=([\\])};]|\\b(else|then)\\b))",
       "patterns": [
         {
-          "begin": "(?=(\\s*}|\"|\\binherit\\b|\\$\\{|\\b[a-zA-Z_][a-zA-Z0-9_'\\-]*(\\s*\\.|\\s*=[^=])))",
+          "begin": "(?=(\\s*}|\"|\\binherit\\b|\\$\\{|\\b[a-zA-Z_][a-zA-Z0-9_'-]*(\\s*\\.|\\s*=[^=])))",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -266,7 +266,7 @@
           ]
         },
         {
-          "begin": "(?=(\\.\\.\\.|\\b[a-zA-Z_][a-zA-Z0-9_'\\-]*\\s*[,?]))",
+          "begin": "(?=(\\.\\.\\.|\\b[a-zA-Z_][a-zA-Z0-9_'-]*\\s*[,?]))",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -278,7 +278,7 @@
           "include": "#bad-reserved"
         },
         {
-          "begin": "\\b[a-zA-Z_][a-zA-Z0-9_'\\-]*",
+          "begin": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*",
           "beginCaptures": {
             "0": {
               "name": "variable.parameter.function.maybe.nix"
@@ -355,7 +355,7 @@
       ]
     },
     "bad-reserved": {
-      "match": "(?<![\\w'\\-])(if|then|else|assert|with|let|in|rec|inherit)(?![\\w'\\-])",
+      "match": "(?<![\\w'-])(if|then|else|assert|with|let|in|rec|inherit)(?![\\w'-])",
       "name": "invalid.illegal.reserved.nix"
     },
     "comment": {
@@ -511,7 +511,7 @@
           "include": "#attrset-or-function"
         },
         {
-          "match": "(\\bor\\b|\\.|\\|>|<\\||==|!=|!|<=|<|>=|>|&&|\\|\\||->|//|\\?|\\+\\+|[\\-*]|/(?=([^*]|$))|\\+)",
+          "match": "(\\bor\\b|\\.|\\|>|<\\||==|!=|!|<=|<|>=|>|&&|\\|\\||->|//|\\?|\\+\\+|[-*]|/(?=([^*]|$))|\\+)",
           "name": "keyword.operator.nix"
         },
         {
@@ -529,7 +529,7 @@
       ]
     },
     "function-body": {
-      "begin": "(@\\s*([a-zA-Z_][a-zA-Z0-9_'\\-]*)\\s*)?(:)",
+      "begin": "(@\\s*([a-zA-Z_][a-zA-Z0-9_'-]*)\\s*)?(:)",
       "end": "(?=([\\])};,]|\\b(else|then)\\b))",
       "patterns": [
         {
@@ -576,7 +576,7 @@
           "end": "(?=:)",
           "patterns": [
             {
-              "begin": "(\\b[a-zA-Z_][a-zA-Z0-9_'\\-]*)",
+              "begin": "(\\b[a-zA-Z_][a-zA-Z0-9_'-]*)",
               "beginCaptures": {
                 "0": {
                   "name": "variable.parameter.function.4.nix"
@@ -650,7 +650,7 @@
     "function-for-sure": {
       "patterns": [
         {
-          "begin": "(?=(\\b[a-zA-Z_][a-zA-Z0-9_'\\-]*\\s*[:@]|\\{[^}]*}\\s*:|\\{[^#}\"'/=]*[,?]))",
+          "begin": "(?=(\\b[a-zA-Z_][a-zA-Z0-9_'-]*\\s*[:@]|\\{[^}]*}\\s*:|\\{[^#}\"'/=]*[,?]))",
           "end": "(?=([\\])};,]|\\b(else|then)\\b))",
           "patterns": [
             {
@@ -714,7 +714,7 @@
           "end": "(?=:)",
           "patterns": [
             {
-              "begin": "(\\b[a-zA-Z_][a-zA-Z0-9_'\\-]*)",
+              "begin": "(\\b[a-zA-Z_][a-zA-Z0-9_'-]*)",
               "end": "(?=:)",
               "name": "variable.parameter.function.3.nix"
             },
@@ -765,7 +765,7 @@
           ]
         },
         {
-          "begin": "\\b[a-zA-Z_][a-zA-Z0-9_'\\-]*",
+          "begin": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*",
           "beginCaptures": {
             "0": {
               "name": "variable.parameter.function.1.nix"
@@ -994,7 +994,7 @@
       ]
     },
     "operator-unary": {
-      "match": "([!\\-])",
+      "match": "([!-])",
       "name": "keyword.operator.unary.nix"
     },
     "others": {
@@ -1016,10 +1016,10 @@
           "name": "variable.parameter.name.nix"
         }
       },
-      "match": "\\b[a-zA-Z_][a-zA-Z0-9_'\\-]*"
+      "match": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*"
     },
     "parameter-name-and-cont": {
-      "begin": "\\b[a-zA-Z_][a-zA-Z0-9_'\\-]*",
+      "begin": "\\b[a-zA-Z_][a-zA-Z0-9_'-]*",
       "beginCaptures": {
         "0": {
           "name": "variable.parameter.name.nix"
@@ -1182,7 +1182,7 @@
       "match": "\\s+"
     },
     "with-assert": {
-      "begin": "(?<![\\w'\\-])(with|assert)(?![\\w'\\-])",
+      "begin": "(?<![\\w'-])(with|assert)(?![\\w'-])",
       "beginCaptures": {
         "0": {
           "name": "keyword.other.nix"

package/grammars/nushell.json

@@ -192,7 +192,7 @@
                   ]
                 }
               },
-              "match": "(a(?:l(?:ias|l)|n(?:si(?: (?:gradient|link|strip))?|y)|ppend|st)|b(?:g|its(?: (?:and|not|or|ro[lr]|sh[lr]|xor))?|reak|ytes(?: (?:a(?:dd|t)|build|collect|ends-with|index-of|length|re(?:move|place|verse)|starts-with))?)|c(?:al|d|h(?:ar|unks)|lear|o(?:l(?:lect|umns)|m(?:mandline(?: (?:edit|get-cursor|set-cursor))?|p(?:act|lete))|n(?:fig(?: (?:env|nu|reset))?|st|tinue))|p)|d(?:ate(?: (?:format|humanize|list-timezone|now|to-(?:record|t(?:able|imezone))))?|e(?:bug(?: (?:info|profile))?|code(?: (?:base(?:32(?:hex)?|64)|hex|new-base64))?|f(?:ault)?|scribe|tect columns)|o|rop(?: (?:column|nth))?|t(?: (?:add|diff|format|now|part|to|utcnow))?|u)|e(?:ach(?: while)?|cho|moji|n(?:code(?: (?:base(?:32(?:hex)?|64)|hex|new-base64))?|umerate)|rror make|very|x(?:ec|it|p(?:l(?:ain|ore)|ort(?: (?:alias|const|def|extern|module|use)|-env)?)|tern))|f(?:i(?:l(?:[el]|ter)|nd|rst)|latten|mt|or(?:mat(?: (?:d(?:ate|uration)|filesize|pattern))?)?|rom(?: (?:csv|eml|i(?:cs|ni)|json|msgpackz?|nuon|ods|p(?:arquet|list)|ssv|t(?:oml|sv)|url|vcf|x(?:lsx|ml)|y(?:aml|ml)))?)|g(?:e(?:nerate|t)|lob|r(?:id|oup(?:-by)?)|stat)|h(?:ash(?: (?:md5|sha256))?|e(?:aders|lp(?: (?:aliases|commands|e(?:scapes|xterns)|modules|operators))?)|i(?:de(?:-env)?|sto(?:gram|ry(?: session)?))|ttp(?: (?:delete|get|head|options|p(?:atch|ost|ut)))?)|i(?:f|gnore|n(?:c|put(?: list(?:en)?)?|s(?:ert|pect)|t(?:erleave|o(?: (?:b(?:i(?:nary|ts)|ool)|cell-path|d(?:atetime|uration)|f(?:ilesize|loat)|glob|int|record|s(?:qlite|tring)|value))?))|s-(?:admin|empty|not-empty|terminal)|tems)|j(?:oin|son path|walk)|k(?:eybindings(?: (?:default|list(?:en)?))?|ill)|l(?:ast|e(?:ngth|t(?:-env)?)|ines|o(?:ad-env|op)|s)|m(?:at(?:ch|h(?: (?:a(?:bs|rc(?:cosh?|sinh?|tanh?)|vg)|c(?:eil|osh?)|exp|floor|l(?:n|og)|m(?:ax|edian|in|ode)|product|round|s(?:inh?|qrt|tddev|um)|tanh?|variance))?)|d|e(?:rge|tadata(?: (?:access|set))?)|k(?:dir|temp)|o(?:dule|ve)|ut|v)|nu-(?:check|highlight)|o(?:pen|verlay(?: (?:hide|list|new|use))?)|p(?:a(?:nic|r(?:-each|se)|th(?: (?:basename|dirname|ex(?:ists|pand)|join|parse|relative-to|split|type))?)|lugin(?: (?:add|list|rm|stop|use))?|net|o(?:lars(?: (?:a(?:gg(?:-groups)?|ll-(?:false|true)|ppend|rg-(?:m(?:ax|in)|sort|true|unique|where)|s(?:-date(?:time)?)?)|c(?:a(?:che|st)|o(?:l(?:lect|umns)?|n(?:cat(?:-str)?|tains)|unt(?:-null)?)|umulative)|d(?:atepart|ecimal|rop(?:-(?:duplicates|nulls))?|ummies)|exp(?:lode|r-not)|f(?:etch|i(?:l(?:l-n(?:an|ull)|ter(?:-with)?)|rst)|latten)|g(?:et(?:-(?:day|hour|m(?:inute|onth)|nanosecond|ordinal|second|week(?:day)?|year))?|roup-by)|i(?:mplode|nt(?:eger|o-(?:df|lazy|nu))|s-(?:duplicated|in|n(?:ot-null|ull)|unique))|join|l(?:ast|it|owercase)|m(?:ax|e(?:an|dian)|in)|n(?:-unique|ot)|o(?:pen|therwise)|p(?:ivot|rofile)|qu(?:antile|ery)|r(?:e(?:name|place(?:-all)?|verse)|olling)|s(?:a(?:mple|ve)|chema|e(?:lect|t(?:-with-idx)?)|h(?:ape|ift)|lice|ort-by|t(?:d|ore-(?:get|ls|rm)|r(?:-(?:join|lengths|slice)|ftime))|um(?:mary)?)|take|u(?:n(?:ique|pivot)|ppercase)|va(?:lue-counts|r)|w(?:hen|ith-column)))?|rt)|r(?:epend|int)|s)|query(?: (?:db|git|json|web(?:page-info)?|xml))?|r(?:an(?:dom(?: (?:b(?:inary|ool)|chars|dice|float|int|uuid))?|ge)|e(?:duce|g(?:ex|istry query)|ject|name|turn|verse)|m|o(?:ll(?: (?:down|left|right|up))?|tate)|un-external)|s(?:ave|c(?:hema|ope(?: (?:aliases|commands|e(?:ngine-stats|xterns)|modules|variables))?)|e(?:lect|q(?: (?:char|date))?)|huffle|kip(?: (?:until|while))?|leep|o(?:rt(?:-by)?|urce(?:-env)?)|plit(?: (?:c(?:ell-path|hars|olumn)|list|row|words)|-by)?|t(?:art|or(?: (?:create|delete|export|i(?:mport|nsert)|open|reset|update))?|r(?: (?:c(?:a(?:mel-case|pitalize)|ontains)|d(?:istance|owncase)|e(?:nds-with|xpand)|index-of|join|kebab-case|length|pascal-case|re(?:place|verse)|s(?:creaming-snake-case|imilarity|nake-case|ta(?:rts-with|ts)|ubstring)|t(?:itle-case|rim)|upcase)|ess_internals)?)|ys(?: (?:cpu|disks|host|mem|net|temp|users))?)|t(?:a(?:ble|ke(?: (?:until|while))?)|e(?:e|rm size)|imeit|o(?: (?:csv|html|json|m(?:d|sgpackz?)|nuon|p(?:arquet|list)|t(?:ext|oml|sv)|xml|yaml)|uch)?|r(?:anspose|y)|utor)|u(?:limit|n(?:ame|iq(?:-by)?)|p(?:date(?: cells)?|sert)|rl(?: (?:build-query|decode|encode|join|parse))?|se)|v(?:alues|ersion|iew(?: (?:files|ir|s(?:ource|pan)))?)|w(?:atch|h(?:ere|i(?:ch|le)|oami)|i(?:ndow|th-env)|rap)|zip)(?![\\w\\-])( (.*))?"
+              "match": "(a(?:l(?:ias|l)|n(?:si(?: (?:gradient|link|strip))?|y)|ppend|st)|b(?:g|its(?: (?:and|not|or|ro[lr]|sh[lr]|xor))?|reak|ytes(?: (?:a(?:dd|t)|build|collect|ends-with|index-of|length|re(?:move|place|verse)|starts-with))?)|c(?:al|d|h(?:ar|unks)|lear|o(?:l(?:lect|umns)|m(?:mandline(?: (?:edit|get-cursor|set-cursor))?|p(?:act|lete))|n(?:fig(?: (?:env|nu|reset))?|st|tinue))|p)|d(?:ate(?: (?:format|humanize|list-timezone|now|to-(?:record|t(?:able|imezone))))?|e(?:bug(?: (?:info|profile))?|code(?: (?:base(?:32(?:hex)?|64)|hex|new-base64))?|f(?:ault)?|scribe|tect columns)|o|rop(?: (?:column|nth))?|t(?: (?:add|diff|format|now|part|to|utcnow))?|u)|e(?:ach(?: while)?|cho|moji|n(?:code(?: (?:base(?:32(?:hex)?|64)|hex|new-base64))?|umerate)|rror make|very|x(?:ec|it|p(?:l(?:ain|ore)|ort(?: (?:alias|const|def|extern|module|use)|-env)?)|tern))|f(?:i(?:l(?:[el]|ter)|nd|rst)|latten|mt|or(?:mat(?: (?:d(?:ate|uration)|filesize|pattern))?)?|rom(?: (?:csv|eml|i(?:cs|ni)|json|msgpackz?|nuon|ods|p(?:arquet|list)|ssv|t(?:oml|sv)|url|vcf|x(?:lsx|ml)|y(?:aml|ml)))?)|g(?:e(?:nerate|t)|lob|r(?:id|oup(?:-by)?)|stat)|h(?:ash(?: (?:md5|sha256))?|e(?:aders|lp(?: (?:aliases|commands|e(?:scapes|xterns)|modules|operators))?)|i(?:de(?:-env)?|sto(?:gram|ry(?: session)?))|ttp(?: (?:delete|get|head|options|p(?:atch|ost|ut)))?)|i(?:f|gnore|n(?:c|put(?: list(?:en)?)?|s(?:ert|pect)|t(?:erleave|o(?: (?:b(?:i(?:nary|ts)|ool)|cell-path|d(?:atetime|uration)|f(?:ilesize|loat)|glob|int|record|s(?:qlite|tring)|value))?))|s-(?:admin|empty|not-empty|terminal)|tems)|j(?:oin|son path|walk)|k(?:eybindings(?: (?:default|list(?:en)?))?|ill)|l(?:ast|e(?:ngth|t(?:-env)?)|ines|o(?:ad-env|op)|s)|m(?:at(?:ch|h(?: (?:a(?:bs|rc(?:cosh?|sinh?|tanh?)|vg)|c(?:eil|osh?)|exp|floor|l(?:n|og)|m(?:ax|edian|in|ode)|product|round|s(?:inh?|qrt|tddev|um)|tanh?|variance))?)|d|e(?:rge|tadata(?: (?:access|set))?)|k(?:dir|temp)|o(?:dule|ve)|ut|v)|nu-(?:check|highlight)|o(?:pen|verlay(?: (?:hide|list|new|use))?)|p(?:a(?:nic|r(?:-each|se)|th(?: (?:basename|dirname|ex(?:ists|pand)|join|parse|relative-to|split|type))?)|lugin(?: (?:add|list|rm|stop|use))?|net|o(?:lars(?: (?:a(?:gg(?:-groups)?|ll-(?:false|true)|ppend|rg-(?:m(?:ax|in)|sort|true|unique|where)|s(?:-date(?:time)?)?)|c(?:a(?:che|st)|o(?:l(?:lect|umns)?|n(?:cat(?:-str)?|tains)|unt(?:-null)?)|umulative)|d(?:atepart|ecimal|rop(?:-(?:duplicates|nulls))?|ummies)|exp(?:lode|r-not)|f(?:etch|i(?:l(?:l-n(?:an|ull)|ter(?:-with)?)|rst)|latten)|g(?:et(?:-(?:day|hour|m(?:inute|onth)|nanosecond|ordinal|second|week(?:day)?|year))?|roup-by)|i(?:mplode|nt(?:eger|o-(?:df|lazy|nu))|s-(?:duplicated|in|n(?:ot-null|ull)|unique))|join|l(?:ast|it|owercase)|m(?:ax|e(?:an|dian)|in)|n(?:-unique|ot)|o(?:pen|therwise)|p(?:ivot|rofile)|qu(?:antile|ery)|r(?:e(?:name|place(?:-all)?|verse)|olling)|s(?:a(?:mple|ve)|chema|e(?:lect|t(?:-with-idx)?)|h(?:ape|ift)|lice|ort-by|t(?:d|ore-(?:get|ls|rm)|r(?:-(?:join|lengths|slice)|ftime))|um(?:mary)?)|take|u(?:n(?:ique|pivot)|ppercase)|va(?:lue-counts|r)|w(?:hen|ith-column)))?|rt)|r(?:epend|int)|s)|query(?: (?:db|git|json|web(?:page-info)?|xml))?|r(?:an(?:dom(?: (?:b(?:inary|ool)|chars|dice|float|int|uuid))?|ge)|e(?:duce|g(?:ex|istry query)|ject|name|turn|verse)|m|o(?:ll(?: (?:down|left|right|up))?|tate)|un-external)|s(?:ave|c(?:hema|ope(?: (?:aliases|commands|e(?:ngine-stats|xterns)|modules|variables))?)|e(?:lect|q(?: (?:char|date))?)|huffle|kip(?: (?:until|while))?|leep|o(?:rt(?:-by)?|urce(?:-env)?)|plit(?: (?:c(?:ell-path|hars|olumn)|list|row|words)|-by)?|t(?:art|or(?: (?:create|delete|export|i(?:mport|nsert)|open|reset|update))?|r(?: (?:c(?:a(?:mel-case|pitalize)|ontains)|d(?:istance|owncase)|e(?:nds-with|xpand)|index-of|join|kebab-case|length|pascal-case|re(?:place|verse)|s(?:creaming-snake-case|imilarity|nake-case|ta(?:rts-with|ts)|ubstring)|t(?:itle-case|rim)|upcase)|ess_internals)?)|ys(?: (?:cpu|disks|host|mem|net|temp|users))?)|t(?:a(?:ble|ke(?: (?:until|while))?)|e(?:e|rm size)|imeit|o(?: (?:csv|html|json|m(?:d|sgpackz?)|nuon|p(?:arquet|list)|t(?:ext|oml|sv)|xml|yaml)|uch)?|r(?:anspose|y)|utor)|u(?:limit|n(?:ame|iq(?:-by)?)|p(?:date(?: cells)?|sert)|rl(?: (?:build-query|decode|encode|join|parse))?|se)|v(?:alues|ersion|iew(?: (?:files|ir|s(?:ource|pan)))?)|w(?:atch|h(?:ere|i(?:ch|le)|oami)|i(?:ndow|th-env)|rap)|zip)(?![\\w-])( (.*))?"
             },
             {
               "captures": {
@@ -343,7 +343,7 @@
       ]
     },
     "extern": {
-      "begin": "((?:export\\s+)?extern)\\s+([\\w\\-]+|\"[\\w\\- ]+\")",
+      "begin": "((?:export\\s+)?extern)\\s+([\\w-]+|\"[\\w\\- ]+\")",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.nushell"
@@ -401,7 +401,7 @@
       ]
     },
     "function": {
-      "begin": "((?:export\\s+)?def(?:\\s+--\\w+)*)\\s+([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|`[\\w\\- ]+`)(\\s+--\\w+)*",
+      "begin": "((?:export\\s+)?def(?:\\s+--\\w+)*)\\s+([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|`[\\w\\- ]+`)(\\s+--\\w+)*",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.nushell"
@@ -506,12 +506,12 @@
               "name": "keyword.control.nushell"
             }
           },
-          "match": "(-{0,2}|\\.{3})[\\w\\-]+(?:\\((-[\\w?])\\))?",
+          "match": "(-{0,2}|\\.{3})[\\w-]+(?:\\((-[\\w?])\\))?",
           "name": "variable.parameter.nushell"
         },
         {
           "begin": "\\??:\\s*",
-          "end": "(?=\\s+(?:-{0,2}|\\.{3})[\\w\\-]+|\\s*(?:[,\\]|@=#]|$))",
+          "end": "(?=\\s+(?:-{0,2}|\\.{3})[\\w-]+|\\s*(?:[,\\]|@=#]|$))",
           "patterns": [
             {
               "include": "#types"
@@ -529,7 +529,7 @@
         },
         {
           "begin": "=\\s*",
-          "end": "(?=\\s+-{0,2}[\\w\\-]+|\\s*(?:[,\\]|#]|$))",
+          "end": "(?=\\s+-{0,2}[\\w-]+|\\s*(?:[,\\]|#]|$))",
           "name": "default.value.nushell",
           "patterns": [
             {
@@ -571,7 +571,7 @@
       "name": "keyword.other.nushell"
     },
     "module": {
-      "begin": "((?:export\\s+)?module)\\s+([\\w\\-]+)\\s*\\{",
+      "begin": "((?:export\\s+)?module)\\s+([\\w-]+)\\s*\\{",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.nushell"
@@ -594,11 +594,11 @@
       ]
     },
     "numbers": {
-      "match": "(?<![\\w\\-])[\\-+]?(?:\\d+|\\d{1,3}(?:_\\d{3})*)(?:\\.\\d*)?(?i:ns|us|ms|sec|min|hr|day|wk|b|kb|mb|gb|tb|pt|eb|zb|kib|mib|gib|tib|pit|eib|zib)?(?:(?![\\w.])|(?=\\.\\.))",
+      "match": "(?<![\\w-])[-+]?(?:\\d+|\\d{1,3}(?:_\\d{3})*)(?:\\.\\d*)?(?i:ns|us|ms|sec|min|hr|day|wk|b|kb|mb|gb|tb|pt|eb|zb|kib|mib|gib|tib|pit|eib|zib)?(?:(?![\\w.])|(?=\\.\\.))",
       "name": "constant.numeric.nushell"
     },
     "numbers-hexa": {
-      "match": "(?<![\\w\\-])0x\\h+(?![\\w.])",
+      "match": "(?<![\\w-])0x\\h+(?![\\w.])",
       "name": "constant.numeric.nushell"
     },
     "operators": {
@@ -628,7 +628,7 @@
           "name": "keyword.control.nushell"
         }
       },
-      "match": "(?<=\\s)(-{1,2})[\\w\\-]+",
+      "match": "(?<=\\s)(-{1,2})[\\w-]+",
       "name": "variable.parameter.nushell"
     },
     "paren-expression": {
@@ -870,7 +870,7 @@
                   "name": "variable.parameter.nushell"
                 }
               },
-              "match": "([\\w\\-]+|\"[\\w\\- ]+\"|'[^']+')\\s*:\\s*"
+              "match": "([\\w-]+|\"[\\w\\- ]+\"|'[^']+')\\s*:\\s*"
             },
             {
               "include": "#types"
@@ -897,10 +897,10 @@
               "name": "keyword.other.nushell"
             }
           },
-          "match": "^\\s*((?:export )?use)\\s+([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+')(?:\\s+([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*))?\\s*;?$"
+          "match": "^\\s*((?:export )?use)\\s+([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+')(?:\\s+([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*))?\\s*;?$"
         },
         {
-          "begin": "^\\s*((?:export )?use)\\s+([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+')\\s*\\[",
+          "begin": "^\\s*((?:export )?use)\\s+([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+')\\s*\\[",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.nushell"
@@ -922,7 +922,7 @@
                   "name": "keyword.other.nushell"
                 }
               },
-              "match": "([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*),?"
+              "match": "([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*),?"
             },
             {
               "include": "#comment"
@@ -951,7 +951,7 @@
               "name": "keyword.other.nushell"
             }
           },
-          "match": "(?<path>(?:[/\\\\]|~[/\\\\]|\\.\\.?[/\\\\])?(?:[^/\\\\]+[/\\\\])*[\\w\\- ]+(?:\\.nu)?){0}^\\s*((?:export )?use)\\s+(\"\\g<path>\"|'\\g<path>'|(?![\"'])\\g<path>)(?:\\s+([\\w\\-]+|\"[\\w\\- ]+\"|'[^']+'|\\*))?\\s*;?$"
+          "match": "(?<path>(?:[/\\\\]|~[/\\\\]|\\.\\.?[/\\\\])?(?:[^/\\\\]+[/\\\\])*[\\w\\- ]+(?:\\.nu)?){0}^\\s*((?:export )?use)\\s+(\"\\g<path>\"|'\\g<path>'|(?![\"'])\\g<path>)(?:\\s+([\\w-]+|\"[\\w\\- ]+\"|'[^']+'|\\*))?\\s*;?$"
         },
         {
           "begin": "(?<path>(?:[/\\\\]|~[/\\\\]|\\.\\.?[/\\\\])?(?:[^/\\\\]+[/\\\\])*[\\w\\- ]+(?:\\.nu)?){0}^\\s*((?:export )?use)\\s+(\"\\g<path>\"|'\\g<path>'|(?![\"'])\\g<path>)\\s+\\[",
@@ -986,7 +986,7 @@
                   "name": "keyword.other.nushell"
                 }
               },
-              "match": "([\\w\\-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*),?"
+              "match": "([\\w-]+|\"[\\w\\- ]+\"|'[\\w\\- ]+'|\\*),?"
             },
             {
               "include": "#comment"
@@ -1038,7 +1038,7 @@
       ]
     },
     "variable-fields": {
-      "match": "(?<=[)}\\]])(?:\\.(?:[\\w\\-]+|\"[\\w\\- ]+\"))+",
+      "match": "(?<=[)}\\]])(?:\\.(?:[\\w-]+|\"[\\w\\- ]+\"))+",
       "name": "variable.other.nushell"
     },
     "variables": {
@@ -1058,7 +1058,7 @@
           "name": "variable.other.nushell"
         }
       },
-      "match": "(\\$[a-zA-Z0-9_]+)((?:\\.(?:[\\w\\-]+|\"[\\w\\- ]+\"))*)"
+      "match": "(\\$[a-zA-Z0-9_]+)((?:\\.(?:[\\w-]+|\"[\\w\\- ]+\"))*)"
     }
   },
   "scopeName": "source.nushell"

package/grammars/objective-c.json

@@ -1044,7 +1044,7 @@
               "include": "#c_function_call"
             },
             {
-              "begin": "(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
+              "begin": "(?=\\s)(?<!else|new|return)(?<=\\w)\\s+(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "variable.other.objc"
@@ -1094,7 +1094,7 @@
           ]
         },
         "c_function_call": {
-          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
+          "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
           "end": "(?<=\\))(?!\\w)",
           "name": "meta.function-call.objc",
           "patterns": [
@@ -1246,7 +1246,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objc"
@@ -1306,7 +1306,7 @@
               "include": "#vararg_ellipses"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objc"
@@ -1498,7 +1498,7 @@
         },
         "numbers": {
           "begin": "(?<!\\w)(?=\\d|\\.\\d)",
-          "end": "(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))",
+          "end": "(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))",
           "patterns": [
             {
               "captures": {
@@ -1554,7 +1554,7 @@
                   "name": "keyword.operator.plus.exponent.hexadecimal.objc"
                 }
               },
-              "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?<!')([pP])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?([lLfF](?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
+              "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?:(?<=\\h)\\.|\\.(?=\\h)))(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)?((?<!')([pP])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?([lLfF](?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1607,7 +1607,7 @@
                   "name": "keyword.operator.plus.exponent.decimal.objc"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?<!')([eE])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?([lLfF](?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)?((?<!')([eE])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?([lLfF](?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1630,7 +1630,7 @@
                   "name": "keyword.other.unit.suffix.integer.objc"
                 }
               },
-              "match": "(\\G0[bB])([01](?:[01]|((?<=\\h)'(?=\\h)))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
+              "match": "(\\G0[bB])([01](?:[01]|((?<=\\h)'(?=\\h)))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1653,7 +1653,7 @@
                   "name": "keyword.other.unit.suffix.integer.objc"
                 }
               },
-              "match": "(\\G0)((?:[0-7]|((?<=\\h)'(?=\\h)))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
+              "match": "(\\G0)((?:[0-7]|((?<=\\h)'(?=\\h)))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1694,7 +1694,7 @@
                   "name": "keyword.other.unit.suffix.integer.objc"
                 }
               },
-              "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)((?<!')([pP])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
+              "match": "(\\G0[xX])(\\h(?:\\h|((?<=\\h)'(?=\\h)))*)((?<!')([pP])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
               "captures": {
@@ -1732,10 +1732,10 @@
                   "name": "keyword.other.unit.suffix.integer.objc"
                 }
               },
-              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)((?<!')([eE])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-]))"
+              "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)((?<!')([eE])(\\+)?(-)?((?-im:[0-9](?:[0-9]|(?<=\\h)'(?=\\h))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?(?!(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-]))"
             },
             {
-              "match": "(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+\\-])+",
+              "match": "(?:['0-9a-zA-Z_.]|(?<=[eEpP])[+-])+",
               "name": "invalid.illegal.constant.numeric.objc"
             }
           ]
@@ -1775,7 +1775,7 @@
               "name": "keyword.operator.logical.objc"
             },
             {
-              "match": "[\\&|\\^~]",
+              "match": "[\\&|^~]",
               "name": "keyword.operator.objc"
             },
             {
@@ -2168,7 +2168,7 @@
               "name": "punctuation.section.parens.end.bracket.round.objc"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()(?=(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[])\\s*\\()",
               "end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
               "name": "meta.function.objc",
               "patterns": [
@@ -2258,7 +2258,7 @@
               "include": "#operators"
             },
             {
-              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[\\-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
+              "begin": "(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()((?:[A-Za-z_][A-Za-z0-9_]*+|::)++|(?<=operator)(?:[-*\\&<>=+!]+|\\(\\)|\\[]))\\s*(\\()",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.objc"
@@ -3300,7 +3300,7 @@
       ]
     },
     "method": {
-      "begin": "^([\\-+])\\s*",
+      "begin": "^([-+])\\s*",
       "end": "(?=[{#])|;",
       "name": "meta.function.objc",
       "patterns": [
@@ -3378,7 +3378,7 @@
       ]
     },
     "method_super": {
-      "begin": "^(?=[\\-+])",
+      "begin": "^(?=[-+])",
       "end": "(?<=})|(?=#)",
       "name": "meta.function-with-body.objc",
       "patterns": [