github-linguist 5.0.10 → 5.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c924eee743b231bbb121431200f0e893e0fb80e
-  data.tar.gz: b8c2aab1081e4704700baf6d96c4a195bb51fa05
+  metadata.gz: be4ca8e9b7fc0d8d4f66e9452bc30a9dd53dbc4f
+  data.tar.gz: e6f5e865a36ea47f3742dbeda2bbd2178a4633e1
 SHA512:
-  metadata.gz: aa7ddd480171fd3b4ca65b2e4b16967b53740e243782d030e8a37a32f9c7d1f07bb398b186896986d031eaae76142c615a216ea882aef25c8494cd1e31e4a9e4
-  data.tar.gz: 1ec2d8569863f884d702209efb9f46975fec801de2726fe7ac943eac8dbb4f8ce0a0564f9c19acbaf88df9faa604662e7e45234babbc19f3eea832bcb8984f3e
+  metadata.gz: 7daf29c664da91d1430565e8485ab48dc86b00ae124b54d51b2a788faaab90da18b199023ec84c3e956b57ceb8ef66f0e62f1bd221d16de332447aaac74437d1
+  data.tar.gz: 2b27caa7535e57783c63dd22b03cd95ad44568c5575a47cb044972f4e13fe4a521eb6baef1bb0c5bdc38cd96da298a07169a83fb029ed0563047271ff173b9df

data/grammars/source.batchfile.json

@@ -5,87 +5,376 @@
     "bat",
     "cmd"
   ],
