Merge pull request #12 from foges/master

Fix indentation and formatter

Author: bakpakin

janet.configuration.json

@@ -20,8 +20,14 @@
         ["{", "}"]
     ],
     "wordPattern": "[A-Za-z0-9\\!\\$\\%\\&\\*\\+\\-\\.\\/\\:\\<\\?\\=\\>\\@\\^\\_\\|\\x80-\\xFF]+",
-    "indentationRules": {
-		"increaseIndentPattern": "^((?!.*?\\/\\*).*\\*\/)?\\s*[\\}\\]].*$",
-		"decreaseIndentPattern": "^((?!\\/\\/).)*(\\{[^}\"'`]*|\\([^)\"'`]*|\\[[^\\]\"'`]*)$"
-    }
-}
+    "onEnterRules": [
+        {
+            "beforeText": "^[^#]*(\\{[^}]*|\\([^)]*|\\[[^\\]]*)$",
+            "action": { "indent": "indent" }
+        },
+        {
+            "beforeText": "(^[^\\[#]*\\]\\s*(#.*)?\\s*$)|(^[^\\(#]*\\)\\s*(#.*)?\\s*$)|(^[^\\{#]*\\}\\s*(#.*)?\\s*$)",
+            "action": { "indent": "outdent" }
+        }
+    ]
+}

out/extension.js

@@ -101,7 +101,7 @@ export function activate(context: vscode.ExtensionContext) {
 		() => {
 
 			getREPL(true).then(terminal => {
-				sendSource(terminal, "(import spork/fmt)(fmt/format-file \""+
+				sendSource(terminal, "(import spork/fmt) (fmt/format-file \""+
 					vscode.window.activeTextEditor.document.uri.fsPath.replace(/\\/g, "/")
 				+"\")");
 				thenFocusTextEditor();