Merge pull request #32 from fdncred/fix_highlighting

fixed a bug in the syntax highlighting

Author: fdncred

CHANGELOG.md

@@ -61,4 +61,6 @@ All notable changes to the "vscode-nushell-lang" extension will be documented in
 - 0.2.1
     * tweaked the dark theme colors a tiny bit
     * updated commands and keywords
+- 0.2.2
+    * fixed a regression in syntax highlighting (thanks yume-chan)
 

nushell.theme-minimal-dark.json

@@ -1,6 +1,7 @@
 {
   "$schema": "vscode://schemas/color-theme",
   "type": "dark",
+	// "include": "./dark_vs.json",
   "tokenColors": [
     // "FlatShape__InternalCommand": "#61d6d6", //"Cyan.bold"
     {

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-nushell-lang",
   "displayName": "vscode-nushell-lang",
   "description": "nushell language for vscode",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "preview": true,
   "license": "MIT",
   "publisher": "TheNuProjectContributors",

syntaxes/nushell.tmLanguage.json

@@ -18,7 +18,7 @@
       "patterns": [
         {
           "name":"keyword.other.nushell",
-          "match": "\\b(|into\\sint|ansi\\sstrip|autoenv\\strust|autoenv\\suntrust|build\\-string|chart\\sbar|char\\sprompt|char\\snewline|chart\\sline|config\\sclear|config\\sget|config\\sload|config\\spath|config\\sremove|config\\sset|config\\sset_into|date\\sformat|date\\slist-timezone|date\\snow|date\\sto-table|date\\sto-timezoneeach\\sgroup|each\\swindow|format\\sfilesize|from\\sbson|from\\scsv|from\\seml|from\\sics|from\\sini|from\\sjson|from\\sods|from\\ssqlite|from\\sssv|from\\stoml|from\\stsv|from\\surl|from\\svcf|from\\sxlsx|from\\sxml|from\\syaml|from\\syml|group-by\\sdate|hash\\sbase64|keep\\suntil|keep\\swhile|math\\sabs|math\\savg|math\\sceil|math\\seval|math\\sfloor|math\\smax|math\\smedian|math\\smin|math\\smode|math\\sproduct|math\\sround|math\\sstddev|math\\ssum|math\\svariance|path\\sbasename|path\\sdirname|path\\sexists|path\\sexpand|path\\sextension|path\\sfilestem|path\\stype|random\\sbool|random\\schars|random\\sdecimal|random\\sdice|random\\sinteger|random\\suuid|seq\\sdate|skip\\suntil|skip\\swhile|split\\schars|split\\scolumn|split\\srow|str\\scamel-case|str\\scapitalize|str\\scollect|str\\scontains|str\\sdowncase|str\\sends-with|str\\sfind-replace|str\\sfrom|str\\sindex-of|str\\skebab-case|str\\slength|str\\slpad|str\\sltrim|str\\spascal-case|str\\sreverse|str\\srpad|str\\srtrim|str\\sscreaming-snake-case|str\\sset|str\\ssnake-case|str\\sstarts-with|str\\ssubstring|str\\sto-datetime|str\\sto-decimal|str\\sto-int|str\\strim|str\\supcase|to\\sbson|to\\scsv|to\\shtml|to\\sjson|to\\smd|to\\ssqlite|to\\stoml|to\\stsv|to\\surl|to\\sxml|to\\syaml|url\\shost|url\\spath|url\\squery|url\\sscheme|term\\ssize)\\b"
+          "match": "\\b(into\\sint|ansi\\sstrip|autoenv\\strust|autoenv\\suntrust|build\\-string|chart\\sbar|char\\sprompt|char\\snewline|chart\\sline|config\\sclear|config\\sget|config\\sload|config\\spath|config\\sremove|config\\sset|config\\sset_into|date\\sformat|date\\slist-timezone|date\\snow|date\\sto-table|date\\sto-timezoneeach\\sgroup|each\\swindow|format\\sfilesize|from\\sbson|from\\scsv|from\\seml|from\\sics|from\\sini|from\\sjson|from\\sods|from\\ssqlite|from\\sssv|from\\stoml|from\\stsv|from\\surl|from\\svcf|from\\sxlsx|from\\sxml|from\\syaml|from\\syml|group-by\\sdate|hash\\sbase64|keep\\suntil|keep\\swhile|math\\sabs|math\\savg|math\\sceil|math\\seval|math\\sfloor|math\\smax|math\\smedian|math\\smin|math\\smode|math\\sproduct|math\\sround|math\\sstddev|math\\ssum|math\\svariance|path\\sbasename|path\\sdirname|path\\sexists|path\\sexpand|path\\sextension|path\\sfilestem|path\\stype|random\\sbool|random\\schars|random\\sdecimal|random\\sdice|random\\sinteger|random\\suuid|seq\\sdate|skip\\suntil|skip\\swhile|split\\schars|split\\scolumn|split\\srow|str\\scamel-case|str\\scapitalize|str\\scollect|str\\scontains|str\\sdowncase|str\\sends-with|str\\sfind-replace|str\\sfrom|str\\sindex-of|str\\skebab-case|str\\slength|str\\slpad|str\\sltrim|str\\spascal-case|str\\sreverse|str\\srpad|str\\srtrim|str\\sscreaming-snake-case|str\\sset|str\\ssnake-case|str\\sstarts-with|str\\ssubstring|str\\sto-datetime|str\\sto-decimal|str\\sto-int|str\\strim|str\\supcase|to\\sbson|to\\scsv|to\\shtml|to\\sjson|to\\smd|to\\ssqlite|to\\stoml|to\\stsv|to\\surl|to\\sxml|to\\syaml|url\\shost|url\\spath|url\\squery|url\\sscheme|term\\ssize)\\b"
         },
         {
           "match": "([a-zA-Z]+[\\-_][a-zA-Z]+\\s)|\\b(alias|ansi|append|autoview|benchmark|binaryview|cal|cd|char|clear|clip|compact|count|cp|debug|default|describe|do|drop|du|echo|empty|enter|each|every|exec|exit|format|fetch|first|flatten|get|headers|help|histogram|history|if|inc|insert|item|index|kill|last|lines|ls|match|merge|mkdir|mod|move|mv|n|nth|open|p|parse|pivot|post|prepend|ps|pwd|range|reduce|reject|rename|reverse|rm|s3|save|select|selector|set|set-env|seq|shells|shuffle|size|sleep|sort-by|source|split-by|start|sys|table|tags|textview|touch|tree|uniq|update|version|where|which|with-env|wrap|xpath)\\b",