Merge pull request #71 from avli/feature/format-on-save

Feature/format on save

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.9.1
+
+Adds a configuration option for formatting code on save.
+
 # Version 0.9.0
 
 Adds experimental ClojureScript support. Please check out [README.md](https://github.com/avli/clojureVSCode#clojurescript-project-setup) to learn how to use the extension for ClojureScript.

package.json

@@ -2,7 +2,7 @@
     "name": "clojure",
     "displayName": "Clojure",
     "description": "Clojure nREPL support for Visual Studio Code",
-    "version": "0.9.0",
+    "version": "0.9.1",
     "publisher": "avli",
     "author": {
         "name": "Andrey Lisin",
@@ -90,6 +90,11 @@
                     "type": "boolean",
                     "default": true,
                     "description": "Automatically run an embedded nREPL instance and connect to it on Clojure file open."
+                },
+                "clojureVSCode.formatOnSave": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Format the code on save."
                 }
             }
         }

src/clojureFormat.ts

@@ -9,11 +9,11 @@ function slashEscape(contents: string) {
         .replace(/\\/g, '\\\\')
         .replace(/"/g, '\\"')
         .replace(/\n/g, '\\n');
-    }
+}
 
 function slashUnescape(contents: string) {
-    const replacements = {'\\\\': '\\', '\\n': '\n', '\\"': '"'};
-    return contents.replace(/\\(\\|n|")/g, function(match) {
+    const replacements = { '\\\\': '\\', '\\n': '\n', '\\"': '"' };
+    return contents.replace(/\\(\\|n|")/g, function (match) {
         return replacements[match];
     });
 }
@@ -57,3 +57,19 @@ export const formatFile = (textEditor: vscode.TextEditor, edit: vscode.TextEdito
             };
         });
 }
+
+export const maybeActivateFormatOnSave = () => {
+    vscode.workspace.onWillSaveTextDocument(e => {
+        const document = e.document;
+        if (document.languageId !== "clojure") {
+            return;
+        }
+        let textEditor = vscode.window.activeTextEditor;
+        let editorConfig = vscode.workspace.getConfiguration('editor');
+        const globalEditorFormatOnSave = editorConfig && editorConfig.has('formatOnSave') && editorConfig.get('formatOnSave') === true;
+        let clojureConfig = vscode.workspace.getConfiguration('clojureVSCode');
+        if ((clojureConfig.formatOnSave || globalEditorFormatOnSave) && textEditor.document === document) {
+            formatFile(textEditor, null);
+        }
+    });
+}

src/clojureMain.ts

@@ -10,7 +10,7 @@ import { ClojureSignatureProvider } from './clojureSignature';
 import { JarContentProvider } from './jarContentProvider';
 import { nreplController } from './nreplController';
 import { cljConnection } from './cljConnection';
-import { formatFile } from './clojureFormat';
+import { formatFile, maybeActivateFormatOnSave } from './clojureFormat';
 
 export function activate(context: vscode.ExtensionContext) {
     cljConnection.setCljContext(context);
@@ -20,7 +20,9 @@ export function activate(context: vscode.ExtensionContext) {
     if (config.autoStartNRepl) {
         cljConnection.startNRepl();
     }
-
+
+    maybeActivateFormatOnSave();
+
     vscode.commands.registerCommand('clojureVSCode.manuallyConnectToNRepl', cljConnection.manuallyConnect);
     vscode.commands.registerCommand('clojureVSCode.stopDisconnectNRepl', cljConnection.disconnect);
     vscode.commands.registerCommand('clojureVSCode.startNRepl', cljConnection.startNRepl);