github-linguist 5.3.3 → 6.0.0

data/grammars/source.postscript.json

@@ -1,33 +1,30 @@
 {
-  "fileTypes": [
-    "ps",
-    "eps"
-  ],
-  "firstLineMatch": "^%!PS",
-  "keyEquivalent": "^~P",
   "name": "Postscript",
+  "scopeName": "source.postscript",
   "patterns": [
     {
+      "name": "string.other.postscript",
       "begin": "\\(",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "#string_content"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.postscript"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.postscript"
         }
-      },
-      "name": "string.other.postscript",
-      "patterns": [
-        {
-          "include": "#string_content"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.Document-Structuring-Comment.postscript",
+      "match": "^(%%(BeginBinary:|BeginCustomColor:|BeginData:|BeginDefaults|BeginDocument:|BeginEmulation:|BeginExitServer:|BeginFeature:|BeginFile:|BeginFont:|BeginObject:|BeginPageSetup:|BeginPaperSize:|BeginPreview:|BeginProcSet|BeginProcessColor:|BeginProlog|BeginResource:|BeginSetup|BoundingBox:|CMYKCustomColor:|ChangeFont:|Copyright:|CreationDate:|Creator:|DocumentCustomColors:|DocumentData:|DocumentFonts:|DocumentMedia:|DocumentNeededFiles:|DocumentNeededFonts:|DocumentNeededProcSets:|DocumentNeededResources:|DocumentPaperColors:|DocumentPaperForms:|DocumentPaperSizes:|DocumentPaperWeights:|DocumentPrinterRequired:|DocumentProcSets:|DocumentProcessColors:|DocumentSuppliedFiles:|DocumentSuppliedFonts:|DocumentSuppliedProcSets:|DocumentSuppliedResources:|EOF|Emulation:|EndBinary:|EndComments|EndCustomColor:|EndData:|EndDefaults|EndDocument:|EndEmulation:|EndExitServer:|EndFeature:|EndFile:|EndFont:|EndObject:|EndPageSetup:|EndPaperSize:|EndPreview:|EndProcSet|EndProcessColor:|EndProlog|EndResource:|EndSetup|ExecuteFile:|Extensions:|Feature:|For:|IncludeDocument:|IncludeFeature:|IncludeFile:|IncludeFont:|IncludeProcSet:|IncludeResource:|LanguageLevel:|OperatorIntervention:|OperatorMessage:|Orientation:|Page:|PageBoundingBox:|PageCustomColors|PageCustomColors:|PageFiles:|PageFonts:|PageMedia:|PageOrder:|PageOrientation:|PageProcessColors|PageProcessColors:|PageRequirements:|PageResources:|PageTrailer|Pages:|PaperColor:|PaperForm:|PaperSize:|PaperWeight:|ProofMode:|RGBCustomColor:|Requirements:|Routing:|Title:|Trailer|VMlocation:|VMusage:|Version|Version:|\\+|\\?BeginFeatureQuery:|\\?BeginFileQuery:|\\?BeginFontListQuery:|\\?BeginFontQuery:|\\?BeginPrinterQuery:|\\?BeginProcSetQuery:|\\?BeginQuery:|\\?BeginResourceListQuery:|\\?BeginResourceQuery:|\\?BeginVMStatus:|\\?EndFeatureQuery:|\\?EndFileQuery:|\\?EndFontListQuery:|\\?EndFontQuery:|\\?EndPrinterQuery:|\\?EndProcSetQuery:|\\?EndQuery:|\\?EndResourceListQuery:|\\?EndResourceQuery:|\\?EndVMStatus:))\\s*(.*)$\\n?",
       "captures": {
         "1": {
           "name": "keyword.other.DSC.postscript"
@@ -35,184 +32,180 @@
         "3": {
           "name": "string.unquoted.DSC.postscript"
         }
-      },
-      "match": "^(%%(BeginBinary:|BeginCustomColor:|BeginData:|BeginDefaults|BeginDocument:|BeginEmulation:|BeginExitServer:|BeginFeature:|BeginFile:|BeginFont:|BeginObject:|BeginPageSetup:|BeginPaperSize:|BeginPreview:|BeginProcSet|BeginProcessColor:|BeginProlog|BeginResource:|BeginSetup|BoundingBox:|CMYKCustomColor:|ChangeFont:|Copyright:|CreationDate:|Creator:|DocumentCustomColors:|DocumentData:|DocumentFonts:|DocumentMedia:|DocumentNeededFiles:|DocumentNeededFonts:|DocumentNeededProcSets:|DocumentNeededResources:|DocumentPaperColors:|DocumentPaperForms:|DocumentPaperSizes:|DocumentPaperWeights:|DocumentPrinterRequired:|DocumentProcSets:|DocumentProcessColors:|DocumentSuppliedFiles:|DocumentSuppliedFonts:|DocumentSuppliedProcSets:|DocumentSuppliedResources:|EOF|Emulation:|EndBinary:|EndComments|EndCustomColor:|EndData:|EndDefaults|EndDocument:|EndEmulation:|EndExitServer:|EndFeature:|EndFile:|EndFont:|EndObject:|EndPageSetup:|EndPaperSize:|EndPreview:|EndProcSet|EndProcessColor:|EndProlog|EndResource:|EndSetup|ExecuteFile:|Extensions:|Feature:|For:|IncludeDocument:|IncludeFeature:|IncludeFile:|IncludeFont:|IncludeProcSet:|IncludeResource:|LanguageLevel:|OperatorIntervention:|OperatorMessage:|Orientation:|Page:|PageBoundingBox:|PageCustomColors|PageCustomColors:|PageFiles:|PageFonts:|PageMedia:|PageOrder:|PageOrientation:|PageProcessColors|PageProcessColors:|PageRequirements:|PageResources:|PageTrailer|Pages:|PaperColor:|PaperForm:|PaperSize:|PaperWeight:|ProofMode:|RGBCustomColor:|Requirements:|Routing:|Title:|Trailer|VMlocation:|VMusage:|Version|Version:|\\+|\\?BeginFeatureQuery:|\\?BeginFileQuery:|\\?BeginFontListQuery:|\\?BeginFontQuery:|\\?BeginPrinterQuery:|\\?BeginProcSetQuery:|\\?BeginQuery:|\\?BeginResourceListQuery:|\\?BeginResourceQuery:|\\?BeginVMStatus:|\\?EndFeatureQuery:|\\?EndFileQuery:|\\?EndFontListQuery:|\\?EndFontQuery:|\\?EndPrinterQuery:|\\?EndProcSetQuery:|\\?EndQuery:|\\?EndResourceListQuery:|\\?EndResourceQuery:|\\?EndVMStatus:))\\s*(.*)$\\n?",
-      "name": "meta.Document-Structuring-Comment.postscript"
+      }
     },
     {
       "begin": "(^[ \\t]+)?(?=%)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.postscript"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.percentage.postscript",
           "begin": "%",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.postscript"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.percentage.postscript"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.postscript"
+        }
+      }
     },
     {
-      "begin": "\\<\\<",
+      "name": "meta.dictionary.postscript",
+      "begin": "\\\u003c\\\u003c",
+      "end": "\\\u003e\\\u003e",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.dictionary.begin.postscript"
         }
       },
