github-linguist 5.3.3 → 6.0.0

data/grammars/source.batchfile.json

@@ -1,10 +1,6 @@
 {
-  "scopeName": "source.batchfile",
   "name": "Batch File",
-  "fileTypes": [
-    "bat",
-    "cmd"
-  ],
+  "scopeName": "source.batchfile",
   "patterns": [
     {
       "include": "#commands"
@@ -41,55 +37,44 @@
     }
   ],
   "repository": {
-    "commands": {
+    "command_set": {
       "patterns": [
         {
-          "match": "(?<=^|[\\s@])(?i:adprep|append|arp|assoc|at|atmadm|attrib|auditpol|autochk|autoconv|autofmt|bcdboot|bcdedit|bdehdcfg|bitsadmin|bootcfg|brea|cacls|cd|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|diskperf|diskraid|diskshadow|dispdiag|doin|dnscmd|doskey|driverquery|dsacls|dsadd|dsamain|dsdbutil|dsget|dsmgmt|dsmod|dsmove|dsquery|dsrm|edit|endlocal|eraseesentutl|eventcreate|eventquery|eventtriggers|evntcmd|expand|extract|fc|filescrn|find|findstr|finger|flattemp|fonde|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|path|pathping|pause|pbadmin|pentnt|perfmon|ping|pnpunatten|pnputil|popd|powercfg|powershell|powershell_ise|print|prncnfg|prndrvr|prnjobs|prnmngr|prnport|prnqctl|prompt|pubprn|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|winrs|winsat|wlbs|mic|wscript|xcopy)(?=$|\\s)",
-          "name": "keyword.command.batchfile"
-        },
-        {
-          "begin": "(?<=^|[\\s@])(?i:echo)(?=$|\\s|\\.)",
+          "begin": "(?\u003c=^|[\\s@])(?i:SET)(?=$|\\s)",
+          "end": "(?=$\\n|[\u0026|\u003e\u003c)])",
+          "patterns": [
+            {
+              "include": "#command_set_inside"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "keyword.command.batchfile"
             }
-          },
-          "end": "(?=$\\n|[&|><)])",
-          "patterns": [
-            {
-              "include": "#escaped_characters"
-            },
-            {
-              "include": "#variables"
-            },
-            {
-              "include": "#numbers"
-            },
-            {
-              "include": "#strings"
-            }
-          ]
-        },
-        {
-          "include": "#command_set"
+          }
         }
       ]
     },
-    "command_set": {
+    "command_set_group": {
       "patterns": [
         {
-          "begin": "(?<=^|[\\s@])(?i:SET)(?=$|\\s)",
+          "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#command_set_inside_arithmetic"
+            }
+          ],
           "beginCaptures": {
             "0": {
-              "name": "keyword.command.batchfile"
+              "name": "punctuation.section.group.begin.batchfile"
             }
           },
-          "end": "(?=$\\n|[&|><)])",
-          "patterns": [
-            {
-              "include": "#command_set_inside"
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.group.end.batchfile"
             }
-          ]
+          }
         }
       ]
     },
@@ -109,6 +94,18 @@
         },
         {
           "begin": "(\")\\s*([^ ][^=]*)(=)\"?",
+          "end": "\"",
+          "patterns": [
+            {
+              "include": "#variables"
+            },
+            {
+              "include": "#numbers"
+            },
+            {
+              "include": "#parens"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.batchfile"
@@ -120,38 +117,18 @@
               "name": "keyword.operator.assignment.batchfile"
             }
           },
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "string.quoted.double.batchfile"
             }