-  "foldingStartMarker": ".*\\(\\s*$",
-  "foldingStopMarker": "^\\s*\\)\\s*$",
   "patterns": [
     {
-      "include": "#comment"
+      "include": "#commands"
     },
     {
-      "include": "#constant"
+      "include": "#comments"
     },
     {
-      "include": "#keyword"
+      "include": "#constants"
     },
     {
-      "include": "#label"
+      "include": "#controls"
     },
     {
-      "include": "#redirection"
+      "include": "#escaped_characters"
     },
     {
-      "include": "#string"
+      "include": "#labels"
     },
     {
-      "include": "#variable"
+      "include": "#numbers"
+    },
+    {
+      "include": "#operators"
+    },
+    {
+      "include": "#parens"
+    },
+    {
+      "include": "#strings"
+    },
+    {
+      "include": "#variables"
     }
   ],
   "repository": {
-    "comment": {
+    "commands": {
       "patterns": [
         {
-          "captures": {
-            "1": "keyword.command.rem.batchfile"
+          "match": "\\b(?i:adprep|append|arp|assoc|at|atmadm|attrib|auditpol|autochk|autoconv|autofmt|bcdboot|bcdedit|bdehdcfg|bitsadmin|bootcfg|brea|cacls|cd|certreq old|certreq|certutil|change|chcp|chdir|chglogon|chgport|chgusr|chkdsk|chkntfs|choice|cipher|clip|clscluadmin|cluster|cmd|cmdkey|cmstp|color|comp|compact|convert|copy|cprofile|cscript|csvde|date|dcdiag|dcgpofix|dcpromo|defra|del|dfscmd|dfsdiag|dfsrmig|diantz|dir|dirquota|diskcomp|diskcopy|diskpart commands|diskperf|diskraid|diskshadow|dispdiag|doin|dnscmd|doskey|driverquery|dsacls|dsadd|dsamain|dsdbutil|dsget|dsmgmt|dsmod|dsmove|dsquery|dsrm|edit|endlocal|eraseesentutl|eventcreate|eventquery.vbs|eventtriggers|evntcmd|expand|extract|fc|filescrn|find|findstr|finger|flattemp|fonde|for|forfiles|format|freedisk|fsutil|ftp|ftype|fveupdate|getmac|gettype|gpfixup|gpresult|gpupdate|graftabl|hashgen|hep|helpctr|hostname|icacls|iisreset|inuse|ipconfig|ipxroute|irftp|ismserv|jetpack|klist|ksetup|ktmutil|ktpass|label|ldifd|ldp|lodctr|logman|logoff|lpq|lpr|macfile|makecab|manage-bde|mapadmin|md|mkdir|mklink|mmc|mode|more|mount|mountvol|move|mqbup|mqsvc|mqtgsvc|msdt|msg|msiexec|msinfo32|mstsc|nbtstat|net computer|net group|net localgroup|net print|net session|net share|net start|net stop|net use|net user|net view|net|netcfg|netdiag|netdom|netsh|netstat|nfsadmin|nfsshare|nfsstat|nlb|nlbmgr|nltest|nslookup|ntackup|ntcmdprompt|ntdsutil|ntfrsutl|openfiles|pagefileconfig.vbs|path|pathping|pause|pbadmin|pentnt|perfmon|ping|pnpunatten|pnputil|popd|powercfg|powershell|powershell_ise|print|prncnfg.vbs|prndrvr.vbs|prnjobs.vbs|prnmngr.vbs|prnport.vbs|prnqctl.bs|prompt|pubprn.vbs|pushd|pushprinterconnections|pwlauncher|qappsrv|qprocess|query|quser|qwinsta|rasdial|rcp|rd|rdpsign|regentc|recover|redircmp|redirusr|reg|regini|regsvr32|relog|ren|rename|rendom|repadmin|repair-bde|replace|reset session|rxec|risetup|rmdir|robocopy|route|rpcinfo|rpcping|rsh|runas|rundll32|rwinsta|sc|schtasks|scwcmd|secedit|serverceipoptin|servrmanagercmd|serverweroptin|setlocal|setspn|setx|sfc|shadow|shift|showmount|shutdown|sort|start|storrept|subst|sxstrace|ysocmgr|systeminfo|takeown|tapicfg|taskkill|tasklist|tcmsetup|telnet|tftp|time|timeout|title|tlntadmn|tpmvscmgr|tpmvscmgr|tacerpt|tracert|tree|tscon|tsdiscon|tsecimp|tskill|tsprof|type|typeperf|tzutil|uddiconfig|umount|unlodctr|ver|verifier|verif|vol|vssadmin|w32tm|waitfor|wbadmin|wdsutil|wecutil|wevtutil|where|whoami|winnt|winnt32|winpop|winrm.cmd|winrs|winsat|wlbs|mic|wscript|xcopy)\\b",
+          "name": "keyword.command.batchfile"
+        },
+        {
+          "begin": "\\b(?i:echo)\\b",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.command.batchfile"
+            }
           },
-          "match": "^\\s*((?i)rem)(?:$|\\s.*$)",
-          "name": "comment.line.rem.batchfile"
+          "end": "(?=$\\n|[&|><)])",
+          "patterns": [
+            {
+              "include": "#escaped_characters"
+            },
+            {
+              "include": "#variables"
+            },
+            {
+              "include": "#numbers"
+            },
+            {
+              "include": "#strings"
+            }
+          ]
         },
         {
-          "match": "^\\s*::.*$",
-          "name": "comment.line.colons.batchfile"
+          "include": "#command_set"
         }
       ]
     },
-    "constant": {
+    "command_set": {
       "patterns": [
         {
-          "match": "\\b(?i)nul\\b",
-          "name": "constant.language.nul.batchfile"
-        },
-        {
-          "match": "\\^",
-          "name": "constant.character.escape.batchfile"
+          "begin": "(?i)\\bSET\\b",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.command.batchfile"
+            }
+          },
+          "end": "(?=$\\n|[&|><)])",
+          "patterns": [
+            {
+              "include": "#command_set_inside"
+            }
+          ]
         }
       ]
     },