-      "end": "\\>\\>",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.dictionary.end.postscript"
         }
-      },
-      "name": "meta.dictionary.postscript",
+      }
+    },
+    {
+      "name": "meta.array.postscript",
+      "begin": "\\[",
+      "end": "\\]",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "\\[",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.array.begin.postscript"
         }
       },
-      "end": "\\]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.array.end.postscript"
         }
-      },
-      "name": "meta.array.postscript",
+      }
+    },
+    {
+      "name": "meta.procedure.postscript",
+      "begin": "{",
+      "end": "}",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "{",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.procedure.begin.postscript"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.procedure.end.postscript"
         }
-      },
-      "name": "meta.procedure.postscript",
+      }
+    },
+    {
+      "name": "string.other.base85.postscript",
+      "begin": "\\\u003c\\~",
+      "end": "\\~\\\u003e",
       "patterns": [
         {
-          "include": "$self"
+          "match": "[!-z\\s]+"
+        },
+        {
+          "name": "invalid.illegal.base85.char.postscript",
+          "match": "."
         }
-      ]
-    },
-    {
-      "begin": "\\<\\~",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.postscript"
         }
       },
-      "end": "\\~\\>",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.postscript"
         }
-      },
-      "name": "string.other.base85.postscript",
+      }
+    },
+    {
+      "name": "string.other.hexadecimal.postscript",
+      "begin": "\\\u003c",
+      "end": "\\\u003e",
       "patterns": [
         {
-          "match": "[!-z\\s]+"
+          "match": "[0-9A-Fa-f\\s]+"
         },
         {
-          "match": ".",
-          "name": "invalid.illegal.base85.char.postscript"
+          "name": "invalid.illegal.hexadecimal.char.postscript",
+          "match": "."
         }
-      ]
-    },
-    {
-      "begin": "\\<",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.postscript"
         }
       },
-      "end": "\\>",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.postscript"
         }