-          },
-          "patterns": [
-            {
-              "include": "#variables"
-            },
-            {
-              "include": "#numbers"
-            },
-            {
-              "include": "#parens"
-            }
-          ]
+          }
         },
         {
           "include": "#strings"
         },
         {
           "begin": "([^ ][^=]*)(=)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.readwrite.batchfile"
-            },
-            "2": {
-              "name": "keyword.operator.assignment.batchfile"
-            }
-          },
-          "end": "(?=$\\n|[&|><)])",
+          "end": "(?=$\\n|[\u0026|\u003e\u003c)])",
           "patterns": [
             {
               "include": "#escaped_characters"
@@ -168,12 +145,20 @@
             {
               "include": "#strings"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.readwrite.batchfile"
+            },
+            "2": {
+              "name": "keyword.operator.assignment.batchfile"
+            }
+          }
         },
         {
-          "begin": "\\s+/[aA]\\s+",
-          "end": "(?=$\\n|[&|><)])",
           "name": "meta.expression.set.batchfile",
+          "begin": "\\s+/[aA]\\s+",
+          "end": "(?=$\\n|[\u0026|\u003e\u003c)])",
           "patterns": [
             {
               "include": "#command_set_inside_arithmetic"
@@ -182,19 +167,9 @@
               "include": "#command_set_group"
             },
             {
+              "name": "string.quoted.double.batchfile",
               "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": "#command_set_inside_arithmetic"
@@ -205,16 +180,33 @@
                 {
                   "include": "#variables"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.begin.batchfile"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.end.batchfile"
+                }
+              }
             }
           ]
         },
         {
           "begin": "\\s+/[pP]\\s+",
-          "end": "(?=$\\n|[&|><)])",
+          "end": "(?=$\\n|[\u0026|\u003e\u003c)])",
           "patterns": [
             {
+              "name": "meta.prompt.set.batchfile",
               "begin": "([^ ][^=]*)(=)",
+              "end": "(?=$\\n|[\u0026|\u003e\u003c)])",
+              "patterns": [
+                {
+                  "include": "#strings"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "variable.other.readwrite.batchfile"
@@ -222,37 +214,7 @@
                 "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"
+              }
             }
           ]
         }
@@ -267,56 +229,92 @@
           "include": "#numbers"
         },
         {
-          "match": ",",
-          "name": "punctuation.separator.batchfile"
+          "name": "punctuation.separator.batchfile",
+          "match": ","
         }
       ]
     },
     "command_set_operators": {
       "patterns": [
         {
-          "match": "\\+\\=|\\-\\=|\\*\\=|/\\=|%%\\=|&\\=|\\|\\=|\\^\\=|<<\\=|>>\\=",
-          "name": "keyword.operator.assignment.augmented.batchfile"
+          "name": "keyword.operator.assignment.augmented.batchfile",
+          "match": "\\+\\=|\\-\\=|\\*\\=|/\\=|%%\\=|\u0026\\=|\\|\\=|\\^\\=|\u003c\u003c\\=|\u003e\u003e\\="
         },
         {
-          "match": "\\+|\\-|/|\\*|%%|\\||&|\\^|<<|>>|~",
-          "name": "keyword.operator.arithmetic.batchfile"
+          "name": "keyword.operator.arithmetic.batchfile",
+          "match": "\\+|\\-|/|\\*|%%|\\||\u0026|\\^|\u003c\u003c|\u003e\u003e|~"
         },
         {
-          "match": "!",
-          "name": "keyword.operator.logical.batchfile"
+          "name": "keyword.operator.logical.batchfile",
+          "match": "!"
         },
         {
-          "match": "=",
-          "name": "keyword.operator.assignment.batchfile"
+          "name": "keyword.operator.assignment.batchfile",
+          "match": "="
         }
       ]
     },
