Merge pull request #31 from fdncred/tweak_dark_theme

tweak dark theme, update commands / keywords

Author: fdncred

CHANGELOG.md

@@ -58,5 +58,7 @@ All notable changes to the "vscode-nushell-lang" extension will be documented in
     * updated screenshots
 - 0.2.0
     * added intellisense aka auto-complete for commands and subcommands
-
+- 0.2.1
+    * tweaked the dark theme colors a tiny bit
+    * updated commands and keywords
 

nushell.theme-minimal-dark.json

@@ -4,7 +4,7 @@
   "tokenColors": [
     // "FlatShape__InternalCommand": "#61d6d6", //"Cyan.bold"
     {
-      "scope": [ "keyword.control", ],
+      "scope": [ "keyword.control.nushell", ],
       "settings": {
         "foreground": "#61d6d6"
       }
@@ -15,7 +15,7 @@
     {
       "scope": [ "source.nushell", ],
       "settings": {
-        "foreground": "#61d6d6",
+        "foreground": "#06989a", //#61d6d6
         // "fontStyle": "bold"
       }
     },

out/extension.js

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

out/extension.js.map

@@ -154,8 +154,8 @@ export function activate(context: vscode.ExtensionContext) {
         const insertCompletion = new vscode.CompletionItem("insert");
         insertCompletion.commitCharacters = [" "];
 
-        const intoIntCompletion = new vscode.CompletionItem("into-int");
-        intoIntCompletion.commitCharacters = [" "];
+        const intoCompletion = new vscode.CompletionItem("into");
+        intoCompletion.commitCharacters = [" "];
 
         const keepCompletion = new vscode.CompletionItem("keep");
         keepCompletion.commitCharacters = [" "];
@@ -404,7 +404,7 @@ export function activate(context: vscode.ExtensionContext) {
           ifCompletion,
           incCompletion,
           insertCompletion,
-          intoIntCompletion,
+          intoCompletion,
           keepCompletion,
           killCompletion,
           lastCompletion,
@@ -976,6 +976,32 @@ export function activate(context: vscode.ExtensionContext) {
     " "
   );
 
+  const intoSubCommandsProvider = vscode.languages.registerCompletionItemProvider(
+    "nushell",
+    {
+      provideCompletionItems(
+        document: vscode.TextDocument,
+        position: vscode.Position
+      ) {
+        const linePrefix = document
+          .lineAt(position)
+          .text.substr(0, position.character);
+        if (linePrefix.endsWith("into ")) {
+          const intoInt = new vscode.CompletionItem(
+            "int",
+            vscode.CompletionItemKind.Method
+          );
+          intoInt.detail = "Convert value to integer";
+
+          return [intoInt];
+        } else {
+          return undefined;
+        }
+      },
+    },
+    " "
+  );
+
   const keepSubCommandsProvider = vscode.languages.registerCompletionItemProvider(
     "nushell",
     {
@@ -1696,12 +1722,6 @@ export function activate(context: vscode.ExtensionContext) {
           );
           toSqlite.detail = "Convert table into sqlite binary";
 
-          const toStr = new vscode.CompletionItem(
-            "str",
-            vscode.CompletionItemKind.Method
-          );
-          toStr.detail = "";
-
           const toToml = new vscode.CompletionItem(
             "toml",
             vscode.CompletionItemKind.Method
@@ -1739,8 +1759,6 @@ export function activate(context: vscode.ExtensionContext) {
             toJson,
             toMd,
             toSqlite,
-            toStr,
-            toStr,
             toToml,
             toTsv,
             toUrl,
@@ -1811,6 +1829,7 @@ export function activate(context: vscode.ExtensionContext) {
     fromSubCommandsProvider,
     groupBySubCommandsProvider,
     hashSubCommandsProvider,
+    intoSubCommandsProvider,
     keepSubCommandsProvider,
     mathSubCommandsProvider,
     pathSubCommandsProvider,

package.json

@@ -18,10 +18,10 @@
       "patterns": [
         {
           "name":"keyword.other.nushell",
-          "match": "\\b(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|into-int|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",
+          "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",
           "name": "keyword",
           "captures": {
             "2":{