-      },
-      "name": "string.other.hexadecimal.postscript",
-      "patterns": [
-        {
-          "match": "[0-9A-Fa-f\\s]+"
-        },
-        {
-          "match": ".",
-          "name": "invalid.illegal.hexadecimal.char.postscript"
-        }
-      ]
+      }
     },
     {
-      "comment": "well, not really, but short of listing rules for all bases from 2-36 best we can do",
-      "match": "[0-3]?[0-9]#[0-9a-zA-Z]+",
-      "name": "constant.numeric.radix.postscript"
+      "name": "constant.numeric.radix.postscript",
+      "match": "[0-3]?[0-9]#[0-9a-zA-Z]+"
     },
     {
-      "match": "(\\-|\\+)?\\d+(\\.\\d*)?([eE](\\-|\\+)?\\d+)?",
-      "name": "constant.numeric.postscript"
+      "name": "constant.numeric.postscript",
+      "match": "(\\-|\\+)?\\d+(\\.\\d*)?([eE](\\-|\\+)?\\d+)?"
     },
     {
-      "match": "(\\-|\\+)?\\.\\d+([eE](\\-|\\+)?\\d+)?",
-      "name": "constant.numeric.postscript"
+      "name": "constant.numeric.postscript",
+      "match": "(\\-|\\+)?\\.\\d+([eE](\\-|\\+)?\\d+)?"
     },
     {
-      "match": "\\b(abs|add|aload|anchorsearch|and|arc|arcn|arct|arcto|array|ashow|astore|atan|awidthshow|begin|bind|bitshift|bytesavailable|cachestatus|ceiling|charpath|clear|cleartomark|cleardictstack|clip|clippath|closefile|closepath|colorimage|concat|concatmatrix|condition|configurationerror|copy|copypage|cos|count|countdictstack|countexecstack|counttomark|cshow|currentblackgeneration|currentcacheparams|currentcmykcolor|currentcolor|currentcolorrendering|currentcolorscreen|currentcolorspace|currentcolortransfer|currentcontext|currentdash|currentdevparams|currentdict|currentfile|currentflat|currentfont|currentglobal|currentgray|currentgstate|currenthalftone|currenthalftonephase|currenthsbcolor|currentlinecap|currentlinejoin|currentlinewidth|currentmatrix|currentmiterlimit|currentobjectformat|currentpacking|currentpagedevice|currentpoint|currentrgbcolor|currentscreen|currentshared|currentstrokeadjust|currentsystemparams|currenttransfer|currentundercolorremoval|currentuserparams|curveto|cvi|cvlit|cvn|cvr|cvrs|cvs|cvx|def|defaultmatrix|definefont|defineresource|defineusername|defineuserobject|deletefile|detach|deviceinfo|dict|dictfull|dictstack|dictstackoverflow|dictstackunderflow|div|dtransform|dup|echo|eexec|end|eoclip|eofill|eoviewclip|eq|erasepage|errordict|exch|exec|execform|execstack|execstackoverflow|execuserobject|executeonly|executive|exit|exp|false|file|filenameforall|fileposition|fill|filter|findencoding|findfont|findresource|flattenpath|floor|flush|flushfile|FontDirectory|for|forall|fork|ge|get|getinterval|globaldict|GlobalFontDirectory|glyphshow|grestore|grestoreall|gsave|gstate|gt|handleerror|identmatrix|idiv|idtransform|if|ifelse|image|imagemask|index|ineofill|infill|initclip|initgraphics|initmatrix|initviewclip|instroke|internaldict|interrupt|inueofill|inufill|inustroke|invalidaccess|invalidcontext|invalidexit|invalidfileaccess|invalidfont|invalidid|invalidrestore|invertmatrix|ioerror|ISOLatin1Encoding|itransform|join|kshow|known|languagelevel|le|length|limitcheck|lineto|ln|load|lock|log|loop|lt|makefont|makepattern|mark|matrix|maxlength|mod|monitor|moveto|mul|ne|neg|newpath|noaccess|nocurrentpoint|not|notify|null|nulldevice|or|packedarray|pathbbox|pathforall|pop|print|printobject|product|prompt|pstack|put|putinterval|quit|rand|rangecheck|rcurveto|read|readhexstring|readline|readonly|readstring|realtime|rectclip|rectfill|rectstroke|rectviewclip|renamefile|repeat|resetfile|resourceforall|resourcestatus|restore|reversepath|revision|rlineto|rmoveto|roll|rootfont|rotate|round|rrand|run|save|scale|scalefont|scheck|search|selectfont|serialnumber|setbbox|setblackgeneration|setcachedevice|setcachedevice2|setcachelimit|setcacheparams|setcharwidth|setcmykcolor|setcolor|setcolorrendering|setcolorscreen|setcolorspace|setcolortransfer|setdash|setdevparams|setfileposition|setflat|setfont|setglobal|setgray|setgstate|sethalftone|sethalftonephase|sethsbcolor|setlinecap|setlinejoin|setlinewidth|setmatrix|setmiterlimit|setobjectformat|setoverprint|setpacking|setpagedevice|setpattern|setrgbcolor|setscreen|setshared|setstrokeadjust|setsystemparams|settransfer|setucacheparams|setundercolorremoval|setuserparams|setvmthreshold|shareddict|show|showpage|sin|sqrt|srand|stack|stackoverflow|stackunderflow|StandardEncoding|start|startjob|status|statusdict|stop|stopped|store|string|stringwidth|stroke|strokepath|sub|syntaxerror|systemdict|timeout|transform|translate|true|truncate|type|typecheck|token|uappend|ucache|ucachestatus|ueofill|ufill|undef|undefined|undefinedfilename|undefineresource|undefinedresult|undefinefont|undefineresource|undefinedresource|undefineuserobject|unmatchedmark|unregistered|upath|userdict|UserObjects|usertime|ustroke|ustrokepath|version|viewclip|viewclippath|VMerror|vmreclaim|vmstatus|wait|wcheck|where|widthshow|write|writehexstring|writeobject|writestring|wtranslation|xcheck|xor|xshow|xyshow|yield|yshow)\\b",
-      "name": "keyword.operator.postscript"
+      "name": "keyword.operator.postscript",
+      "match": "\\b(abs|add|aload|anchorsearch|and|arc|arcn|arct|arcto|array|ashow|astore|atan|awidthshow|begin|bind|bitshift|bytesavailable|cachestatus|ceiling|charpath|clear|cleartomark|cleardictstack|clip|clippath|closefile|closepath|colorimage|concat|concatmatrix|condition|configurationerror|copy|copypage|cos|count|countdictstack|countexecstack|counttomark|cshow|currentblackgeneration|currentcacheparams|currentcmykcolor|currentcolor|currentcolorrendering|currentcolorscreen|currentcolorspace|currentcolortransfer|currentcontext|currentdash|currentdevparams|currentdict|currentfile|currentflat|currentfont|currentglobal|currentgray|currentgstate|currenthalftone|currenthalftonephase|currenthsbcolor|currentlinecap|currentlinejoin|currentlinewidth|currentmatrix|currentmiterlimit|currentobjectformat|currentpacking|currentpagedevice|currentpoint|currentrgbcolor|currentscreen|currentshared|currentstrokeadjust|currentsystemparams|currenttransfer|currentundercolorremoval|currentuserparams|curveto|cvi|cvlit|cvn|cvr|cvrs|cvs|cvx|def|defaultmatrix|definefont|defineresource|defineusername|defineuserobject|deletefile|detach|deviceinfo|dict|dictfull|dictstack|dictstackoverflow|dictstackunderflow|div|dtransform|dup|echo|eexec|end|eoclip|eofill|eoviewclip|eq|erasepage|errordict|exch|exec|execform|execstack|execstackoverflow|execuserobject|executeonly|executive|exit|exp|false|file|filenameforall|fileposition|fill|filter|findencoding|findfont|findresource|flattenpath|floor|flush|flushfile|FontDirectory|for|forall|fork|ge|get|getinterval|globaldict|GlobalFontDirectory|glyphshow|grestore|grestoreall|gsave|gstate|gt|handleerror|identmatrix|idiv|idtransform|if|ifelse|image|imagemask|index|ineofill|infill|initclip|initgraphics|initmatrix|initviewclip|instroke|internaldict|interrupt|inueofill|inufill|inustroke|invalidaccess|invalidcontext|invalidexit|invalidfileaccess|invalidfont|invalidid|invalidrestore|invertmatrix|ioerror|ISOLatin1Encoding|itransform|join|kshow|known|languagelevel|le|length|limitcheck|lineto|ln|load|lock|log|loop|lt|makefont|makepattern|mark|matrix|maxlength|mod|monitor|moveto|mul|ne|neg|newpath|noaccess|nocurrentpoint|not|notify|null|nulldevice|or|packedarray|pathbbox|pathforall|pop|print|printobject|product|prompt|pstack|put|putinterval|quit|rand|rangecheck|rcurveto|read|readhexstring|readline|readonly|readstring|realtime|rectclip|rectfill|rectstroke|rectviewclip|renamefile|repeat|resetfile|resourceforall|resourcestatus|restore|reversepath|revision|rlineto|rmoveto|roll|rootfont|rotate|round|rrand|run|save|scale|scalefont|scheck|search|selectfont|serialnumber|setbbox|setblackgeneration|setcachedevice|setcachedevice2|setcachelimit|setcacheparams|setcharwidth|setcmykcolor|setcolor|setcolorrendering|setcolorscreen|setcolorspace|setcolortransfer|setdash|setdevparams|setfileposition|setflat|setfont|setglobal|setgray|setgstate|sethalftone|sethalftonephase|sethsbcolor|setlinecap|setlinejoin|setlinewidth|setmatrix|setmiterlimit|setobjectformat|setoverprint|setpacking|setpagedevice|setpattern|setrgbcolor|setscreen|setshared|setstrokeadjust|setsystemparams|settransfer|setucacheparams|setundercolorremoval|setuserparams|setvmthreshold|shareddict|show|showpage|sin|sqrt|srand|stack|stackoverflow|stackunderflow|StandardEncoding|start|startjob|status|statusdict|stop|stopped|store|string|stringwidth|stroke|strokepath|sub|syntaxerror|systemdict|timeout|transform|translate|true|truncate|type|typecheck|token|uappend|ucache|ucachestatus|ueofill|ufill|undef|undefined|undefinedfilename|undefineresource|undefinedresult|undefinefont|undefineresource|undefinedresource|undefineuserobject|unmatchedmark|unregistered|upath|userdict|UserObjects|usertime|ustroke|ustrokepath|version|viewclip|viewclippath|VMerror|vmreclaim|vmstatus|wait|wcheck|where|widthshow|write|writehexstring|writeobject|writestring|wtranslation|xcheck|xor|xshow|xyshow|yield|yshow)\\b"
     },
     {
-      "match": "//[^\\(\\)\\<\\>\\[\\]\\{\\}\\/\\%\\s]+",
-      "name": "variable.other.immediately-evaluated.postscript"
+      "name": "variable.other.immediately-evaluated.postscript",
+      "match": "//[^\\(\\)\\\u003c\\\u003e\\[\\]\\{\\}\\/\\%\\s]+"
     },
     {
-      "match": "/[^\\(\\)\\<\\>\\[\\]\\{\\}\\/\\%\\s]+",
-      "name": "variable.other.literal.postscript"
+      "name": "variable.other.literal.postscript",
+      "match": "/[^\\(\\)\\\u003c\\\u003e\\[\\]\\{\\}\\/\\%\\s]+"
     },
     {
-      "comment": "stuff like 22@ff will show as number 22 followed by name @ff, but should be name 22@ff!",
-      "match": "[^\\(\\)\\<\\>\\[\\]\\{\\}\\/\\%\\s]+",
-      "name": "variable.other.name.postscript"
+      "name": "variable.other.name.postscript",
+      "match": "[^\\(\\)\\\u003c\\\u003e\\[\\]\\{\\}\\/\\%\\s]+"
     }
   ],
   "repository": {
     "string_content": {
       "patterns": [
         {
-          "match": "\\\\[0-7]{1,3}",
-          "name": "constant.numeric.octal.postscript"
+          "name": "constant.numeric.octal.postscript",
+          "match": "\\\\[0-7]{1,3}"
         },
         {
-          "match": "\\\\(\\\\|[nrtbf\\(\\)]|[0-7]{1,3}|\\r?\\n)",
-          "name": "constant.character.escape.postscript"
+          "name": "constant.character.escape.postscript",
+          "match": "\\\\(\\\\|[nrtbf\\(\\)]|[0-7]{1,3}|\\r?\\n)"
         },
         {
-          "match": "\\\\",
-          "name": "invalid.illegal.unknown-escape.postscript.ignored"
+          "name": "invalid.illegal.unknown-escape.postscript.ignored",
+          "match": "\\\\"
         },
         {
           "begin": "\\(",
@@ -225,7 +218,5 @@
         }
       ]
     }
-  },
-  "scopeName": "source.postscript",
-  "uuid": "B89483CD-6AE0-4517-BE2C-82F8083B7359"
-}
+  }
+}