-    "comments": {
+    "commands": {
       "patterns": [
         {
-          "begin": "(?:^|(&))\\s*(?=((?::[+=,;: ])))",
+          "name": "keyword.command.batchfile",
+          "match": "(?\u003c=^|[\\s@])(?i:adprep|append|arp|assoc|at|atmadm|attrib|auditpol|autochk|autoconv|autofmt|bcdboot|bcdedit|bdehdcfg|bitsadmin|bootcfg|brea|cacls|cd|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|diskperf|diskraid|diskshadow|dispdiag|doin|dnscmd|doskey|driverquery|dsacls|dsadd|dsamain|dsdbutil|dsget|dsmgmt|dsmod|dsmove|dsquery|dsrm|edit|endlocal|eraseesentutl|eventcreate|eventquery|eventtriggers|evntcmd|expand|extract|fc|filescrn|find|findstr|finger|flattemp|fonde|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|path|pathping|pause|pbadmin|pentnt|perfmon|ping|pnpunatten|pnputil|popd|powercfg|powershell|powershell_ise|print|prncnfg|prndrvr|prnjobs|prnmngr|prnport|prnqctl|prompt|pubprn|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|winrs|winsat|wlbs|mic|wscript|xcopy)(?=$|\\s)"
+        },
+        {
+          "begin": "(?\u003c=^|[\\s@])(?i:echo)(?=$|\\s|\\.)",
+          "end": "(?=$\\n|[\u0026|\u003e\u003c)])",
+          "patterns": [
+            {
+              "include": "#escaped_characters"
+            },
+            {
+              "include": "#variables"
+            },
+            {
+              "include": "#numbers"
+            },
+            {
+              "include": "#strings"
+            }
+          ],
           "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.conditional.batchfile"
+            "0": {
+              "name": "keyword.command.batchfile"
             }
-          },
+          }
+        },
+        {
+          "include": "#command_set"
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
+        {
+          "begin": "(?:^|(\u0026))\\s*(?=((?::[+=,;: ])))",
           "end": "\\n",
           "patterns": [
             {
+              "name": "comment.line.colon.batchfile",
               "begin": "((?::[+=,;: ]))",
+              "end": "(?=\\n)",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.definition.comment.batchfile"
                 }
-              },
-              "end": "(?=\\n)",
-              "name": "comment.line.colon.batchfile"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.conditional.batchfile"
+            }
+          }
         },
         {
-          "begin": "(?<=^|[\\s@])(?i)(REM)(\\.)",
+          "name": "comment.line.rem.batchfile",
+          "begin": "(?\u003c=^|[\\s@])(?i)(REM)(\\.)",
+          "end": "(?=$\\n|[\u0026|\u003e\u003c)])",
           "beginCaptures": {
             "1": {
               "name": "keyword.command.rem.batchfile"
@@ -324,44 +322,42 @@
             "2": {
               "name": "punctuation.separator.batchfile"
             }
-          },
-          "end": "(?=$\\n|[&|><)])",
-          "name": "comment.line.rem.batchfile"
+          }
         },
         {
-          "begin": "(?<=^|[\\s@])(?i:rem)\\b",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.command.rem.batchfile"
-            }
-          },
-          "end": "\\n",
           "name": "comment.line.rem.batchfile",
