Fix indentation rules for VSCode 1.14

pragmagic · Jul 13, 2017 · a15306f · a15306f
1 parent e0e1c1a
commit a15306f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # ChangeLog
 
+## 0.5.26 (14 Jul 2017)
+* Fix indentation rules for VSCode 1.14
+
 ## 0.5.25 (27 Jun 2017)
 * Fixing 'nim' binary could not be found in PATH on OS X [PR #52](https://github.com/pragmagic/vscode-nim/pull/52)
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "nim",
     "displayName": "Nim",
     "description": "Nim language support for Visual Studio Code",
-    "version": "0.5.25",
+    "version": "0.5.26",
     "publisher": "kosz78",
     "author": {
         "name": "Xored Software Inc."

diff --git a/src/nimMain.ts b/src/nimMain.ts
@@ -45,6 +45,10 @@ export function activate(ctx: vscode.ExtensionContext): void {
             decreaseIndentPattern: /^\s*(((return|break|continue|raise)\n)|((elif|else|except|finally)\b.*:))\s*$/
         },
         wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
+        onEnterRules: [{
+            beforeText: /^\s*$/,
+			action: { indentAction: vscode.IndentAction.None }
+        }]
     });
 
     vscode.window.onDidChangeActiveTextEditor(showHideStatus, null, ctx.subscriptions);