data/grammars/source.pov-ray sdl.json

@@ -1,88 +1,82 @@
 {
-  "fileTypes": [
-    "pov",
-    "inc"
-  ],
-  "foldingStartMarker": "\\s*\\{\\s*$",
-  "foldingStopMarker": "^\\s*\\}",
   "name": "POV-Ray SDL",
   "scopeName": "source.pov-ray sdl",
   "patterns": [
     {
+      "name": "string.quoted.double.povray",
       "begin": "\"",
       "end": "\"",
-      "name": "string.quoted.double.povray",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.povray"
+          "name": "constant.character.escape.povray",
+          "match": "\\\\."
         }
       ]
     },
     {
+      "name": "comment.block.povray",
       "begin": "\\/\\*",
-      "end": "\\*\\/",
-      "name": "comment.block.povray"
+      "end": "\\*\\/"
     },
     {
-      "match": "\\/\\/.*",
-      "name": "comment.line.povray"
+      "name": "comment.line.povray",
+      "match": "\\/\\/.*"
     },
     {
-      "match": "\\b([0-9]+(\\.[0-9]*)?|\\.[0-9]+)([eE][+-]?[0-9]+)?\\b",
-      "name": "constant.numeric.povray"
+      "name": "constant.numeric.povray",
+      "match": "\\b([0-9]+(\\.[0-9]*)?|\\.[0-9]+)([eE][+-]?[0-9]+)?\\b"
     },
     {
-      "match": "[\\+\\-\\*\\/\\<\\=\\>\\{\\}\\(\\)\\[\\]\\.\\,\\;\\:\\?\\!]",
-      "name": "keyword.operator.povray"
+      "name": "keyword.operator.povray",
+      "match": "[\\+\\-\\*\\/\\\u003c\\=\\\u003e\\{\\}\\(\\)\\[\\]\\.\\,\\;\\:\\?\\!]"
     },
     {
-      "match": "\\b(on|off|yes|no|true|false|pi)\\b",
-      "name": "constant.language.povray"
+      "name": "constant.language.povray",
+      "match": "\\b(on|off|yes|no|true|false|pi)\\b"
     },
     {
-      "match": "\\b(box|cone|cylinder|difference|height_field|intersection|isosurface|julia_fractal|merge|mesh2?|object|plane|sphere|superellipsoid|text|torus|union)\\b",
-      "name": "keyword.shape.povray"
+      "name": "keyword.shape.povray",
+      "match": "\\b(box|cone|cylinder|difference|height_field|intersection|isosurface|julia_fractal|merge|mesh2?|object|plane|sphere|superellipsoid|text|torus|union)\\b"
     },
     {
-      "match": "\\b(camera|clipped_by|colou?r_map|contained_by|default|density|face_indices|finish|fog|global_settings|interior|light_source|material|media|normal(_vectors)?|pigment(_map)?|photons|radiosity|reflection|scattering|texture|uv_vectors|vertex_vectors|warp)\\b",
-      "name": "keyword.block.povray"
+      "name": "keyword.block.povray",
+      "match": "\\b(camera|clipped_by|colou?r_map|contained_by|default|density|face_indices|finish|fog|global_settings|interior|light_source|material|media|normal(_vectors)?|pigment(_map)?|photons|radiosity|reflection|scattering|texture|uv_vectors|vertex_vectors|warp)\\b"
     },
     {
-      "match": "\\b(adaptive|adc_bailout|agate|ambient|angle|area_light|array|assumed_gamma|blue|bozo|brightness|bumps|checker|circular|collect|colou?r|conserve_energy|count|crackle|cylindrical|diffuse|direction|distance|dist_exp|error_bound|exponent|extinction|fade_color|fade_distance|fade_power|falloff|filter|fog_alt|fog_offset|fog_type|function|fresnel|gradient|granite|gr[ae]y_threshold|gr[ae]y|green|hollow|intervals|inverse|ior|jitter|lambda|location|look_at|low_error_factor|marble|max_gradient|max_iteration|max_trace_level|media_attenuation|media_interaction|metallic|method|minimum_reuse|nearest_count|noise_generator|no_shadow|octaves|omega|orient(ation)?|pass_through|planar|point_at|poly_wave|precision|pretrace_end|pretrace_start|quaternion|radius|ramp_wave|recursion_limit|repeat|rgbf?t?|red|refraction|right|roughness|samples|shadowless|sky|spacing|specular|spherical|spotlight|srgbf?t?|target|transmit|turbulence|uv_mapping|up|water_level|wrinkles|x|y|z)\\b",
-      "name": "keyword.parameter.povray"
+      "name": "keyword.parameter.povray",
+      "match": "\\b(adaptive|adc_bailout|agate|ambient|angle|area_light|array|assumed_gamma|blue|bozo|brightness|bumps|checker|circular|collect|colou?r|conserve_energy|count|crackle|cylindrical|diffuse|direction|distance|dist_exp|error_bound|exponent|extinction|fade_color|fade_distance|fade_power|falloff|filter|fog_alt|fog_offset|fog_type|function|fresnel|gradient|granite|gr[ae]y_threshold|gr[ae]y|green|hollow|intervals|inverse|ior|jitter|lambda|location|look_at|low_error_factor|marble|max_gradient|max_iteration|max_trace_level|media_attenuation|media_interaction|metallic|method|minimum_reuse|nearest_count|noise_generator|no_shadow|octaves|omega|orient(ation)?|pass_through|planar|point_at|poly_wave|precision|pretrace_end|pretrace_start|quaternion|radius|ramp_wave|recursion_limit|repeat|rgbf?t?|red|refraction|right|roughness|samples|shadowless|sky|spacing|specular|spherical|spotlight|srgbf?t?|target|transmit|turbulence|uv_mapping|up|water_level|wrinkles|x|y|z)\\b"
     },
     {
-      "match": "\\b(abs|concat|dimension_size|internal|max|min|mod|pow|rand|seed|sin|sqrt|vcross|vlength|vrotate|vnormalize)\\b",
-      "name": "keyword.function.povray"
+      "name": "keyword.function.povray",
+      "match": "\\b(abs|concat|dimension_size|internal|max|min|mod|pow|rand|seed|sin|sqrt|vcross|vlength|vrotate|vnormalize)\\b"
     },
     {
-      "match": "\\b(rotate|scale|translate)\\b",
-      "name": "keyword.modifier.povray"
+      "name": "keyword.modifier.povray",
+      "match": "\\b(rotate|scale|translate)\\b"
     },
     {
-      "match": "\\#(break|case|declare|debug|else(if)?|end|error|fopen|for|if(n?def)?|include|local|macro|range|read|switch|version|while|write)\\b",
-      "name": "keyword.control.povray"
+      "name": "keyword.control.povray",
+      "match": "\\#(break|case|declare|debug|else(if)?|end|error|fopen|for|if(n?def)?|include|local|macro|range|read|switch|version|while|write)\\b"
     },
     {
-      "match": "\\#(default)\\b",
-      "name": "invalid.deprecated.keyword.control.povray"
+      "name": "invalid.deprecated.keyword.control.povray",
+      "match": "\\#(default)\\b"
     },
     {
-      "match": "\\#[_a-zA-Z0-9]*\\b",
-      "name": "invalid.illegal.povray"
+      "name": "invalid.illegal.povray",
+      "match": "\\#[_a-zA-Z0-9]*\\b"
     },
     {
-      "match": "\\b(image_height|image_width)\\b",
-      "name": "variable.language.povray"
+      "name": "variable.language.povray",
+      "match": "\\b(image_height|image_width)\\b"
     },
     {
-      "match": "\\b([_a-z][_a-z0-9]*)\\b",
-      "name": "invalid.deprecated.future-keyword.povray"
+      "name": "invalid.deprecated.future-keyword.povray",
+      "match": "\\b([_a-z][_a-z0-9]*)\\b"
     },
     {
-      "match": "\\b[_a-zA-Z][_a-zA-Z0-9]*\\b",
-      "name": "variable.parameter.povray"
+      "name": "variable.parameter.povray",
+      "match": "\\b[_a-zA-Z][_a-zA-Z0-9]*\\b"
     }
   ]
