Merge pull request #51 from fdncred/update_keywords

update keywords and indentation rules

Author: fdncred

CHANGELOG.md

@@ -86,3 +86,6 @@ All notable changes to the "vscode-nushell-lang" extension will be documented in
   - update screenshots showing else keyword
   - add `on-Enter` rules
   - fixed a bug with variable syntax coloring
+- 0.5.2
+  - add `true`, `false`, and `null` as pseudo keywords
+  - changed the indentation rules

language-configuration.json

@@ -38,8 +38,8 @@
   },
   "wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\#\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)",
   "indentationRules": {
-    "increaseIndentPattern": "^((?!.*?\\/\\*).*\\*/)?\\s*[\\}\\]].*$",
-    "decreaseIndentPattern": "^((?!\\/\\/).)*(\\{[^}\"'`]*|\\([^)\"'`]*|\\[[^\\]\"'`]*)$"
+    "increaseIndentPattern": "{{?(def|def-env|else|extern|for|if|let|let-env|with-env)\\b.*}}?",
+    "decreaseIndentPattern": "{{?/(def|def-env|for|if)\\b}}?"
   },
   "onEnterRules": [
     {

package.json

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

syntaxes/nushell.tmLanguage.json

@@ -3,39 +3,17 @@
   "name": "nushell",
   "scopeName": "source.nushell",
   "patterns": [
-    {
-      "include": "#keywords"
-    },
-    {
-      "include": "#strings"
-    },
-    {
-      "include": "#punctuation"
-    },
-    {
-      "include": "#comment"
-    },
-    {
-      "include": "#range"
-    },
-    {
-      "include": "#parameter"
-    },
-    {
-      "include": "#digit"
-    },
-    {
-      "include": "#blockparam"
-    },
-    {
-      "include": "#variable"
-    },
-    {
-      "include": "#function"
-    },
-    {
-      "include": "#type"
-    }
+    { "include": "#keywords" },
+    { "include": "#strings" },
+    { "include": "#punctuation" },
+    { "include": "#comment" },
+    { "include": "#range" },
+    { "include": "#parameter" },
+    { "include": "#digit" },
+    { "include": "#blockparam" },
+    { "include": "#variable" },
+    { "include": "#function" },
+    { "include": "#type" }
   ],
   "repository": {
     "keywords": {
@@ -271,4 +249,4 @@
       }
     }
   }
-}
+}