github-linguist 6.1.0 → 6.2.0

data/grammars/source.hsig.json

@@ -215,7 +215,7 @@
         {
           "name": "meta.ctor.type-declaration.haskell.hsig",
           "contentName": "meta.type-signature.haskell.hsig",
-          "begin": "^([ \\t]*)(?:(?:((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*))(?:\\s*((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))))",
+          "begin": "^([ \\t]*)(?:(?:((?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*))(?:\\s*((?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))))))",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "patterns": [
             {
@@ -244,7 +244,7 @@
       "patterns": [
         {
           "name": "meta.declaration.type.data.haskell.hsig",
-          "begin": "^([ \\t]*)(data|newtype)\\s+((?:(?!=|where).)*)",
+          "begin": "^([ \\t]*)(data|newtype)\\s+((?:(?!(?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:=|--+)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))|(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))where(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))|{-).|{-.*?-})*)",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "patterns": [
             {
@@ -429,7 +429,7 @@
       "patterns": [
         {
           "name": "keyword.other.double-colon.haskell.hsig",
-          "match": "(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))"
+          "match": "(?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))"
         }
       ]
     },
@@ -507,8 +507,8 @@
         {
           "name": "meta.function.type-declaration.haskell.hsig",
           "contentName": "meta.type-signature.haskell.hsig",
-          "begin": "^([ \\t]*)(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))))",
-          "end": "^(?!\\1[ \\t]|[ \\t]*$)|(?=(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(\u003c-|=)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))",
+          "begin": "^([ \\t]*)(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))))))",
+          "end": "^(?!\\1[ \\t]|[ \\t]*$)|(?=(?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:\u003c-|=)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))))",
           "patterns": [
             {
               "include": "#type_signature"
@@ -1000,8 +1000,8 @@
         {
           "name": "meta.multiline.type-declaration.haskell.hsig",
           "contentName": "meta.type-signature.haskell.hsig",
-          "begin": "^([ \\t]*)((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))",
-          "end": "^(?!\\1|[ \\t]*$)|(?=(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(\u003c-|=)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))",
+          "begin": "^([ \\t]*)((?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))))",
+          "end": "^(?!\\1|[ \\t]*$)|(?=(?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:\u003c-|=)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))))",
           "patterns": [
             {
               "include": "#type_signature"
@@ -1114,8 +1114,8 @@
         {
           "name": "meta.record-field.type-declaration.haskell.hsig",
           "contentName": "meta.type-signature.haskell.hsig",
-          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))))",
-          "end": "(?=(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))))|})",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))))))",
+          "end": "(?=(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))))))|})",
           "patterns": [
             {
               "include": "#type_signature"
@@ -1175,7 +1175,7 @@
     "scoped_type": {
       "patterns": [
         {
-          "match": "\\(((?\u003cparen\u003e(?:[^\\(\\)]|\\(\\g\u003cparen\u003e\\))*)(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?\u003cparen2\u003e(?:[^\\(\\)]|\\(\\g\u003cparen2\u003e\\))*))\\)",
+          "match": "\\(((?\u003cparen\u003e(?:(?!\\(|\\)).|\\(\\g\u003cparen\u003e\\))*)(?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))(?\u003cparen2\u003e(?:(?!\\(|\\)).|\\(\\g\u003cparen2\u003e\\))*))\\)",
           "captures": {
             "1": {
               "patterns": [
@@ -1187,7 +1187,7 @@
           }
         },
         {
-          "match": "((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))(.*?)(?=({-|(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(--|\u003c-|=))(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))|$)",
+          "match": "((?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))))((?:(?!{-|(?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:\u003c-|=|--+)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))|$).|{-.*?-})*)",
           "captures": {
             "1": {
               "name": "keyword.other.double-colon.haskell.hsig"
@@ -1207,7 +1207,7 @@
     "scoped_type_override": {
       "patterns": [
         {
-          "match": "^([ \\t]*)(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))))((?:(?!(?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))--|{-)).)*)(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(\u003c-|=)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))",
+          "match": "^([ \\t]*)(?:(?:((?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\)))(?:(?:\\s*,\\s*)(?:(?:[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?[\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*|(?:\\((?!--+\\))(?:(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*\\.)?(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))+\\))))*)\\s*((?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:::|∷)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))))))((?:(?!{-|(?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:--+)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))).|{-.*?-})*)((?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:\u003c-|=)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))))",
           "captures": {
             "2": {
               "patterns": [
@@ -1419,11 +1419,11 @@
         },
         {
           "name": "keyword.other.arrow.haskell.hsig",
-          "match": "(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(-\u003e|→)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))"
+          "match": "(?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:-\u003e|→)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))"
         },
         {
           "name": "keyword.other.big-arrow.haskell.hsig",
-          "match": "(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(=\u003e|⇒)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))"
+          "match": "(?:(?\u003c!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"'])))(?:=\u003e|⇒)(?!(?:[\\p{S}\\p{P}](?\u003c![(),;\\[\\]`{}_\"']))))"
         },
         {
           "name": "keyword.operator.promoted.haskell.hsig",

data/grammars/source.hx.json

@@ -548,7 +548,7 @@
     },
     "enum": {
       "name": "meta.enum.hx",
-      "begin": "(?=enum)",
+      "begin": "(?=enum\\s+[A-Z])",
       "end": "(?\u003c=\\})|(;)",
       "patterns": [
         {
@@ -1347,8 +1347,16 @@
       }
     },
     "modifiers": {
-      "name": "storage.modifier.hx",
-      "match": "\\b(public|private|static|dynamic|inline|macro|extern|override|final)\\b"
+      "patterns": [
+        {
+          "name": "storage.modifier.hx",
+          "match": "\\b(public|private|static|dynamic|inline|macro|extern|override|enum)\\b"
+        },
+        {
+          "name": "storage.modifier.hx",
+          "match": "\\b(final)\\b(?=\\s+(public|private|static|dynamic|inline|macro|extern|override|function))"
+        }
+      ]
     },
     "modifiers-inheritance": {
       "name": "storage.modifier.hx",
@@ -2094,7 +2102,7 @@
     },
     "typedef-extension": {
       "begin": "\u003e",
-      "end": ",",
+      "end": ",|$",
       "patterns": [
         {
           "include": "#type"
@@ -2178,7 +2186,7 @@
       }
     },
     "variable": {
-      "begin": "(?=\\bvar\\b)",
+      "begin": "(?=\\b(var|final)\\b)",
       "end": "(?=$)|(;)",
       "patterns": [
         {
@@ -2244,7 +2252,7 @@
       }
     },
     "variable-name": {
-      "begin": "\\b(var)\\b",
+      "begin": "\\b(var|final)\\b",
       "end": "(?=$)|([_a-zA-Z]\\w*)",
       "beginCaptures": {
         "1": {

data/grammars/source.hx.type.json

@@ -0,0 +1,8 @@
+{
+  "scopeName": "source.hx.type",
+  "patterns": [
+    {
+      "include": "source.hx#type"
+    }
+  ]
+}

data/grammars/source.jison.json

@@ -656,7 +656,7 @@
     }
   },
   "injections": {
-    "L:(meta.action.jison - (comment | string)), source.js.embedded.source": {
+    "L:(meta.action.jison - (comment | string)), source.js.embedded.jison": {
       "patterns": [
         {
           "name": "variable.language.semantic-value.jison",

data/grammars/source.js.json

@@ -944,7 +944,7 @@
     },
     {
       "name": "string.regexp.js",
-      "begin": "(?\u003c=[\\[=(?:+,!]|^|return|=\u003e|\u0026\u0026|\\|\\|)\\s*(/)(?![/*+?])(?=.*/)",
+      "begin": "(?\u003c=[\\[{=(?:+*,!~-]|^|return|=\u003e|\u0026\u0026|\\|\\|)\\s*(/)(?![/*+?])(?=.*/)",
       "end": "(/)([gimsuy]*)",
       "patterns": [
         {

data/grammars/source.powershell.json

@@ -13,25 +13,15 @@
       ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.start.definition.comment.block.powershell"
+          "name": "punctuation.definition.comment.block.begin.powershell"
         }
       },
       "endCaptures": {
         "0": {
-          "name": "punctuation.end.definition.comment.block.powershell"
+          "name": "punctuation.definition.comment.block.end.powershell"
         }
       }
     },
-    {
-      "name": "comment.line.number-sign.powershell",
-      "begin": "(?\u003c![\\\\-])#",
-      "end": "$",
-      "patterns": [
-        {
-          "include": "#commentEmbeddedDocs"
-        }
-      ]
-    },
     {
       "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"
@@ -39,6 +29,9 @@
     {
       "include": "#commands"
     },
+    {
+      "include": "#commentLine"
+    },
     {
       "include": "#variable"
     },
@@ -51,28 +44,20 @@
     {
       "include": "#attribute"
     },
+    {
+      "include": "#UsingDirective"
+    },
     {
       "include": "#type"
     },
     {
-      "name": "string.quoted.double.powershell",
-      "begin": "(?\u003c!(?\u003c!`)\")\"",
-      "end": "\"(?!\")",
-      "patterns": [
-        {
-          "include": "#variableNoProperty"
-        },
-        {
-          "include": "#doubleQuotedStringEscapes"
-        },
-        {
-          "include": "#interpolation"
-        },
-        {
-          "name": "keyword.other.powershell",
-          "match": "`\\s*$"
-        }
-      ]
+      "include": "#hashtable"
+    },
+    {
+      "include": "#doubleQuotedString"
+    },
+    {
+      "include": "#scriptblock"
     },
     {
       "include": "#doubleQuotedStringEscapes"
@@ -120,48 +105,72 @@
     },
     {
       "name": "meta.group.array-expression.powershell",
-      "begin": "@\\(",
+      "begin": "(@)(\\()",
       "end": "\\)",
       "patterns": [
         {
           "include": "$self"
         }
       ],
-      "captures": {
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.array.begin.powershell"
+        },
+        "2": {
+          "name": "punctuation.section.group.begin.powershell"
+        }
+      },
+      "endCaptures": {
         "0": {
-          "name": "keyword.other.powershell"
+          "name": "punctuation.section.group.end.powershell"
         }
       }
     },
     {
       "name": "meta.group.complex.subexpression.powershell",
-      "begin": "\\$\\(",
+      "begin": "(\\$)(\\()",
       "end": "\\)",
       "patterns": [
         {
           "include": "$self"
         }
       ],
-      "captures": {
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.variable.definition.powershell"
+        },
+        "2": {
+          "name": "punctuation.section.group.begin.powershell"
+        }
+      },
+      "endCaptures": {
         "0": {
-          "name": "keyword.other.powershell"
+          "name": "punctuation.section.group.end.powershell"
         }
       }
     },
     {
-      "name": "keyword.operator.logical.powershell",
-      "match": "(?\u003c!\\w)-([ci]?[lg][te]|eq|ne)"
+      "name": "support.function.powershell",
+      "match": "(\\b(([A-Za-z0-9\\-_\\.]+)\\.(?i:exe|com|cmd|bat))\\b)"
     },
     {
-      "name": "support.function.powershell",
-      "match": "(?i:[a-z][a-z0-9]+-?[a-z][a-z0-9]+)(?i:\\.(?i:exe|cmd|bat|ps1))"
+      "name": "keyword.control.powershell",
+      "match": "(?\u003c!\\w|-|\\.)((?i:begin|break|catch|continue|data|default|define|do|dynamicparam|else|elseif|end|exit|finally|for|from|if|in|inlinescript|parallel|param|process|return|sequence|switch|throw|trap|try|until|var|while)|%|\\?)(?!\\w)"
+    },
+    {
+      "name": "keyword.control.powershell",
+      "match": "(?\u003c!\\w|-|[^\\)]\\.)((?i:(foreach|where)(?!-object))|%|\\?)(?!\\w)"
     },
     {
       "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)(--%)(?!\\w)"
     },
     {
-      "match": "(?\u003c!\\w)((?i:class)|%|\\?)(?:\\s)+((?:\\p{L}|\\d|_|-|)+)\\b",
+      "name": "storage.modifier.powershell",
+      "match": "(?\u003c!\\w)((?i:hidden|static))(?!\\w)"
+    },
+    {
+      "match": "(?\u003c!\\w|-)((?i:class)|%|\\?)(?:\\s)+((?:\\p{L}|\\d|_|-|)+)\\b",
       "captures": {
         "1": {
           "name": "storage.type.powershell"
@@ -189,7 +198,7 @@
     },
     {
       "name": "keyword.operator.bitwise.powershell",
-      "match": "(?\u003c!\\w)-(?i:band|bor|bnot|bxor)(?!\\p{L})"
+      "match": "(?\u003c!\\w)-(?i:band|bor|bnot|bxor|shl|shr)(?!\\p{L})"
     },
     {
       "name": "keyword.operator.string-format.powershell",
@@ -209,51 +218,132 @@
     },
     {
       "name": "keyword.operator.range.powershell",
-      "match": "(?\u003c!\\s|^)\\.\\.(?=\\d|\\(|\\$)"
+      "match": "(?\u003c!\\s|^)\\.\\.(?=\\-?\\d|\\(|\\$)"
     }
   ],
   "repository": {
+    "RequiresDirective": {
+      "name": "meta.requires.powershell",
+      "begin": "(?\u003c=#)(?i:(requires))\\s",
+      "end": "$",
+      "patterns": [
+        {
+          "name": "keyword.other.powershell",
+          "match": "\\-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version)"
+        },
+        {
+          "name": "variable.parameter.powershell",
+          "match": "(?\u003c!-)\\b\\p{L}+|\\d+(?:\\.\\d+)*"
+        },
+        {
+          "include": "#hashtable"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.control.requires.powershell"
+        }
+      }
+    },
+    "UsingDirective": {
+      "match": "(?\u003c!\\w)(?i:(using))\\s+(?i:(namespace|module))\\s+(?i:((?:\\w+(?:\\.)?)+))",
+      "captures": {
+        "1": {
+          "name": "keyword.control.using.powershell"
+        },
+        "2": {
+          "name": "keyword.other.powershell"
+        },
+        "3": {
+          "name": "variable.parameter.powershell"
+        }
+      }
+    },
     "attribute": {
-      "begin": "\\[(\\p{L}|\\.|``\\d+)+(?=\\()",
-      "end": "\\]",
+      "name": "meta.attribute.powershell",
+      "begin": "(\\[)\\s*\\b(?i)(cmdletbinding|alias|outputtype|parameter|validatenotnull|validatenotnullorempty|validatecount|validateset|allownull|allowemptycollection|allowemptystring|validatescript|validaterange|validatepattern|validatelength)\\b",
+      "end": "(\\])",
       "patterns": [
         {
-          "name": "entity.other.attribute-name",
           "begin": "\\(",
           "end": "\\)",
           "patterns": [
             {
-              "name": "entity.other.attribute-name.powershell",
-              "match": "(\\w+)\\s*=?([^\"']*?|'[^']*?'|\"[^\"]*?\")?(?=,|\\))",
+              "include": "#variable"
+            },
+            {
+              "include": "#variableNoProperty"
+            },
+            {
+              "include": "#hashtable"
+            },
+            {
+              "include": "#scriptblock"
+            },
+            {
+              "include": "#doubleQuotedStringEscapes"
+            },
+            {
+              "include": "#doubleQuotedString"
+            },
+            {
+              "include": "#type"
+            },
+            {
+              "include": "#numericConstant"
+            },
+            {
+              "include": "#doubleQuotedString"
+            },
+            {
+              "include": "$self"
+            },
+            {
+              "match": "(?i)\\b(mandatory|valuefrompipeline|valuefrompipelinebypropertyname|valuefromremainingarguments|position|parametersetname|defaultparametersetname|supportsshouldprocess|positionalbinding|helpuri|confirmimpact|helpmessage)\\b(?:\\s+)?(=)",
               "captures": {
-                "0": {
-                  "name": "entity.other.attribute.parameter.powershell"
-                },
                 "1": {
-                  "name": "constant.language.powershell"
+                  "name": "variable.parameter.attribute.powershell"
                 },
                 "2": {
-                  "name": "variable.other.powershell"
+                  "name": "keyword.operator.assignment.powershell"
                 }
               }
             },
             {
-              "include": "#variable"
+              "name": "string.quoted.single.powershell",
+              "begin": "(?\u003c!')'",
+              "end": "'(?!')",
+              "patterns": [
+                {
+                  "name": "constant.character.escape.powershell",
+                  "match": "''"
+                }
+              ]
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.group.begin.powershell"
             }
-          ]
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.group.end.powershell"
+            }
+          }
         }
       ],
       "beginCaptures": {
-        "0": {
-          "name": "entity.name.tag"
-        },
         "1": {
-          "name": "entity.name.tag"
+          "name": "punctuation.section.bracket.begin.powershell"
+        },
+        "2": {
+          "name": "support.function.attribute.powershell"
         }
       },
       "endCaptures": {
-        "0": {
-          "name": "entity.name.tag"
+        "1": {
+          "name": "punctuation.section.bracket.end.powershell"
         }
       }
     },
@@ -261,11 +351,23 @@
       "patterns": [
         {
           "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"
+          "match": "(?:(\\p{L}|\\d|_|-|\\\\|\\:)*\\\\)?\\b(?i:Add|Approve|Assert|Backup|Block|Build|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Deploy|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",
           "match": "(?\u003c!\\w)(?i:foreach-object)(?!\\w)"
+        },
+        {
+          "name": "support.function.powershell",
+          "match": "(?\u003c!\\w)(?i:where-object)(?!\\w)"
+        },
+        {
+          "name": "support.function.powershell",
+          "match": "(?\u003c!\\w)(?i:sort-object)(?!\\w)"
+        },
+        {
+          "name": "support.function.powershell",
+          "match": "(?\u003c!\\w)(?i:tee-object)(?!\\w)"
         }
       ]
     },
@@ -273,7 +375,7 @@
       "patterns": [
         {
           "name": "comment.documentation.embedded.powershell",
-          "match": "(?i:\\s*(\\.)(SYNOPSIS|DESCRIPTION|EXAMPLE|INPUTS|OUTPUTS|NOTES|LINK|COMPONENT|FUNCTIONALITY))",
+          "match": "(?i:\\s*(\\.)(COMPONENT|DESCRIPTION|EXAMPLE|EXTERNALHELP|FORWARDHELPCATEGORY|FORWARDHELPTARGETNAME|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|REMOTEHELPRUNSPACE|ROLE|SYNOPSIS))",
           "captures": {
             "1": {
               "name": "constant.string.documentation.powershell"
@@ -297,21 +399,50 @@
               "name": "keyword.operator.documentation.powershell"
             }
           }
+        }
+      ]
+    },
+    "commentLine": {
+      "name": "comment.line.powershell",
+      "begin": "(?\u003c![`\\\\-])#",
+      "end": "$",
+      "patterns": [
+        {
+          "include": "#commentEmbeddedDocs"
         },
         {
-          "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"
-            },
-            "2": {
-              "name": "keyword.operator.documentation.powershell"
-            },
-            "3": {
-              "name": "string.quoted.double.heredoc.powershell"
-            }
-          }
+          "include": "#RequiresDirective"
+        }
+      ],
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.powershell"
+        }
+      }
+    },
+    "doubleQuotedString": {
+      "name": "string.quoted.double.powershell",
+      "begin": "(?\u003c!(?\u003c!`)\")\"",
+      "end": "\"(?!\")",
+      "patterns": [
+        {
+          "match": "(?i)\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,64}\\b"
+        },
+        {
+          "include": "#variableNoProperty"
+        },
+        {
+          "include": "#variable"
+        },
+        {
+          "include": "#doubleQuotedStringEscapes"
+        },
+        {
+          "include": "#interpolation"
+        },
+        {
+          "name": "keyword.other.powershell",
+          "match": "`\\s*$"
         }
       ]
     },
@@ -328,17 +459,69 @@
       ]
     },
     "function": {
-      "begin": "((?i:function|filter|configuration|workflow))\\s+((?:\\p{L}|\\d|_|-|\\.)+)",
-      "end": "\\{|\\(",
+      "begin": "^(?:\\s*+)(?i)(function|filter|configuration|workflow)\\s+(?:(global|local|script|private):)?((?:\\p{L}|\\d|_|-|\\.)+)",
+      "end": "(?=\\{|\\()",
+      "patterns": [
+        {
+          "include": "#commentLine"
+        }
+      ],
       "beginCaptures": {
         "0": {
-          "name": "meta.function"
+          "name": "meta.function.powershell"
         },
         "1": {
-          "name": "storage.type"
+          "name": "storage.type.powershell"
         },
         "2": {
-          "name": "entity.name.function"
+          "name": "storage.modifier.scope.powershell"
+        },
+        "3": {
+          "name": "entity.name.function.powershell"
+        }
+      }
+    },
+    "hashtable": {
+      "name": "meta.hashtable.powershell",
+      "begin": "(@)(\\{)",
+      "end": "(\\})",
+      "patterns": [
+        {
+          "name": "meta.hashtable.assignment.powershell",
+          "match": "\\b((?:\\'|\\\")?)(\\w+)((?:\\'|\\\")?)(?:\\s+)?(=)(?:\\s+)?",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.string.begin.powershell"
+            },
+            "2": {
+              "name": "variable.other.readwrite.powershell"
+            },
+            "3": {
+              "name": "punctuation.definition.string.end.powershell"
+            },
+            "4": {
+              "name": "keyword.operator.assignment.powershell"
+            }
+          }
+        },
+        {
+          "include": "#scriptblock"
+        },
+        {
+          "include": "$self"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.hashtable.begin.powershell"
+        },
+        "2": {
+          "name": "punctuation.section.braces.begin.powershell"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.section.braces.end.powershell"
         }
       }
     },
@@ -359,18 +542,18 @@
       ],
       "beginCaptures": {
         "0": {
-          "name": "keyword.other.powershell"
+          "name": "punctuation.section.group.begin.powershell"
         }
       },
       "endCaptures": {
         "0": {
-          "name": "keyword.other.powershell"
+          "name": "punctuation.section.group.end.powershell"
         }
       }
     },
     "interpolation": {
       "contentName": "interpolated.complex.source.powershell",
-      "begin": "(\\$)\\(",
+      "begin": "(\\$)(\\()",
       "end": "\\)",
       "patterns": [
         {
@@ -384,50 +567,94 @@
         }
       ],
       "beginCaptures": {
-        "0": {
-          "name": "keyword.other.powershell"
+        "1": {
+          "name": "keyword.other.variable.definition.powershell"
+        },
+        "2": {
+          "name": "punctuation.section.group.begin.powershell"
         }
       },
       "endCaptures": {
         "0": {
-          "name": "keyword.other.powershell"
+          "name": "punctuation.section.group.end.powershell"
         }
       }
     },
     "numericConstant": {
       "patterns": [
         {
-          "name": "constant.numeric.hexadecimal.powershell",
-          "match": "(?\u003c!\\w)(?i:(0x)([a-f0-9]+)((?i:L)?(?i:[kmgtp]b)?))(?!\\w)",
+          "match": "(?\u003c!\\w)([-+]?0(?:x|X)[0-9a-fA-F_]+(?:U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\\b",
           "captures": {
             "1": {
-              "name": "keyword.operator.math.powershell"
+              "name": "constant.numeric.hex.powershell"
             },
             "2": {
-              "name": "support.constant.powershell"
+              "name": "keyword.other.powershell"
+            }
+          }
+        },
+        {
+          "match": "(?\u003c!\\w)([-+]?(?:[0-9_]+)?\\.[0-9_]+(?:(?:e|E)[0-9]+)?(?:F|f|D|d|M|m)?)((?i:[kmgtp]b)?)\\b",
+          "captures": {
+            "1": {
+              "name": "constant.numeric.integer.powershell"
             },
-            "3": {
+            "2": {
+              "name": "keyword.other.powershell"
+            }
+          }
+        },
+        {
+          "match": "(?\u003c!\\w)([-+]?0(?:b|B)[01_]+(?:U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\\b",
+          "captures": {
+            "1": {
+              "name": "constant.numeric.octal.powershell"
+            },
+            "2": {
               "name": "keyword.other.powershell"
             }
           }
         },
         {
-          "name": "constant.numeric.scientific.powershell",
-          "match": "(?\u003c!\\w)(?i:(\\d*\\.?\\d+)(?:((?i:E)[+-]?)(\\d+))?((?i:[DL])?)((?i:[kmgtp]b)?))(?!\\w)",
+          "match": "(?\u003c!\\w)([-+]?[0-9_]+(?:e|E)(?:[0-9_])?+(?:F|f|D|d|M|m)?)((?i:[kmgtp]b)?)\\b",
           "captures": {
             "1": {
-              "name": "support.constant.powershell"
+              "name": "constant.numeric.integer.powershell"
             },
             "2": {
-              "name": "keyword.operator.math.powershell"
+              "name": "keyword.other.powershell"
+            }
+          }
+        },
+        {
+          "match": "(?\u003c!\\w)([-+]?[0-9_]+\\.(?:e|E)(?:[0-9_])?+(?:F|f|D|d|M|m)?)((?i:[kmgtp]b)?)\\b",
+          "captures": {
+            "1": {
+              "name": "constant.numeric.integer.powershell"
             },
-            "3": {
-              "name": "support.constant.powershell"
+            "2": {
+              "name": "keyword.other.powershell"
+            }
+          }
+        },
+        {
+          "match": "(?\u003c!\\w)([-+]?[0-9_]+[\\.]?(?:F|f|D|d|M|m))((?i:[kmgtp]b)?)\\b",
+          "captures": {
+            "1": {
+              "name": "constant.numeric.integer.powershell"
             },
-            "4": {
+            "2": {
               "name": "keyword.other.powershell"
+            }
+          }
+        },
+        {
+          "match": "(?\u003c!\\w)([-+]?[0-9_]+[\\.]?(?:U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\\b",
+          "captures": {
+            "1": {
+              "name": "constant.numeric.integer.powershell"
             },
-            "5": {
+            "2": {
               "name": "keyword.other.powershell"
             }
           }
@@ -442,15 +669,25 @@
         {
           "include": "$self"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.braces.begin.powershell"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.braces.end.powershell"
+        }
+      }
     },
     "type": {
       "begin": "\\[",
       "end": "\\]",
       "patterns": [
         {
-          "name": "entity.other.attribute-name",
-          "match": "(\\p{L}|\\.|``\\d+)+?"
+          "name": "storage.type.powershell",
+          "match": "(?!\\d+|\\.)(?:\\p{L}|\\p{N}|\\.)+"
         },
         {
           "include": "$self"
@@ -458,12 +695,12 @@
       ],
       "beginCaptures": {
         "0": {
-          "name": "entity.other.attribute-name"
+          "name": "punctuation.section.bracket.begin.powershell"
         }
       },
       "endCaptures": {
         "0": {
-          "name": "entity.other.attribute-name"
+          "name": "punctuation.section.bracket.end.powershell"
         }
       }
     },
@@ -473,7 +710,7 @@
           "match": "(\\$)(?i:(False|Null|True))\\b",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "constant.language.powershell"
@@ -484,7 +721,7 @@
           "match": "(\\$)(?i:(Error|ExecutionContext|Host|Home|PID|PsHome|PsVersionTable|ShellID))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?\\b",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "support.constant.variable.powershell"
@@ -498,7 +735,7 @@
           "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"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "support.constant.automatic.powershell"
@@ -512,7 +749,7 @@
           "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"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "variable.language.powershell"
@@ -523,16 +760,16 @@
           }
         },
         {
-          "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|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "storage.modifier.scope.powershell"
             },
             "3": {
-              "name": "variable.other.normal.powershell"
+              "name": "variable.other.readwrite.powershell"
             },
             "4": {
               "name": "entity.name.function.invocation.powershell"
@@ -540,30 +777,33 @@
           }
         },
         {
-          "match": "(?i:(\\$\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
+          "match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
-              "name": "storage.modifier.scope.powershell"
+              "name": "punctuation.section.braces.begin.powershell"
             },
             "3": {
-              "name": "variable.other.readwrite.powershell"
+              "name": "storage.modifier.scope.powershell"
             },
             "4": {
-              "name": "keyword.other.powershell"
+              "name": "variable.other.readwrite.powershell"
             },
             "5": {
+              "name": "punctuation.section.braces.end.powershell"
+            },
+            "6": {
               "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|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "support.variable.drive.powershell"
@@ -577,21 +817,24 @@
           }
         },
         {
-          "match": "(?i:(\\$\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
+          "match": "(?i:(\\$)(\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
-              "name": "support.variable.drive.powershell"
+              "name": "punctuation.section.braces.begin.powershell"
             },
             "3": {
-              "name": "variable.other.readwrite.powershell"
+              "name": "support.variable.drive.powershell"
             },
             "4": {
-              "name": "keyword.other.powershell"
+              "name": "variable.other.readwrite.powershell"
             },
             "5": {
+              "name": "punctuation.section.braces.end.powershell"
+            },
+            "6": {
               "name": "entity.name.function.invocation.powershell"
             }
           }
@@ -604,7 +847,7 @@
           "match": "(\\$)(?i:(False|Null|True))\\b",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "constant.language.powershell"
@@ -615,7 +858,7 @@
           "match": "(\\$)(?i:(Error|ExecutionContext|Host|Home|PID|PsHome|PsVersionTable|ShellID))\\b",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "support.constant.variable.powershell"
@@ -629,7 +872,7 @@
           "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"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "support.variable.automatic.powershell"
@@ -643,7 +886,7 @@
           "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"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "variable.language.powershell"
@@ -654,16 +897,16 @@
           }
         },
         {
-          "match": "(?i:(\\$)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))",
+          "match": "(?i:(\\$|@)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "storage.modifier.scope.powershell"
             },
             "3": {
-              "name": "variable.other.normal.powershell"
+              "name": "variable.other.readwrite.powershell"
             },
             "4": {
               "name": "entity.name.function.invocation.powershell"
@@ -671,10 +914,10 @@
           }
         },
         {
-          "match": "(?i:(\\$\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))",
+          "match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "storage.modifier.scope.powershell"
@@ -694,7 +937,7 @@
           "match": "(?i:(\\$)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
               "name": "support.variable.drive.powershell"
@@ -708,22 +951,22 @@
           }
         },
         {
-          "match": "(?i:(\\$\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))",
+          "match": "(?i:(\\$)(\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))",
           "captures": {
             "1": {
-              "name": "keyword.other.powershell"
+              "name": "keyword.other.variable.definition.powershell"
             },
             "2": {
-              "name": "support.variable.drive.powershell"
+              "name": "punctuation.section.braces.begin"
             },
             "3": {
-              "name": "variable.other.readwrite.powershell"
+              "name": "support.variable.drive.powershell"
             },
             "4": {
-              "name": "keyword.other.powershell"
+              "name": "variable.other.readwrite.powershell"
             },
             "5": {
-              "name": "entity.name.function.invocation.powershell"
+              "name": "punctuation.section.braces.end"
             }
           }
         }