github-linguist 6.2.0 → 6.3.0

data/grammars/source.hxml.json

@@ -11,14 +11,6 @@
         }
       }
     },
-    {
-      "match": "^\\s*(-cppia|-cpp?|-js|-as3|-swf-(header|version|lib(-extern)?)|-swf9?|-neko|-python|-php|-cs|-java-lib|-java|-xml|-lua|-hl|-x|-lib|-D|-resource|-exclude|-version|-v|-debug|-prompt|-cmd|-dce\\s+(std|full|no)?|--flash-strict|--no-traces|--flash-use-stage|--neko-source|--gen-hx-classes|-net-lib|-net-std|-c-arg|--each|--next|--display|--no-output|--times|--no-inline|--no-opt|--php-front|--php-lib|--php-prefix|--remap|--help-defines|--help-metas|-help|--help|-java|-cs|--dead-code-elimination|--js-modern|--interp|--eval|--dce|--wait|--connect|--cwd|--run).*$",
-      "captures": {
-        "1": {
-          "name": "keyword.other.hxml"
-        }
-      }
-    },
     {
       "begin": "(?:^|[^a-zA-Z])(--macro)\\b",
       "end": "\\n",
@@ -34,7 +26,7 @@
       }
     },
     {
-      "match": "(?:^|[^a-zA-Z])(-main)\\b\\s*\\b(?:(([a-z][a-zA-Z0-9]*\\.)*)(_*[A-Z]\\w*))?\\b",
+      "match": "(?:^|[^a-zA-Z])(-m|-main|--main)\\b\\s*\\b(?:(([a-z][a-zA-Z0-9]*\\.)*)(_*[A-Z]\\w*))?\\b",
       "captures": {
         "1": {
           "name": "keyword.other.hxml"
@@ -46,6 +38,22 @@
           "name": "entity.name.type.hx"
         }
       }
+    },
+    {
+      "match": "^\\s*(-cppia|-cpp?|-js|-as3|-swf-(header|version|lib(-extern)?)|-swf9?|-neko|-python|-php|-cs|-java-lib|-java|-xml|-lua|-hl|-x|-lib|-D|-resource|-exclude|-version|-v|-debug|-prompt|-cmd|-dce\\s+(std|full|no)?|--flash-strict|--no-traces|--flash-use-stage|--neko-source|--gen-hx-classes|-net-lib|-net-std|-c-arg|--each|--next|--display|--no-output|--times|--no-inline|--no-opt|--php-front|--php-lib|--php-prefix|--remap|--help-defines|--help-metas|-help|--help|-java|-cs|--dead-code-elimination|--js-modern|--interp|--eval|--dce|--wait|--connect|--cwd|--run).*$",
+      "captures": {
+        "1": {
+          "name": "keyword.other.hxml"
+        }
+      }
+    },
+    {
+      "match": "^\\s*(--js(on)?|--lua|--swf-(header|version|lib(-extern)?)|--swf|--as3|--neko|--php|--cppia|--cpp|--cppia|--cs|--java-lib|--java|--python|--hl|-p|--class-path|-L|--library|--define|-r|--resource|--cmd|-C|--verbose|--debug|--prompt|--xml|--json|--net-lib|--net-std|--c-arg|--version|-h|--main|--).*$",
+      "captures": {
+        "1": {
+          "name": "keyword.other.hxml"
+        }
+      }
     }
   ]
 }

data/grammars/source.isabelle.root.json