+          "begin": "(?\u003c=^|[\\s@])(?i:rem)\\b",
+          "end": "\\n",
           "patterns": [
             {
-              "match": "[><|]",
-              "name": "invalid.illegal.unexpected-character.batchfile"
+              "name": "invalid.illegal.unexpected-character.batchfile",
+              "match": "[\u003e\u003c|]"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.command.rem.batchfile"
+            }
+          }
         }
       ]
     },
     "constants": {
       "patterns": [
         {
-          "match": "\\b(?i:NUL)\\b",
-          "name": "constant.language.batchfile"
+          "name": "constant.language.batchfile",
+          "match": "\\b(?i:NUL)\\b"
         }
       ]
     },
     "controls": {
       "patterns": [
         {
-          "match": "(?<=^|\\s)(?i)(?:goto|call|exit)(?=$|\\s)",
-          "name": "keyword.control.statement.batchfile"
+          "name": "keyword.control.statement.batchfile",
+          "match": "(?\u003c=^|\\s)(?i)(?:goto|call|exit)(?=$|\\s)"
         },
         {
-          "match": "(?<=^|\\s)(?i)(if)\\s+(?:(not)\\s+)?(exist|defined|errorlevel|cmdextversion)(?=\\s)",
+          "match": "(?\u003c=^|\\s)(?i)(if)\\s+(?:(not)\\s+)?(exist|defined|errorlevel|cmdextversion)(?=\\s)",
           "captures": {
             "1": {
               "name": "keyword.control.conditional.batchfile"
@@ -375,20 +371,20 @@
           }
         },
         {
-          "match": "(?<=^|\\s)(?i)(?:if|else)(?=$|\\s)",
-          "name": "keyword.control.conditional.batchfile"
+          "name": "keyword.control.conditional.batchfile",
+          "match": "(?\u003c=^|\\s)(?i)(?:if|else)(?=$|\\s)"
         },
         {
-          "match": "(?<=^|\\s)(?i)for(?=\\s)",
-          "name": "keyword.control.repeat.batchfile"
+          "name": "keyword.control.repeat.batchfile",
+          "match": "(?\u003c=^|\\s)(?i)for(?=\\s)"
         }
       ]
     },
     "escaped_characters": {
       "patterns": [
         {
-          "match": "%%|\\^\\^!|\\^.|\\^\\n",
-          "name": "constant.character.escape.batchfile"
+          "name": "constant.character.escape.batchfile",
+          "match": "%%|\\^\\^!|\\^.|\\^\\n"
         }
       ]
     },
@@ -410,73 +406,83 @@
     "numbers": {
       "patterns": [
         {
-          "match": "(?<=^|\\s|=)(0[xX][0-9A-Fa-f]*|[+-]?\\d+)(?=$|\\s|<|>)",
-          "name": "constant.numeric.batchfile"
+          "name": "constant.numeric.batchfile",
+          "match": "(?\u003c=^|\\s|=)(0[xX][0-9A-Fa-f]*|[+-]?\\d+)(?=$|\\s|\u003c|\u003e)"
         }
       ]
     },
     "operators": {
       "patterns": [
         {
-          "match": "@(?=\\S)",
-          "name": "keyword.operator.at.batchfile"
+          "name": "keyword.operator.at.batchfile",
+          "match": "@(?=\\S)"
         },
         {
-          "match": "(?<=\\s)(?i:EQU|NEQ|LSS|LEQ|GTR|GEQ)(?=\\s)|==",
-          "name": "keyword.operator.comparison.batchfile"
+          "name": "keyword.operator.comparison.batchfile",
+          "match": "(?\u003c=\\s)(?i:EQU|NEQ|LSS|LEQ|GTR|GEQ)(?=\\s)|=="
         },
         {
-          "match": "(?<=\\s)(?i)(NOT)(?=\\s)",
-          "name": "keyword.operator.logical.batchfile"
+          "name": "keyword.operator.logical.batchfile",
+          "match": "(?\u003c=\\s)(?i)(NOT)(?=\\s)"
         },
         {
-          "match": "&&?|\\|\\|",
-          "name": "keyword.operator.conditional.batchfile"
+          "name": "keyword.operator.conditional.batchfile",
+          "match": "\u0026\u0026?|\\|\\|"
         },
         {
-          "match": "\\|",
-          "name": "keyword.operator.pipe.batchfile"
+          "name": "keyword.operator.pipe.batchfile",
+          "match": "\\|"
         },
         {
-          "match": "<&?|>[&>]?",
-          "name": "keyword.operator.redirection.batchfile"
+          "name": "keyword.operator.redirection.batchfile",
+          "match": "\u003c\u0026?|\u003e[\u0026\u003e]?"
         }
       ]
     },
     "parens": {
       "patterns": [
         {
+          "name": "meta.group.batchfile",
           "begin": "\\(",
-          "beginCaptures": {
-            "0": "punctuation.section.group.begin.batchfile"
-          },
           "end": "\\)",
-          "endCaptures": {
-            "0": "punctuation.section.group.end.batchfile"
-          },
-          "name": "meta.group.batchfile",
           "patterns": [
             {
-              "match": ",|;",
-              "name": "punctuation.separator.batchfile"
+              "name": "punctuation.separator.batchfile",
+              "match": ",|;"
             },
             {
               "include": "$self"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.group.begin.batchfile"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.group.end.batchfile"
+            }
+          }
         }
       ]
     },
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.double.batchfile",
           "begin": "\"",
+          "end": "(\")|(\\n)",
+          "patterns": [
+            {
+              "include": "#variables"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.batchfile"
             }
           },
-          "end": "(\")|(\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end.batchfile"
@@ -484,145 +490,105 @@
             "2": {
               "name": "invalid.illegal.newline.batchfile"
             }
-          },
-          "name": "string.quoted.double.batchfile",
-          "patterns": [
-            {
-              "include": "#variables"
-            }
-          ]
-        }
-      ]
-    },
-    "variables": {
-      "patterns": [
-        {
-          "match": "(%)((~([fdpnxsatz]|\\$PATH:)*)?\\d|\\*)",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.variable.batchfile"
-            }
-          },
-          "name": "variable.parameter.batchfile"
-        },
-        {
-          "include": "#variable"
-        },
-        {
-          "include": "#variable_delayed_expansion"
+          }
         }
       ]
     },
     "variable": {
       "patterns": [
         {
+          "name": "variable.other.readwrite.batchfile",
           "begin": "%(?=[^%]+%)",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.variable.begin.batchfile"
-            }
-          },
           "end": "(%)|\\n",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.variable.end.batchfile"
-            }
-          },
-          "name": "variable.other.readwrite.batchfile",
           "patterns": [
             {
+              "name": "meta.variable.substring.batchfile",
               "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",
+              "begin": ":",
+              "end": "(?=%|\\n)",
               "patterns": [
                 {
                   "include": "#variable_replace"
                 },
                 {
                   "begin": "=",
-                  "beginCaptures": {
-                    "0": {
-                      "name": "punctuation.separator.batchfile"
-                    }
-                  },
                   "end": "(?=%|\\n)",
                   "patterns": [
                     {
                       "include": "#variable_delayed_expansion"
                     },
                     {
-                      "match": "[^%]+",
-                      "name": "string.unquoted.batchfile"
+                      "name": "string.unquoted.batchfile",
+                      "match": "[^%]+"
+                    }
+                  ],
+                  "beginCaptures": {
+                    "0": {
+                      "name": "punctuation.separator.batchfile"
                     }
-                  ]
+                  }
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.separator.batchfile"
+                }
+              }
             }