-    "keyword": {
+    "command_set_inside": {
       "patterns": [
         {
-          "match": "\\b(?i)(?:append|assoc|at|attrib|break|cacls|cd|chcp|chdir|chkdsk|chkntfs|cls|cmd|color|comp|compact|convert|copy|date|del|dir|diskcomp|diskcopy|doskey|endlocal|erase|fc|find|findstr|format|ftype|graftabl|help|keyb|label|md|mkdir|mode|more|move|path|pause|popd|print|prompt|pushd|rd|recover|rem|ren|rename|replace|restore|rmdir|set|setlocal|shift|sort|start|subst|time|title|tree|type|ver|verify|vol|xcopy)\\b",
-          "name": "keyword.command.batchfile"
+          "include": "#escaped_characters"
         },
         {
-          "match": "\\b(?i)(echo)\\b(.*)\\n",
-          "captures": {
+          "include": "#variables"
+        },
+        {
+          "include": "#numbers"
+        },
+        {
+          "include": "#parens"
+        },
+        {
+          "include": "#strings"
+        },
+        {
+          "begin": "(\")\\s*([^ ][^=]*)(=)\"?",
+          "beginCaptures": {
             "1": {
-              "name": "keyword.command.batchfile"
+              "name": "punctuation.definition.string.begin.batchfile"
+            },
+            "2": {
+              "name": "variable.other.readwrite.batchfile"
+            },
+            "3": {
+              "name": "keyword.operator.assignment.batchfile"
+            }
+          },
+          "end": "\"",
+          "endCaptures": {
+            "0": {
+              "name": "string.quoted.double.batchfile"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#escaped_characters"
+            },
+            {
+              "include": "#variables"
+            },
+            {
+              "include": "#numbers"
+            },
+            {
+              "include": "#parens"
+            }
+          ]
+        },
+        {
+          "begin": "([^ ][^=]*)(=)",
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.readwrite.batchfile"
             },
             "2": {
+              "name": "keyword.operator.assignment.batchfile"
+            }
+          },
+          "end": "(?=$\\n|[&|><)])",
+          "patterns": [
+            {
+              "include": "#escaped_characters"
+            },
+            {
+              "include": "#variables"
+            },
+            {
+              "include": "#numbers"
+            },
+            {
+              "include": "#parens"
+            },
+            {
+              "include": "#strings"
+            }
+          ]
+        },
+        {
+          "begin": "\\s+/[aA]\\s+",
+          "end": "(?=$\\n|[&|><)])",
+          "name": "meta.expression.set.batchfile",
+          "patterns": [
+            {
+              "include": "#command_set_inside_arithmetic"
+            },
+            {
+              "include": "#command_set_group"
+            },
+            {
+              "begin": "\"",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.begin.batchfile"
+                }
+              },
+              "end": "\"",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.end.batchfile"
+                }
+              },
+              "name": "string.quoted.double.batchfile",
               "patterns": [
                 {
-                  "include": "#variable"
+                  "include": "#command_set_inside_arithmetic"
+                },
+                {
+                  "include": "#command_set_group"
+                },
+                {
+                  "include": "#variables"
                 }
               ]
             }