-}
+}

data/grammars/source.powershell.json

@@ -1,35 +1,31 @@
 {
-  "fileTypes": [
-    "ps1",
-    "psm1",
-    "psd1"
-  ],
   "name": "PowerShell",
+  "scopeName": "source.powershell",
   "patterns": [
     {
-      "begin": "<#",
+      "name": "comment.block.powershell",
+      "begin": "\u003c#",
+      "end": "#\u003e",
+      "patterns": [
+        {
+          "include": "#commentEmbeddedDocs"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.start.definition.comment.block.powershell"
         }
       },
-      "end": "#>",
       "endCaptures": {
         "0": {
           "name": "punctuation.end.definition.comment.block.powershell"
         }
-      },
-      "name": "comment.block.powershell",
-      "patterns": [
-        {
-          "include": "#commentEmbeddedDocs"
-        }
-      ]
+      }
     },
     {
-      "begin": "(?<![\\\\-])#",
-      "end": "$",
       "name": "comment.line.number-sign.powershell",
+      "begin": "(?\u003c![\\\\-])#",
+      "end": "$",
       "patterns": [
         {
           "include": "#commentEmbeddedDocs"
@@ -37,8 +33,8 @@
       ]
     },
     {
-      "match": "[2-6]>&1|>>|>|<<|<|>|>\\||[1-6]>|[1-6]>>",
-      "name": "keyword.operator.redirection.powershell"
+      "name": "keyword.operator.redirection.powershell",
+      "match": "[2-6]\u003e\u00261|\u003e\u003e|\u003e|\u003c\u003c|\u003c|\u003e|\u003e\\||[1-6]\u003e|[1-6]\u003e\u003e"
     },
     {
       "include": "#commands"
@@ -59,9 +55,9 @@
       "include": "#type"
     },
     {
-      "begin": "(?<!(?<!`)\")\"",
-      "end": "\"(?!\")",
       "name": "string.quoted.double.powershell",
+      "begin": "(?\u003c!(?\u003c!`)\")\"",
+      "end": "\"(?!\")",
       "patterns": [
         {
           "include": "#variableNoProperty"
@@ -73,30 +69,29 @@
           "include": "#interpolation"
         },
         {
-          "match": "`\\s*$",
-          "name": "keyword.other.powershell"
+          "name": "keyword.other.powershell",
+          "match": "`\\s*$"
         }
       ]
     },
     {
-      "comment": "Needed to parse stuff correctly in 'argument mode'. (See about_parsing.)",
       "include": "#doubleQuotedStringEscapes"
     },
     {
-      "begin": "(?<!')'",
-      "end": "'(?!')",
       "name": "string.quoted.single.powershell",
+      "begin": "(?\u003c!')'",
+      "end": "'(?!')",
       "patterns": [
         {
-          "match": "''",
-          "name": "constant.character.escape.powershell"
+          "name": "constant.character.escape.powershell",
+          "match": "''"
         }
       ]
     },
     {
+      "name": "string.quoted.double.heredoc.powershell",
       "begin": "\\@\"(?=$)",
       "end": "^\"@",
-      "name": "string.quoted.double.heredoc.powershell",
       "patterns": [
         {
           "include": "#variableNoProperty"
@@ -110,13 +105,13 @@
       ]
     },
     {
+      "name": "string.quoted.single.heredoc.powershell",
       "begin": "\\@'(?=$)",
       "end": "^'@",
-      "name": "string.quoted.single.heredoc.powershell",
       "patterns": [
         {
-          "match": "''",
-          "name": "constant.character.escape.powershell"
+          "name": "constant.character.escape.powershell",
+          "match": "''"
         }
       ]
     },
@@ -124,49 +119,49 @@
       "include": "#numericConstant"
     },
     {
+      "name": "meta.group.array-expression.powershell",
       "begin": "@\\(",
-      "captures": {
-        "0": {
-          "name": "keyword.other.powershell"
-        }
-      },
       "end": "\\)",
-      "name": "meta.group.array-expression.powershell",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "\\$\\(",
+      ],
       "captures": {
         "0": {
           "name": "keyword.other.powershell"
         }
-      },
-      "comment": "TODO: move to repo; make recursive.",
-      "end": "\\)",
+      }
+    },
+    {
       "name": "meta.group.complex.subexpression.powershell",
+      "begin": "\\$\\(",
+      "end": "\\)",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
+      ],
+      "captures": {
+        "0": {
+          "name": "keyword.other.powershell"
+        }
+      }
     },
     {
-      "match": "(?<!\\w)-([ci]?[lg][te]|eq|ne)",
-      "name": "keyword.operator.logical.powershell"
+      "name": "keyword.operator.logical.powershell",
+      "match": "(?\u003c!\\w)-([ci]?[lg][te]|eq|ne)"
     },
     {
-      "match": "(?i:[a-z][a-z0-9]+-?[a-z][a-z0-9]+)(?i:\\.(?i:exe|cmd|bat|ps1))",
-      "name": "support.function.powershell"
+      "name": "support.function.powershell",
+      "match": "(?i:[a-z][a-z0-9]+-?[a-z][a-z0-9]+)(?i:\\.(?i:exe|cmd|bat|ps1))"
     },
     {
-      "match": "(?<!\\w)((?i:begin|break|catch|continue|data|define|do|dynamicparam|else|elseif|end|exit|finally|for|foreach(?!-object)|from|if|in|inlinescript|parallel|param|process|return|switch|throw|trap|try|until|using|var|where(?!=-object)|while)|%|\\?)(?!\\w)",
-      "name": "keyword.control.powershell"
+      "name": "keyword.control.powershell",
+      "match": "(?\u003c!\\w)((?i:begin|break|catch|continue|data|define|do|dynamicparam|else|elseif|end|exit|finally|for|foreach(?!-object)|from|if|in|inlinescript|parallel|param|process|return|switch|throw|trap|try|until|using|var|where(?!=-object)|while)|%|\\?)(?!\\w)"
     },
     {
+      "match": "(?\u003c!\\w)((?i:class)|%|\\?)(?:\\s)+((?:\\p{L}|\\d|_|-|)+)\\b",
       "captures": {
         "1": {
           "name": "storage.type.powershell"
@@ -174,76 +169,62 @@
         "2": {
           "name": "entity.name.function"
         }
-      },
-      "comment": "capture should be entity.name.type, but it doesn't provide a good color in the default schema.",
-      "match": "(?<!\\w)((?i:class)|%|\\?)(?:\\s)+((?:\\p{L}|\\d|_|-|)+)\\b"
+      }
     },
     {
-      "match": "(?<!\\w)-(?i:is(?:not)?|as)\\b",
-      "name": "keyword.operator.comparison.powershell"
+      "name": "keyword.operator.comparison.powershell",
+      "match": "(?\u003c!\\w)-(?i:is(?:not)?|as)\\b"
     },
     {
-      "match": "(?<!\\w)-(?i:[ic]?(?:eq|ne|[gl][te]|(?:not)?(?:like|match|contains|in)|replace))(?!\\p{L})",
-      "name": "keyword.operator.comparison.powershell"
+      "name": "keyword.operator.comparison.powershell",
+      "match": "(?\u003c!\\w)-(?i:[ic]?(?:eq|ne|[gl][te]|(?:not)?(?:like|match|contains|in)|replace))(?!\\p{L})"
     },
     {
-      "match": "(?<!\\w)-(?i:join|split)(?!\\p{L})|!",
-      "name": "keyword.operator.unary.powershell"
+      "name": "keyword.operator.unary.powershell",
+      "match": "(?\u003c!\\w)-(?i:join|split)(?!\\p{L})|!"
     },
     {
-      "match": "(?<!\\w)-(?i:and|or|not|xor)(?!\\p{L})|!",
-      "name": "keyword.operator.logical.powershell"
+      "name": "keyword.operator.logical.powershell",
+      "match": "(?\u003c!\\w)-(?i:and|or|not|xor)(?!\\p{L})|!"
     },
     {
-      "match": "(?<!\\w)-(?i:band|bor|bnot|bxor)(?!\\p{L})",
-      "name": "keyword.operator.bitwise.powershell"
+      "name": "keyword.operator.bitwise.powershell",
+      "match": "(?\u003c!\\w)-(?i:band|bor|bnot|bxor)(?!\\p{L})"
     },
     {
-      "match": "(?<!\\w)-(?i:f)(?!\\p{L})",
-      "name": "keyword.operator.string-format.powershell"
+      "name": "keyword.operator.string-format.powershell",
+      "match": "(?\u003c!\\w)-(?i:f)(?!\\p{L})"
     },
     {
-      "match": "[+%*/-]?=|[+/*%-]",
-      "name": "keyword.operator.assignment.powershell"
+      "name": "keyword.operator.assignment.powershell",
+      "match": "[+%*/-]?=|[+/*%-]"
     },
     {
-      "match": "\\|{2}|&{2}|;",
-      "name": "keyword.other.statement-separator.powershell"
+      "name": "keyword.other.statement-separator.powershell",
+      "match": "\\|{2}|\u0026{2}|;"
     },
     {
-      "match": "&|(?<!\\w)\\.(?= )|`|,|\\|",
-      "name": "keyword.operator.other.powershell"
+      "name": "keyword.operator.other.powershell",
+      "match": "\u0026|(?\u003c!\\w)\\.(?= )|`|,|\\|"
     },
     {
-      "comment": "This is very imprecise, is there a syntax for 'must come after...' ",
-      "match": "(?<!\\s|^)\\.\\.(?=\\d|\\(|\\$)",
-      "name": "keyword.operator.range.powershell"
+      "name": "keyword.operator.range.powershell",
+      "match": "(?\u003c!\\s|^)\\.\\.(?=\\d|\\(|\\$)"
     }
   ],
   "repository": {
     "attribute": {
       "begin": "\\[(\\p{L}|\\.|``\\d+)+(?=\\()",
-      "beginCaptures": {
-        "0": {
-          "name": "entity.name.tag"
-        },
-        "1": {
-          "name": "entity.name.tag"
-        }
-      },
       "end": "\\]",
-      "endCaptures": {
-        "0": {
-          "name": "entity.name.tag"
-        }
-      },
       "patterns": [
         {
+          "name": "entity.other.attribute-name",
           "begin": "\\(",
           "end": "\\)",
-          "name": "entity.other.attribute-name",
           "patterns": [
             {
+              "name": "entity.other.attribute-name.powershell",
+              "match": "(\\w+)\\s*=?([^\"']*?|'[^']*?'|\"[^\"]*?\")?(?=,|\\))",
               "captures": {
                 "0": {
                   "name": "entity.other.attribute.parameter.powershell"
@@ -254,35 +235,45 @@
                 "2": {
                   "name": "variable.other.powershell"
                 }
-              },
-              "comment": "really we should match the known attributes first",
-              "match": "(\\w+)\\s*=?([^\"']*?|'[^']*?'|\"[^\"]*?\")?(?=,|\\))",
-              "name": "entity.other.attribute-name.powershell"
+              }
             },
             {
               "include": "#variable"
             }
           ]
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "entity.name.tag"
+        },
+        "1": {
+          "name": "entity.name.tag"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "entity.name.tag"
+        }
+      }
     },
     "commands": {
       "patterns": [
         {
-          "comment": "Verb-Noun pattern:",
-          "match": "(?:(\\p{L}|\\d|_|-|\\\\|\\:)*\\\\)?\\b(?i:Add|Approve|Assert|Backup|Block|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)\\-.+?(?:\\.(?i:exe|cmd|bat|ps1))?\\b",
-          "name": "support.function.powershell"
+          "name": "support.function.powershell",
+          "match": "(?:(\\p{L}|\\d|_|-|\\\\|\\:)*\\\\)?\\b(?i:Add|Approve|Assert|Backup|Block|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)\\-.+?(?:\\.(?i:exe|cmd|bat|ps1))?\\b"
         },
         {
-          "comment": "Builtin cmdlets with reserved verbs",
-          "match": "(?<!\\w)(?i:foreach-object)(?!\\w)",
-          "name": "support.function.powershell"
+          "name": "support.function.powershell",
+          "match": "(?\u003c!\\w)(?i:foreach-object)(?!\\w)"
         }
       ]
     },
     "commentEmbeddedDocs": {
       "patterns": [
         {
+          "name": "comment.documentation.embedded.powershell",
+          "match": "(?i:\\s*(\\.)(SYNOPSIS|DESCRIPTION|EXAMPLE|INPUTS|OUTPUTS|NOTES|LINK|COMPONENT|FUNCTIONALITY))",
           "captures": {
             "1": {
               "name": "constant.string.documentation.powershell"
@@ -290,11 +281,11 @@
             "2": {
               "name": "keyword.operator.documentation.powershell"
             }
-          },
-          "match": "(?i:\\s*(\\.)(SYNOPSIS|DESCRIPTION|EXAMPLE|INPUTS|OUTPUTS|NOTES|LINK|COMPONENT|FUNCTIONALITY))",
-          "name": "comment.documentation.embedded.powershell"
+          }
         },
         {
+          "name": "comment.documentation.embedded.powershell",
+          "match": "(?i:\\s*(\\.)(PARAMETER|FORWARDHELPTARGETNAME|FORWARDHELPCATEGORY|REMOTEHELPRUNSPACE|EXTERNALHELP)\\s+([a-z0-9-_]+))",
           "captures": {
             "1": {
               "name": "constant.string.documentation.powershell"
@@ -305,11 +296,11 @@
             "3": {
               "name": "keyword.operator.documentation.powershell"
             }
-          },
-          "match": "(?i:\\s*(\\.)(PARAMETER|FORWARDHELPTARGETNAME|FORWARDHELPCATEGORY|REMOTEHELPRUNSPACE|EXTERNALHELP)\\s+([a-z0-9-_]+))",
-          "name": "comment.documentation.embedded.powershell"
+          }
         },
         {
+          "name": "comment.documentation.embedded.powershell",
+          "match": "(?i:requires\\s+-(Version\\s+\\d(.\\d+)?|Assembly\\s+(.*)|Module\\s+(.*)|PsSnapIn\\s+(.*)|ShellId\\s+(.*)))",
           "captures": {
             "1": {
               "name": "constant.string.documentation.powershell"
@@ -320,26 +311,25 @@
             "3": {
               "name": "string.quoted.double.heredoc.powershell"
             }
-          },
-          "match": "(?i:requires\\s+-(Version\\s+\\d(.\\d+)?|Assembly\\s+(.*)|Module\\s+(.*)|PsSnapIn\\s+(.*)|ShellId\\s+(.*)))",
-          "name": "comment.documentation.embedded.powershell"
+          }
         }
       ]
     },
     "doubleQuotedStringEscapes": {
       "patterns": [
         {
-          "match": "`[0abnfrvt\"'$`]",
-          "name": "constant.character.escape.powershell"
+          "name": "constant.character.escape.powershell",
+          "match": "`[0abnfrvt\"'$`]"
         },
         {
-          "match": "\"\"",
-          "name": "constant.character.escape.powershell"
+          "name": "constant.character.escape.powershell",
+          "match": "\"\""
         }
       ]
     },
     "function": {
       "begin": "((?i:function|filter|configuration|workflow))\\s+((?:\\p{L}|\\d|_|-|\\.)+)",
+      "end": "\\{|\\(",
       "beginCaptures": {
         "0": {
           "name": "meta.function"
@@ -350,23 +340,12 @@
         "2": {
           "name": "entity.name.function"
         }
-      },
-      "end": "\\{|\\("
+      }
     },
     "interpolatedStringContent": {
-      "begin": "\\(",
-      "beginCaptures": {
-        "0": {
-          "name": "keyword.other.powershell"
-        }
-      },
       "contentName": "interpolated.simple.source.powershell",
+      "begin": "\\(",
       "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "keyword.other.powershell"
-        }
-      },
       "patterns": [
         {
           "include": "$self"
@@ -377,22 +356,22 @@
         {
           "include": "#interpolatedStringContent"
         }
-      ]
-    },
-    "interpolation": {
-      "begin": "(\\$)\\(",
+      ],
       "beginCaptures": {
         "0": {
           "name": "keyword.other.powershell"
         }
       },