@@ -4,11 +4,11 @@
   "patterns": [
     {
       "name": "keyword.control",
-      "match": "\\b(chapter|session|in|description|options|global_theories|theories|files|document_files)\\b"
+      "match": "\\b(chapter|session|in|description|options|global_theories|theories|files|document_files|sessions)\\b"
     },
     {
       "name": "keyword.other.option",
-      "match": "\\b(browser_info|condition|document|document_graph|document_output|document_variants|eta_contract|goals_limit|names_long|names_short|names_unique|pretty_margin|print_mode|show_brackets|show_consts|show_main_goal|show_question_marks|show_sorts|show_types|thy_output_break|thy_output_display|thy_output_indent|thy_output_modes|thy_output_quotes|thy_output_source|timeout)\\b"
+      "match": "\\b(browser_info|condition|document|document_graph|document_output|document_variants|eta_contract|goals_limit|names_long|names_short|names_unique|pretty_margin|print_mode|show_brackets|show_consts|show_main_goal|show_question_marks|show_sorts|show_types|thy_output_break|thy_output_display|thy_output_indent|thy_output_modes|thy_output_quotes|thy_output_source|timeout|global)\\b"
     },
     {
       "name": "support.constant",

data/grammars/source.lua.json

@@ -4,24 +4,31 @@
   "patterns": [
     {
       "name": "meta.function.lua",
-      "begin": "\\b((local\\b)\\s+)?(function)\\s*(\\s+[a-zA-Z_][a-zA-Z0-9_]*(\\.[a-zA-Z_][a-zA-Z0-9_]*)*(:[a-zA-Z_][a-zA-Z0-9_]*)?\\s*)?(\\()",
+      "begin": "\\b(?:(local)\\s+)?(function)\\s*(?:\\s+([a-zA-Z_][a-zA-Z0-9_]*(?:([\\.:])[a-zA-Z_][a-zA-Z0-9_]*)?)\\s*)?(\\()",
       "end": "\\)",
       "patterns": [
         {
           "name": "variable.parameter.function.lua",
           "match": "[a-zA-Z_][a-zA-Z0-9_]*"
+        },
+        {
+          "name": "punctuation.separator.arguments.lua",
+          "match": ","
         }
       ],
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.local.lua"
         },
-        "3": {
+        "2": {
           "name": "keyword.control.lua"
         },
-        "4": {
+        "3": {
           "name": "entity.name.function.lua"
         },
+        "4": {
+          "name": "punctuation.separator.parameter.lua"
+        },
         "5": {
           "name": "punctuation.definition.parameters.begin.lua"
         }

data/grammars/source.nim.json

@@ -127,7 +127,7 @@
       "name": "meta.proc.nim",
       "patterns": [
         {
-          "begin": "(?\u003c![\\w\\x{80}-\\x{10FFFF}])(proc|method|template|macro|iterator|converter)\\s+((\\`[^\\s\\`]+\\`)|([\\w\\x{80}-\\x{10FFFF}]+))(\\*)?",
+          "begin": "(?\u003c![\\w\\x{80}-\\x{10FFFF}])(proc|func|method|template|macro|iterator|converter)\\s+((\\`[^\\s\\`]+\\`)|([\\w\\x{80}-\\x{10FFFF}]+))(\\*)?",
           "end": "(\\=)",
           "patterns": [
             {
@@ -307,7 +307,7 @@
     },
     {
       "name": "keyword.other.nim",
-      "match": "((?\u003c![\\w\\x{80}-\\x{10FFFF}])(addr|as|atomic|bind|cast|const|converter|defer|discard|distinct|div|enum|export|include|let|mixin|object|of|ptr|ref|shl|shr|static|type|var)(?![\\w\\x{80}-\\x{10FFFF}]))"
+      "match": "((?\u003c![\\w\\x{80}-\\x{10FFFF}])(addr|as|atomic|bind|cast|concept|const|converter|defer|discard|distinct|div|enum|export|from|import|include|let|mixin|object|of|ptr|ref|shl|shr|static|type|using|var)(?![\\w\\x{80}-\\x{10FFFF}]))"
     },
     {
       "name": "keyword.operator.nim",
@@ -345,7 +345,7 @@
       }
     },
     {
-      "match": "(from)\\s+[\\/\\w]+\\s+(?=import)",
+      "match": "(from)\\s+[\\/\\w]+(?:\\s+(?:as)\\s+[\\/\\w]+)?\\s+(?=import)",
       "captures": {
         "1": {
           "name": "keyword.control.nim"
@@ -379,7 +379,7 @@
     },
     {
       "name": "storage.type.function.nim",
-      "match": "(?\u003c![\\w\\x{80}-\\x{10FFFF}])(proc|iterator|method|template|macro)(?![\\w\\x{80}-\\x{10FFFF}])"
+      "match": "(?\u003c![\\w\\x{80}-\\x{10FFFF}])(proc|func|iterator|method|template|macro)(?![\\w\\x{80}-\\x{10FFFF}])"
     },
     {
       "name": "storage.type.generic.nim",

data/grammars/source.pawn.json

@@ -40,7 +40,7 @@
     },
     "call": {
       "name": "meta.function-call.c",
-      "begin": "(?x)\n\t\t\t\t\\s*\n\t\t\t\t(?= # don't consume to recognize support functions\n\t\t\t\t    (?: [A-Za-z_]\\w*+ | ::[^:] )++\n\t\t\t\t    (?:\\s|/\\*.*?\\*/)*+ \\( )\n\t\t\t",
+      "begin": "(?x)\n\t\t\t\t\\s*\n\t\t\t\t(?= # don't consume to recognize support functions\n\t\t\t\t    (?: [A-Za-z_@]\\w*+ | ::[^:] )++\n\t\t\t\t    (?:\\s|/\\*.*?\\*/)*+ \\( )\n\t\t\t",
       "end": "\\)",
       "patterns": [
         {
@@ -48,11 +48,11 @@
         },
         {
           "name": "variable.other.dot-access.c support.function.any-method.c",
-          "match": "(?:(?\u003c=\\.)|(?\u003c=-\u003e))\\b([A-Za-z_]\\w*+)\\b"
+          "match": "(?:(?\u003c=\\.)|(?\u003c=-\u003e))\\b([A-Za-z_@]\\w*+)\\b"
         },
         {
           "name": "support.function.any-method.c",
-          "match": "(?:[A-Za-z_]\\w*+|::[^:])++"
+          "match": "(?:[A-Za-z_@]\\w*+|::[^:])++"
         },
         {
           "include": "#parens-lookahead-end"
@@ -260,7 +260,7 @@
     },
     "function-declaration": {
       "name": "meta.function.c",
-      "begin": "(?x)\n\t\t\t\t(?: ^\n\t\t\t\t  | (?\u003c! (?\u003c!\\w) new\n\t\t\t\t        | (?\u003c!\\w) (?:else|enum) | (?\u003c!\\w) (?:class|union)\n\t\t\t\t        | (?\u003c!\\w) (?:struct|return|sizeof|typeof)\n\t\t\t\t        | (?\u003c!\\w) __typeof | (?\u003c!\\w) __typeof__ )\n\t\t\t\t    (?\u003c= \\w ) \\s\n\n\t\t\t\t  | #  or type modifier / closing bracket before name\n\t\t\t\t    (?\u003c= [^\u0026]\u0026 | [*\u003e)}\\]] ) ) \\s*\n\n\t\t\t\t(   (?: [A-Za-z_]\\w*+ | ::[^:] )++\n\t\t\t\t    (?: (?\u003c= ^ operator | \\W operator )  # C++ operator?\n\t\t\t\t        (?: [-*\u0026\u003c\u003e=+!]+ | \\(\\) | \\[\\] ) )? )\n\n\t\t\t\t(?= (?:\\s|/\\*.*?\\*/)*+ (?'parens' \\(\n\t\t\t\t            (?\u003e \\g'parens' |\n\t\t\t\t            \t\"(\\\\.|[^\"])*\" | '(\\\\.|[^'])*' | /\\*.*?\\*/ |\n\t\t\t\t            \t(?! /[/*] | [()] ) . )*\n\t\t\t\t        \\) ) \\s* ; )\n\t\t\t",
+      "begin": "(?x)\n\t\t\t\t(?: ^\n\t\t\t\t  | (?\u003c! (?\u003c!\\w) new\n\t\t\t\t        | (?\u003c!\\w) (?:else|enum) | (?\u003c!\\w) (?:class|union)\n\t\t\t\t        | (?\u003c!\\w) (?:struct|return|sizeof|typeof)\n\t\t\t\t        | (?\u003c!\\w) __typeof | (?\u003c!\\w) __typeof__ )\n\t\t\t\t    (?\u003c= \\w ) \\s\n\n\t\t\t\t  | #  or type modifier / closing bracket before name\n\t\t\t\t    (?\u003c= [^\u0026]\u0026 | [*\u003e)}\\]] ) ) \\s*\n\n\t\t\t\t(   (?: [A-Za-z_@]\\w*+ | ::[^:] )++\n\t\t\t\t    (?: (?\u003c= ^ operator | \\W operator )  # C++ operator?\n\t\t\t\t        (?: [-*\u0026\u003c\u003e=+!]+ | \\(\\) | \\[\\] ) )? )\n\n\t\t\t\t(?= (?:\\s|/\\*.*?\\*/)*+ (?'parens' \\(\n\t\t\t\t            (?\u003e \\g'parens' |\n\t\t\t\t            \t\"(\\\\.|[^\"])*\" | '(\\\\.|[^'])*' | /\\*.*?\\*/ |\n\t\t\t\t            \t(?! /[/*] | [()] ) . )*\n\t\t\t\t        \\) ) \\s* ; )\n\t\t\t",
       "end": ";",
       "patterns": [
         {
@@ -278,7 +278,7 @@
     },
     "function-definition": {
       "name": "meta.function.c",
-      "begin": "(?x)\n\t\t\t\t(?: ^\n\t\t\t\t  | (?\u003c! (?\u003c!\\w) new\n\t\t\t\t        | (?\u003c!\\w) (?:else|enum) | (?\u003c!\\w) (?:class|union)\n\t\t\t\t        | (?\u003c!\\w) (?:struct|return|sizeof|typeof)\n\t\t\t\t        | (?\u003c!\\w) __typeof | (?\u003c!\\w) __typeof__ )\n\t\t\t\t    (?\u003c= \\w ) \\s\n\n\t\t\t\t  | #  or type modifier / closing bracket before name\n\t\t\t\t    (?\u003c= [^\u0026]\u0026 | [*\u003e)}\\]\\:] ) ) \\s*\n\n\t\t\t\t(   (?: [A-Za-z_]\\w*+ | ::[^:] )++\n\t\t\t\t    (?: (?\u003c= ^ operator | \\W operator )  # C++ operator?\n\t\t\t\t        (?: [-*\u0026\u003c\u003e=+!]+ | \\(\\) | \\[\\] ) )? )\n\n\t\t\t\t(?= (?:\\s|/\\*.*?\\*/)*+ \\( )\n\t\t\t",
+      "begin": "(?x)\n\t\t\t\t(?: ^\n\t\t\t\t  | (?\u003c! (?\u003c!\\w) new\n\t\t\t\t        | (?\u003c!\\w) (?:else|enum) | (?\u003c!\\w) (?:class|union)\n\t\t\t\t        | (?\u003c!\\w) (?:struct|return|sizeof|typeof)\n\t\t\t\t        | (?\u003c!\\w) __typeof | (?\u003c!\\w) __typeof__ )\n\t\t\t\t    (?\u003c= \\w ) \\s\n\n\t\t\t\t  | #  or type modifier / closing bracket before name\n\t\t\t\t    (?\u003c= [^\u0026]\u0026 | [*\u003e)}\\]\\:] ) ) \\s*\n\n\t\t\t\t(   (?: [A-Za-z_@]\\w*+ | ::[^:] )++\n\t\t\t\t    (?: (?\u003c= ^ operator | \\W operator )  # C++ operator?\n\t\t\t\t        (?: [-*\u0026\u003c\u003e=+!]+ | \\(\\) | \\[\\] ) )? )\n\n\t\t\t\t(?= (?:\\s|/\\*.*?\\*/)*+ \\( )\n\t\t\t",
       "end": "\\}|;",
       "patterns": [
         {

data/grammars/source.pony.json

@@ -129,10 +129,10 @@
           "match": "\\b(is|isnt|not|and|or|xor)\\b"
         },
         {
-          "match": "="
+          "match": "(\\?|=\u003e)"
         },
         {
-          "match": "(\\?|=\u003e)"
+          "match": "="
         },
         {
           "match": "(\\||\\\u0026|\\,|\\^)"

data/grammars/source.powershell.json

@@ -71,7 +71,17 @@
           "name": "constant.character.escape.powershell",
           "match": "''"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.powershell"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.powershell"
+        }
+      }
     },
     {
       "name": "string.quoted.double.heredoc.powershell",
@@ -137,7 +147,7 @@
       ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.other.variable.definition.powershell"
+          "name": "punctuation.definition.variable.powershell"
         },
         "2": {
           "name": "punctuation.section.group.begin.powershell"
@@ -162,8 +172,19 @@
       "match": "(?\u003c!\\w|-|[^\\)]\\.)((?i:(foreach|where)(?!-object))|%|\\?)(?!\\w)"
     },
     {
-      "name": "keyword.control.powershell",
-      "match": "(?\u003c!\\w)(--%)(?!\\w)"
+      "begin": "(?\u003c!\\w)(--%)(?!\\w)",
+      "end": "$",
+      "patterns": [
+        {
+          "name": "string.unquoted.powershell",
+          "match": ".+"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.powershell"
+        }
+      }
     },
     {
       "name": "storage.modifier.powershell",
@@ -209,7 +230,7 @@
       "match": "[+%*/-]?=|[+/*%-]"
     },
     {
-      "name": "keyword.other.statement-separator.powershell",
+      "name": "punctuation.terminator.statement.powershell",
       "match": "\\|{2}|\u0026{2}|;"
     },
     {
@@ -299,7 +320,7 @@
               "include": "$self"
             },
             {
-              "match": "(?i)\\b(mandatory|valuefrompipeline|valuefrompipelinebypropertyname|valuefromremainingarguments|position|parametersetname|defaultparametersetname|supportsshouldprocess|positionalbinding|helpuri|confirmimpact|helpmessage)\\b(?:\\s+)?(=)",
+              "match": "(?i)\\b(mandatory|valuefrompipeline|valuefrompipelinebypropertyname|valuefromremainingarguments|position|parametersetname|defaultparametersetname|supportsshouldprocess|supportspaging|positionalbinding|helpuri|confirmimpact|helpmessage)\\b(?:\\s+)?(=)?",
               "captures": {
                 "1": {
                   "name": "variable.parameter.attribute.powershell"
@@ -318,7 +339,17 @@
                   "name": "constant.character.escape.powershell",
                   "match": "''"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.begin.powershell"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.string.end.powershell"
+                }
+              }
             }
           ],
           "beginCaptures": {
@@ -375,7 +406,7 @@
       "patterns": [
         {
           "name": "comment.documentation.embedded.powershell",
-          "match": "(?i:\\s*(\\.)(COMPONENT|DESCRIPTION|EXAMPLE|EXTERNALHELP|FORWARDHELPCATEGORY|FORWARDHELPTARGETNAME|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|REMOTEHELPRUNSPACE|ROLE|SYNOPSIS))",
+          "match": "^(?i:(?:\\s*|#)+(\\.)(COMPONENT|DESCRIPTION|EXAMPLE|EXTERNALHELP|FORWARDHELPCATEGORY|FORWARDHELPTARGETNAME|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|REMOTEHELPRUNSPACE|ROLE|SYNOPSIS))",
           "captures": {
             "1": {
               "name": "constant.string.documentation.powershell"
@@ -444,7 +475,17 @@
           "name": "keyword.other.powershell",
           "match": "`\\s*$"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.powershell"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.powershell"
+        }
+      }
     },
     "doubleQuotedStringEscapes": {
       "patterns": [
@@ -568,7 +609,7 @@
       ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.other.variable.definition.powershell"
+          "name": "punctuation.definition.variable.powershell"
         },
         "2": {
           "name": "punctuation.section.group.begin.powershell"
@@ -709,78 +750,81 @@
         {
           "match": "(\\$)(?i:(False|Null|True))\\b",
           "captures": {
-            "1": {
-              "name": "keyword.other.variable.definition.powershell"
-            },
-            "2": {
+            "0": {
               "name": "constant.language.powershell"
+            },
+            "1": {
+              "name": "punctuation.definition.variable.powershell"
             }
           }
         },
         {
           "match": "(\\$)(?i:(Error|ExecutionContext|Host|Home|PID|PsHome|PsVersionTable|ShellID))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?\\b",
           "captures": {
-            "1": {
-              "name": "keyword.other.variable.definition.powershell"
-            },
-            "2": {
+            "0": {
               "name": "support.constant.variable.powershell"
             },
+            "1": {
+              "name": "punctuation.definition.variable.powershell"
+            },
             "3": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(\\$)(?i:(\\$|\\^|\\?|_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?\\b",
           "captures": {
-            "1": {
-              "name": "keyword.other.variable.definition.powershell"
-            },
-            "2": {
+            "0": {
               "name": "support.constant.automatic.powershell"
             },
+            "1": {
+              "name": "punctuation.definition.variable.powershell"
+            },
             "3": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(\\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|ProgressPreference|PsCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|VerbosePreference|WarningPreference|WhatIfPreference))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?\\b",
           "captures": {
-            "1": {
-              "name": "keyword.other.variable.definition.powershell"
-            },
-            "2": {
+            "0": {
               "name": "variable.language.powershell"
             },
+            "1": {
+              "name": "punctuation.definition.variable.powershell"
+            },
             "3": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(?i:(\\$|@)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
+            "0": {
+              "name": "variable.other.readwrite.powershell"
+            },
             "1": {
-              "name": "keyword.other.variable.definition.powershell"
+              "name": "punctuation.definition.variable.powershell"
             },
             "2": {
               "name": "storage.modifier.scope.powershell"
             },
-            "3": {
-              "name": "variable.other.readwrite.powershell"
-            },
             "4": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
+            "0": {
+              "name": "variable.other.readwrite.powershell"
+            },
             "1": {
-              "name": "keyword.other.variable.definition.powershell"
+              "name": "punctuation.definition.variable.powershell"
             },
             "2": {
               "name": "punctuation.section.braces.begin.powershell"
@@ -788,39 +832,39 @@
             "3": {
               "name": "storage.modifier.scope.powershell"
             },
-            "4": {
-              "name": "variable.other.readwrite.powershell"
-            },
             "5": {
               "name": "punctuation.section.braces.end.powershell"
             },
             "6": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(?i:(\\$|@)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
+            "0": {
+              "name": "variable.other.readwrite.powershell"
+            },
             "1": {
-              "name": "keyword.other.variable.definition.powershell"
+              "name": "punctuation.definition.variable.powershell"
             },
             "2": {
               "name": "support.variable.drive.powershell"
             },
-            "3": {
-              "name": "variable.other.readwrite.powershell"
-            },
             "4": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(?i:(\\$)(\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
+            "0": {
+              "name": "variable.other.readwrite.powershell"
+            },
             "1": {
-              "name": "keyword.other.variable.definition.powershell"
+              "name": "punctuation.definition.variable.powershell"
             },
             "2": {
               "name": "punctuation.section.braces.begin.powershell"
@@ -828,14 +872,11 @@
             "3": {
               "name": "support.variable.drive.powershell"
             },
-            "4": {
-              "name": "variable.other.readwrite.powershell"
-            },
             "5": {
               "name": "punctuation.section.braces.end.powershell"
             },
             "6": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         }
@@ -846,115 +887,118 @@
         {
           "match": "(\\$)(?i:(False|Null|True))\\b",
           "captures": {
-            "1": {
-              "name": "keyword.other.variable.definition.powershell"
-            },
-            "2": {
+            "0": {
               "name": "constant.language.powershell"
+            },
+            "1": {
+              "name": "punctuation.definition.variable.powershell"
             }
           }
         },
         {
           "match": "(\\$)(?i:(Error|ExecutionContext|Host|Home|PID|PsHome|PsVersionTable|ShellID))\\b",
           "captures": {
-            "1": {
-              "name": "keyword.other.variable.definition.powershell"
-            },
-            "2": {
+            "0": {
               "name": "support.constant.variable.powershell"
             },
+            "1": {
+              "name": "punctuation.definition.variable.powershell"
+            },
             "3": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(\\$)(?i:(\\$|\\^|\\?|_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This))\\b",
           "captures": {
-            "1": {
-              "name": "keyword.other.variable.definition.powershell"
-            },
-            "2": {
+            "0": {
               "name": "support.variable.automatic.powershell"
             },
+            "1": {
+              "name": "punctuation.definition.variable.powershell"
+            },
             "3": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(\\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|ProgressPreference|PsCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|VerbosePreference|WarningPreference|WhatIfPreference))\\b",
           "captures": {
-            "1": {
-              "name": "keyword.other.variable.definition.powershell"
-            },
-            "2": {
+            "0": {
               "name": "variable.language.powershell"
             },
+            "1": {
+              "name": "punctuation.definition.variable.powershell"
+            },
             "3": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(?i:(\\$|@)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))",
           "captures": {
+            "0": {
+              "name": "variable.other.readwrite.powershell"
+            },
             "1": {
-              "name": "keyword.other.variable.definition.powershell"
+              "name": "punctuation.definition.variable.powershell"
             },
             "2": {
               "name": "storage.modifier.scope.powershell"
             },
-            "3": {
-              "name": "variable.other.readwrite.powershell"
-            },
             "4": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))",
           "captures": {
+            "0": {
+              "name": "variable.other.readwrite.powershell"
+            },
             "1": {
-              "name": "keyword.other.variable.definition.powershell"
+              "name": "punctuation.definition.variable.powershell"
             },
             "2": {
               "name": "storage.modifier.scope.powershell"
             },
-            "3": {
-              "name": "variable.other.readwrite.powershell"
-            },
             "4": {
               "name": "keyword.other.powershell"
             },
             "5": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(?i:(\\$)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))",
           "captures": {
+            "0": {
+              "name": "variable.other.readwrite.powershell"
+            },
             "1": {
-              "name": "keyword.other.variable.definition.powershell"
+              "name": "punctuation.definition.variable.powershell"
             },
             "2": {
               "name": "support.variable.drive.powershell"
             },
-            "3": {
-              "name": "variable.other.readwrite.powershell"
-            },
             "4": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "variable.other.member.powershell"
             }
           }
         },
         {
           "match": "(?i:(\\$)(\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))",
           "captures": {
+            "0": {
+              "name": "variable.other.readwrite.powershell"
+            },
             "1": {
-              "name": "keyword.other.variable.definition.powershell"
+              "name": "punctuation.definition.variable.powershell"
             },
             "2": {
               "name": "punctuation.section.braces.begin"
@@ -962,9 +1006,6 @@
             "3": {
               "name": "support.variable.drive.powershell"
             },
-            "4": {
-              "name": "variable.other.readwrite.powershell"
-            },
             "5": {
               "name": "punctuation.section.braces.end"
             }