-          }
+          ]
+        },
+        {
+          "begin": "\\s+/[pP]\\s+",
+          "end": "(?=$\\n|[&|><)])",
+          "patterns": [
+            {
+              "begin": "([^ ][^=]*)(=)",
+              "beginCaptures": {
+                "1": {
+                  "name": "variable.other.readwrite.batchfile"
+                },
+                "2": {
+                  "name": "keyword.operator.assignment.batchfile"
+                }
+              },
+              "end": "(?=$\\n|[&|><)])",
+              "name": "meta.prompt.set.batchfile",
+              "patterns": [
+                {
+                  "include": "#strings"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "command_set_group": {
+      "patterns": [
+        {
+          "begin": "\\(",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.group.begin.batchfile"
+            }
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.group.end.batchfile"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#command_set_inside_arithmetic"
+            }
+          ]
+        }
+      ]
+    },
+    "command_set_inside_arithmetic": {
+      "patterns": [
+        {
+          "include": "#command_set_operators"
+        },
+        {
+          "include": "#numbers"
+        },
+        {
+          "include": "#comma_separator"
+        }
+      ]
+    },
+    "command_set_operators": {
+      "patterns": [
+        {
+          "match": "\\+\\=|\\-\\=|\\*\\=|/\\=|%%\\=|&\\=|\\|\\=|\\^\\=|<<\\=|>>\\=",
+          "name": "keyword.operator.assignment.augmented.batchfile"
+        },
+        {
+          "match": "\\+|\\-|/|\\*|%%|\\||&|\\^|<<|>>|~",
+          "name": "keyword.operator.arithmetic.batchfile"
+        },
+        {
+          "match": "!",
+          "name": "keyword.operator.logical.batchfile"
+        },
+        {
+          "match": "=",
+          "name": "keyword.operator.assignment.batchfile"
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
+        {
+          "begin": "(?:^|(&))\\s*(?=((?::[+=,;: ])))",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.conditional.batchfile"
+            }
+          },
+          "end": "\\n",
+          "patterns": [
+            {
+              "begin": "((?::[+=,;: ]))",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.comment.batchfile"
+                }
+              },
+              "end": "(?=\\n)",
+              "name": "comment.line.colon.batchfile"
+            }
+          ]
+        },
+        {
+          "begin": "\\b(?i)(REM)(\\.)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.command.rem.batchfile"
+            },
+            "2": {
+              "name": "punctuation.separator.batchfile"
+            }
+          },
+          "end": "(?=$\\n|[&|><)])",
+          "name": "comment.line.rem.batchfile"
         },