-          ]
-        }
-      ]
-    },
-    "variable_delayed_expansion": {
-      "patterns": [
-        {
-          "begin": "!(?=[^!]+!)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.variable.begin.batchfile"
             }
           },
-          "end": "(!)|\\n",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.variable.end.batchfile"
             }
-          },
+          }
+        }
+      ]
+    },
+    "variable_delayed_expansion": {
+      "patterns": [
+        {
           "name": "variable.other.readwrite.batchfile",
+          "begin": "!(?=[^!]+!)",
+          "end": "(!)|\\n",
           "patterns": [
             {
+              "name": "meta.variable.substring.batchfile",
               "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",
+              "begin": ":",
+              "end": "(?=!|\\n)",
               "patterns": [
                 {
                   "include": "#escaped_characters"
@@ -635,33 +601,48 @@
                 },
                 {
                   "begin": "=",
-                  "beginCaptures": {
-                    "0": {
-                      "name": "punctuation.separator.batchfile"
-                    }
-                  },
                   "end": "(?=!|\\n)",
                   "patterns": [
                     {
                       "include": "#variable"
                     },
                     {
-                      "match": "[^!]+",
-                      "name": "string.unquoted.batchfile"
+                      "name": "string.unquoted.batchfile",
+                      "match": "[^!]+"
                     }
-                  ]
+                  ],
+                  "beginCaptures": {
+                    "0": {
+                      "name": "punctuation.separator.batchfile"
+                    }
+                  }
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.separator.batchfile"
                 }
-              ]
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.variable.begin.batchfile"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.variable.end.batchfile"
+            }
+          }
         }
       ]
     },
     "variable_replace": {
       "patterns": [
         {
-          "match": "[^=%!\\n]+",
-          "name": "string.unquoted.batchfile"
+          "name": "string.unquoted.batchfile",
+          "match": "[^=%!\\n]+"
         }
       ]
     },
@@ -682,6 +663,25 @@
           }
         }
       ]
+    },
+    "variables": {
+      "patterns": [
+        {
+          "name": "variable.parameter.batchfile",
+          "match": "(%)((~([fdpnxsatz]|\\$PATH:)*)?\\d|\\*)",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.variable.batchfile"
+            }
+          }
+        },
+        {
+          "include": "#variable"
+        },
+        {
+          "include": "#variable_delayed_expansion"
+        }
+      ]
     }
   }
-}
+}