Auto bracket closing for nimble files and improved identation pattern

pragmagic · Mar 15, 2017 · c62a119 · c62a119
1 parent da4c69a
commit c62a119
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/nimcfg.json b/nimcfg.json
@@ -11,7 +11,6 @@
         ["#[", "]#"],
         {"open": "[", "close": "]", "notIn": ["comment"]},
         ["(", ")"],
-        { "open": "'", "close": "'", "notIn": ["string", "comment"] },
         { "open": "\"", "close": "\"", "notIn": ["string", "comment"] }
     ],
     "surroundingPairs": [

diff --git a/package.json b/package.json
@@ -66,7 +66,8 @@
             {
                 "id": "nimble",
                 "aliases": ["Nimble", "nimble"],
-                "extensions": [".nimble"]
+                "extensions": [".nimble"],
+                "configuration": "./nimcfg.json"
             }
         ],
         "grammars": [

diff --git a/src/nimMain.ts b/src/nimMain.ts
@@ -41,7 +41,7 @@ export function activate(ctx: vscode.ExtensionContext): void {
 
     vscode.languages.setLanguageConfiguration(NIM_MODE.language, {
         indentationRules: {
-            increaseIndentPattern: /^\s*(((if|when|elif|else|except|finally|for|try|while|of)\b.*:)|((proc|macro|iterator|template|converter)\b.*\=)|(import|var|const|type))\s*$/,
+            increaseIndentPattern: /^\s*((((proc|macro|iterator|template|converter)\b.*\=)|(import|var|const|type)\s)|(import|let|var|const|type)|([^:]+:))$/,
             decreaseIndentPattern: /^\s*(((return|break|continue|raise)\n)|((elif|else|except|finally)\b.*:))\s*$/
         },
         wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,