+        {
+          "begin": "\\b(?i)rem\\b",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.command.rem.batchfile"
+            }
+          },
+          "end": "\\n",
+          "name": "comment.line.rem.batchfile",
+          "patterns": [
+            {
+              "match": "[><|]",
+              "name": "invalid.illegal.unexpected-character.batchfile"
+            }
+          ]
+        }
+      ]
+    },
+    "constants": {
+      "patterns": [
+        {
+          "match": "\\b(?i:NUL)\\b",
+          "name": "constant.language.batchfile"
+        }
+      ]
+    },
+    "controls": {
+      "patterns": [
         {
           "match": "\\b(?i)(?:goto|call|exit)\\b",
           "name": "keyword.control.statement.batchfile"
         },
         {
-          "match": "\\b(?i)if\\s+((not)\\s+)?(exist|defined|errorlevel|cmdextversion)\\b",
-          "name": "keyword.control.conditional.if.batchfile"
+          "match": "\\b(?i)(if)\\s+(?:(not)\\s+)?(exist|defined|errorlevel|cmdextversion)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.control.conditional.batchfile"
+            },
+            "2": {
+              "name": "keyword.operator.logical.batchfile"
+            },
+            "3": {
+              "name": "keyword.other.special-method.batchfile"
+            }
+          }
         },
         {
           "match": "\\b(?i)(?:if|else)\\b",
@@ -94,19 +383,85 @@
         {
           "match": "\\b(?i)for\\b",
           "name": "keyword.control.repeat.batchfile"
+        }
+      ]
+    },
+    "escaped_characters": {
+      "patterns": [
+        {
+          "match": "%%|\\^\\^!|\\^.|\\^\\n",
+          "name": "constant.character.escape.batchfile"
+        }
+      ]
+    },
+    "labels": {
+      "patterns": [
+        {
+          "match": "^\\s*(:)([^+=,;:\\s].*)$",
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.batchfile"
+            },
+            "2": {
+              "name": "entity.name.label.batchfile"
+            }
+          }
+        }
+      ]
+    },
+    "numbers": {
+      "patterns": [
+        {
+          "match": "\\b(0[xX]\\h*|[+-]?\\d+)\\b",
+          "name": "constant.numeric.batchfile"
+        }
+      ]
+    },
+    "operators": {
+      "patterns": [
+        {
+          "match": "@(?=\\S)",
+          "name": "keyword.operator.at.batchfile"
+        },
+        {
+          "match": "\\b(?i:EQU|NEQ|LSS|LEQ|GTR|GEQ)\\b|==",
+          "name": "keyword.operator.comparison.batchfile"
         },
         {
-          "match": "\\b(?i)(?:equ|neq|lss|leq|gtr|geq)\\b",
-          "name": "keyword.operator.batchfile"
+          "match": "\\b(?i:NOT)\\b",
+          "name": "keyword.operator.logical.batchfile"
         },
         {
-          "begin": "^\\s*(@)",
+          "match": "&&?|\\|\\|",
+          "name": "keyword.operator.conditional.batchfile"
+        },
+        {
+          "match": "\\|",
+          "name": "keyword.operator.pipe.batchfile"
+        },
+        {
+          "match": "<&?|>[&>]?",
+          "name": "keyword.operator.redirection.batchfile"
+        }
+      ]
+    },
+    "parens": {
+      "patterns": [
+        {
+          "begin": "\\(",
           "beginCaptures": {
-            "1": "punctuation.definition.bold.silent.batchfile"
+            "0": "punctuation.section.group.begin.batchfile"
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": "punctuation.section.group.end.batchfile"
           },
-          "end": "\\s+",
-          "name": "keyword.other.silent.batchfile",
+          "name": "meta.group.batchfile",
           "patterns": [
+            {
+              "match": ",|;",
+              "name": "punctuation.separator.batchfile"
+            },
             {
               "include": "$self"
             }
@@ -114,79 +469,225 @@
         }
       ]
     },
-    "label": {
+    "strings": {
       "patterns": [
         {
-          "match": ":[\\w][\\w -]+\\s",
-          "name": "keyword.other.special-method.batchfile"
+          "begin": "\"",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.batchfile"
+            }
+          },
+          "end": "(\")|($)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.batchfile"
+            },
+            "2": {
+              "name": "invalid.illegal.newline.batchfile"
+            }
+          },
+          "name": "string.quoted.double.batchfile",
+          "patterns": [
+            {
+              "include": "#escaped_characters"
+            },
+            {
+              "include": "#variables"
+            }
+          ]
         }
       ]
     },
-    "redirection": {
+    "variables": {
       "patterns": [
         {
-          "match": "&>|\\d*>&\\d*|\\d*(>>|>|<)|\\d*<&|\\d*<>",
-          "name": "keyword.operator.redirect.batchfile"
+          "match": "(%)((~([fdpnxsatz]|\\$PATH:)*)?\\d|\\*)",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.variable.batchfile"
+            }
+          },
+          "name": "variable.parameter.batchfile"
+        },
+        {
+          "include": "#variable"
+        },
+        {
+          "include": "#variable_delayed_expansion"
         }
       ]
     },
-    "string": {
+    "variable": {
       "patterns": [
         {
-          "begin": "\"",
+          "begin": "%(?=[^%]+%)",
           "beginCaptures": {
-            "0": "punctuation.definition.string.begin.batchfile"
+            "0": {
+              "name": "punctuation.definition.variable.begin.batchfile"
+            }
           },
-          "end": "\"",
+          "end": "(%)|\\n",
           "endCaptures": {
-            "0": "punctuation.definition.string.end.batchfile"
+            "1": {
+              "name": "punctuation.definition.variable.end.batchfile"
+            }
           },
-          "name": "string.quoted.double.batchfile",
+          "name": "variable.other.readwrite.batchfile",
           "patterns": [
             {
-              "include": "#variable"
+              "begin": ":~",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.separator.batchfile"
+                }
+              },
+              "end": "(?=%|\\n)",
+              "name": "meta.variable.substring.batchfile",
+              "patterns": [
+                {
+                  "include": "#variable_substring"
+                }
+              ]
+            },
+            {
+              "begin": ":",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.separator.batchfile"
+                }
+              },
+              "end": "(?=%|\\n)",
+              "name": "meta.variable.substitution.batchfile",
+              "patterns": [
+                {
+                  "include": "#variable_replace"
+                },
+                {
+                  "begin": "=",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "punctuation.separator.batchfile"
+                    }
+                  },
+                  "end": "(?=%|\\n)",
+                  "patterns": [
+                    {
+                      "include": "#variable_delayed_expansion"
+                    },
+                    {
+                      "match": "[^%]+",
+                      "name": "string.unquoted.batchfile"
+                    }
+                  ]
+                }
+              ]
             }
           ]