-      "contentName": "interpolated.complex.source.powershell",
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "keyword.other.powershell"
         }
-      },
+      }
+    },
+    "interpolation": {
+      "contentName": "interpolated.complex.source.powershell",
+      "begin": "(\\$)\\(",
+      "end": "\\)",
       "patterns": [
         {
           "include": "$self"
@@ -403,11 +382,23 @@
         {
           "include": "#interpolatedStringContent"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.other.powershell"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "keyword.other.powershell"
+        }
+      }
     },
     "numericConstant": {
       "patterns": [
         {
+          "name": "constant.numeric.hexadecimal.powershell",
+          "match": "(?\u003c!\\w)(?i:(0x)([a-f0-9]+)((?i:L)?(?i:[kmgtp]b)?))(?!\\w)",
           "captures": {
             "1": {
               "name": "keyword.operator.math.powershell"
@@ -418,11 +409,11 @@
             "3": {
               "name": "keyword.other.powershell"
             }
-          },
-          "match": "(?<!\\w)(?i:(0x)([a-f0-9]+)((?i:L)?(?i:[kmgtp]b)?))(?!\\w)",
-          "name": "constant.numeric.hexadecimal.powershell"
+          }
         },
         {
+          "name": "constant.numeric.scientific.powershell",
+          "match": "(?\u003c!\\w)(?i:(\\d*\\.?\\d+)(?:((?i:E)[+-]?)(\\d+))?((?i:[DL])?)((?i:[kmgtp]b)?))(?!\\w)",
           "captures": {
             "1": {
               "name": "support.constant.powershell"
@@ -439,16 +430,14 @@
             "5": {
               "name": "keyword.other.powershell"
             }
-          },
-          "match": "(?<!\\w)(?i:(\\d*\\.?\\d+)(?:((?i:E)[+-]?)(\\d+))?((?i:[DL])?)((?i:[kmgtp]b)?))(?!\\w)",
-          "name": "constant.numeric.scientific.powershell"
+          }
         }
       ]
     },
     "scriptblock": {
+      "name": "meta.scriptblock.powershell",
       "begin": "\\{",
       "end": "\\}",
-      "name": "meta.scriptblock.powershell",
       "patterns": [
         {
           "include": "$self"
@@ -457,31 +446,31 @@
     },
     "type": {
       "begin": "\\[",
+      "end": "\\]",
+      "patterns": [
+        {
+          "name": "entity.other.attribute-name",
+          "match": "(\\p{L}|\\.|``\\d+)+?"
+        },
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "entity.other.attribute-name"
         }
       },
-      "comment": "name should be entity.name.type but default schema doesn't have a good color for it",
-      "end": "\\]",
       "endCaptures": {
         "0": {
           "name": "entity.other.attribute-name"
         }
-      },
-      "patterns": [
-        {
-          "match": "(\\p{L}|\\.|``\\d+)+?",
-          "name": "entity.other.attribute-name"
-        },
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     "variable": {
       "patterns": [
         {
+          "match": "(\\$)(?i:(False|Null|True))\\b",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -489,11 +478,10 @@
             "2": {
               "name": "constant.language.powershell"
             }
-          },
-          "comment": "These are special constants.",
-          "match": "(\\$)(?i:(False|Null|True))\\b"
+          }
         },
         {
+          "match": "(\\$)(?i:(Error|ExecutionContext|Host|Home|PID|PsHome|PsVersionTable|ShellID))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?\\b",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -504,11 +492,10 @@
             "3": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "comment": "These are the other built-in constants.",
-          "match": "(\\$)(?i:(Error|ExecutionContext|Host|Home|PID|PsHome|PsVersionTable|ShellID))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?\\b"
+          }
         },
         {
+          "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.powershell"
@@ -519,11 +506,10 @@
             "3": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "comment": "Automatic variables are not constants, but they are read-only. In monokai (default) color schema support.variable doesn't have color, so we use constant.",
-          "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"
+          }
         },
         {
+          "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.powershell"
@@ -534,11 +520,10 @@
             "3": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "comment": "Style preference variables as language variables so that they stand out.",
-          "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"
+          }
         },
         {
+          "match": "(?i:(\\$)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -552,10 +537,10 @@
             "4": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "match": "(?i:(\\$)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
+          }
         },
         {
+          "match": "(?i:(\\$\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -572,10 +557,10 @@
             "5": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "match": "(?i:(\\$\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
+          }
         },
         {
+          "match": "(?i:(\\$)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -589,10 +574,10 @@
             "4": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "match": "(?i:(\\$)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
+          }
         },
         {
+          "match": "(?i:(\\$\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -609,14 +594,14 @@
             "5": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "match": "(?i:(\\$\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
+          }
         }
       ]
     },
     "variableNoProperty": {
       "patterns": [
         {
+          "match": "(\\$)(?i:(False|Null|True))\\b",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -624,11 +609,10 @@
             "2": {
               "name": "constant.language.powershell"
             }
-          },
-          "comment": "These are special constants.",
-          "match": "(\\$)(?i:(False|Null|True))\\b"
+          }
         },
         {
+          "match": "(\\$)(?i:(Error|ExecutionContext|Host|Home|PID|PsHome|PsVersionTable|ShellID))\\b",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -639,11 +623,10 @@
             "3": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "comment": "These are the other built-in constants.",
-          "match": "(\\$)(?i:(Error|ExecutionContext|Host|Home|PID|PsHome|PsVersionTable|ShellID))\\b"
+          }
         },
         {
+          "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.powershell"
@@ -654,11 +637,10 @@
             "3": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "comment": "Automatic variables are not constants, but they are read-only...",
-          "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"
+          }
         },
         {
+          "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.powershell"
@@ -669,11 +651,10 @@
             "3": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "comment": "Style preference variables as language variables so that they stand out.",
-          "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"
+          }
         },
         {
+          "match": "(?i:(\\$)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -687,10 +668,10 @@
             "4": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "match": "(?i:(\\$)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))"
+          }
         },
         {
+          "match": "(?i:(\\$\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -707,10 +688,10 @@
             "5": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "match": "(?i:(\\$\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))"
+          }
         },
         {
+          "match": "(?i:(\\$)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -724,10 +705,10 @@
             "4": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "match": "(?i:(\\$)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))"
+          }
         },
         {
+          "match": "(?i:(\\$\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))",
           "captures": {
             "1": {
               "name": "keyword.other.powershell"
@@ -744,12 +725,9 @@
             "5": {
               "name": "entity.name.function.invocation.powershell"
             }
-          },
-          "match": "(?i:(\\$\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))"
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.powershell",
-  "uuid": "f8f5ffb0-503e-11df-9879-0800200c9a66"
-}
+  }
+}