Add spread to syntax highlighting (#174)

* Add spread to syntax highlighting

Fixes #173.

* Extend spread sytnax highlighting to commands and params

* Make spread regex more restrictive

* Make spread more specific to tables and commands

* Fix spread tokens in parameter list

Replaces `include` with a capture for the existing regex.

* Extend spread syntax highlighting change to flags

Traps command flags and shortcuts bare string parsing.

* Fix and clean up flag highlighting

Reuses an unused `parameters` expression. Fixes broken word boundary with whitespace lookbehind instead. Also fixes previous `(.+)` (code smell) matching the entire command.

Author: texastoland

syntaxes/nushell.tmLanguage.json

@@ -115,8 +115,11 @@
       "name": "keyword.other.nushell"
     },
     "parameters": {
-      "match": "\\b-{1,2}[\\w-]*",
-      "name": "variable.parameter.nushell"
+      "match": "(?<=\\s)(-{1,2})[\\w-]+",
+      "name": "variable.parameter.nushell",
+      "captures": {
+        "1": { "name": "keyword.control.nushell" }
+      }
     },
     "variables": {
       "match": "(\\$[a-zA-Z0-9_]+)((?:\\.(?:[\\w-]+|\"[\\w\\- ]+\"))*)",
@@ -183,8 +186,12 @@
         { "include": "#binary" }
       ]
     },
+    "spread": {
+      "match": "\\.\\.\\.(?=[^\\s\\]}])",
+      "name": "keyword.control.nushell"
+    },
     "ranges": {
-      "match": "\\.\\.<?|:",
+      "match": "\\.\\.<?",
       "name": "keyword.control.nushell"
     },
     "operators-word": {
@@ -213,17 +220,17 @@
       },
       "name": "meta.table.nushell",
       "patterns": [
+        { "include": "#spread" },
         { "include": "#value" },
         {
           "match": ",",
           "name": "punctuation.separator.nushell"
-        },
-        { "include": "#comment" }
+        }
       ]
     },
     "types": {
       "patterns": [
-        { 
+        {
           "name": "meta.list.nushell",
           "begin": "\\b(list)\\s*<",
           "beginCaptures": {
@@ -243,15 +250,15 @@
           "end": ">",
           "patterns": [
             {
-              "match": "([\\w\\-]+|\"[\\w\\- ]+\"|'[^']+')\\s*:\\s*", 
+              "match": "([\\w\\-]+|\"[\\w\\- ]+\"|'[^']+')\\s*:\\s*",
               "captures": {
                 "1": { "name": "variable.parameter.nushell" }
               }
             },
             { "include": "#types" }
           ]
         },
-        { 
+        {
           "match": "\\b(\\w+)\\b",
           "name": "entity.name.type.nushell"
         }
@@ -260,8 +267,11 @@
     "function-parameter": {
       "patterns": [
         {
-          "match": "((?:-{0,2}|\\.{3})[\\w-]+)(?:\\((-[\\w?])\\))?",
-          "name": "variable.parameter.nushell"
+          "match": "(-{0,2}|\\.{3})[\\w-]+(?:\\((-[\\w?])\\))?",
+          "name": "variable.parameter.nushell",
+          "captures": {
+            "1": { "name": "keyword.control.nushell" }
+          }
         },
         {
           "begin": "\\??:\\s*",
@@ -561,6 +571,7 @@
           },
           "name": "meta.record-entry.nushell"
         },
+        { "include": "#spread" },
         { "include": "source.nushell" }
       ]
     },
@@ -643,14 +654,18 @@
       },
       "end": "(?=\\||\\)|\\}|;)|$",
       "name": "meta.command.nushell",
-      "patterns": [{ "include": "#value" }]
+      "patterns": [
+        { "include": "#parameters" },
+        { "include": "#spread" },
+        { "include": "#value" }
+      ]
     },
     "expression": {
       "patterns": [
         { "include": "#pre-command" },
         { "include": "#for-loop" },
         { "include": "#operators" },
-        { 
+        {
           "match": "\\|",
           "name": "keyword.control.nushell"
         },
@@ -667,7 +682,6 @@
         { "include": "#control-keywords" },
         { "include": "#constant-value" },
         { "include": "#table" },
-        { "include": "#parameters" },
         { "include": "#operators" },
         { "include": "#paren-expression" },
         { "include": "#braced-expression" },