-        },
+        }
+      ]
+    },
+    "variable_delayed_expansion": {
+      "patterns": [
         {
-          "begin": "'",
+          "begin": "!(?=[^!]+!)",
           "beginCaptures": {
-            "0": "punctuation.definition.string.begin.batchfile"
+            "0": {
+              "name": "punctuation.definition.variable.begin.batchfile"
+            }
           },
-          "end": "'",
+          "end": "(!)|\\n",
           "endCaptures": {
-            "0": "punctuation.definition.string.end.batchfile"
+            "1": {
+              "name": "punctuation.definition.variable.end.batchfile"
+            }
           },
-          "name": "string.quoted.single.batchfile",
+          "name": "variable.other.readwrite.batchfile",
           "patterns": [
             {
-              "include": "#variable"
+              "begin": ":~",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.separator.batchfile"
+                }
+              },
+              "end": "(?=!|\\n)",
+              "name": "meta.variable.substring.batchfile",
+              "patterns": [
+                {
+                  "include": "#variable_substring"
+                }
+              ]
+            },
+            {
+              "begin": ":",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.separator.batchfile"
+                }
+              },
+              "end": "(?=!|\\n)",
+              "name": "meta.variable.substitution.batchfile",
+              "patterns": [
+                {
+                  "include": "#escaped_characters"
+                },
+                {
+                  "include": "#variable_replace"
+                },
+                {
+                  "include": "#variable"
+                },
+                {
+                  "begin": "=",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "punctuation.separator.batchfile"
+                    }
+                  },
+                  "end": "(?=!|\\n)",
+                  "patterns": [
+                    {
+                      "include": "#variable"
+                    },
+                    {
+                      "match": "[^!]+",
+                      "name": "string.unquoted.batchfile"
+                    }
+                  ]
+                }
+              ]
             }
           ]
         }
       ]
     },
-    "variable": {
+    "variable_replace": {
       "patterns": [
         {
-          "match": "%[\\d\\*]",
-          "name": "variable.other.argument.batchfile"
-        },
-        {
-          "match": "%%[A-Za-z]",
-          "name": "variable.other.local.batchfile"
-        },
-        {
-          "match": "%{1,2}~[fdpnxsatz]*(\\$[\\w]+:)?[A-Za-z0-9]",
-          "name": "variable.other.expanded.batchfile"
-        },
+          "match": "[^=]+",
+          "name": "string.unquoted.batchfile"
+        }
+      ]
+    },
+    "variable_substring": {
+      "patterns": [
         {
-          "match": "%[\\w -]+?(:~\\-?\\d+(,\\-?\\d+)?|:.+?=.*?)?%",
-          "name": "variable.other.environment.batchfile"
-        },
+          "match": "[+-]?\\d+",
+          "name": "constant.numeric.batchfile",
+          "patterns": [
+            {
+              "include": "#comma_separator"
+            }
+          ]
+        }
+      ]
+    },
+    "comma_separator": {
+      "patterns": [
         {
-          "match": "![\\w -]+?!",
-          "name": "variable.other.environment.batchfile"
+          "match": ",",
+          "name": "punctuation.separator.batchfile"
         }
       ]
     }