Special treatment for formatting top-level forms

Fixes #640
BetterThanTomorrow · May 10, 2020 · 73fb795 · 73fb795
1 parent 130d202
commit 73fb795
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 Changes to Calva.
 
 ## [Unreleased]
+- Fix [Formatting top-level form stopped working](https://github.com/BetterThanTomorrow/calva/issues/640)
 
 ## [2.0.98] - 2020-05-04
 - Fix [Problems Editing a Bare file (instead of directory)](https://github.com/BetterThanTomorrow/calva/issues/622)

diff --git a/src/calva-fmt/src/format.ts b/src/calva-fmt/src/format.ts
@@ -40,7 +40,13 @@ export function formatPositionInfo(editor: vscode.TextEditor, onType: boolean =
     const mirroredDoc: MirroredDocument = getDocument(doc);
     const cursor = mirroredDoc.getTokenCursor(index);
     const formatDepth = extraConfig["format-depth"] ? extraConfig["format-depth"] : 1;
-    const formatRange = cursor.rangeForList(formatDepth);
+    let formatRange = cursor.rangeForList(formatDepth);
+    if (!formatRange) {
+        formatRange = cursor.rangeForCurrentForm(index);
+        if (!formatRange.includes(index)) {
+            return;
+        }
+    }
     const formatted: {
         "range-text": string,
         "range": number[],
@@ -61,20 +67,24 @@ export function formatPositionInfo(editor: vscode.TextEditor, onType: boolean =
 export function formatPosition(editor: vscode.TextEditor, onType: boolean = false, extraConfig = {}): Thenable<boolean> {
     const doc: vscode.TextDocument = editor.document,
         formattedInfo = formatPositionInfo(editor, onType, extraConfig);
-    if (formattedInfo.previousText != formattedInfo.formattedText) {
+    if (formattedInfo && formattedInfo.previousText != formattedInfo.formattedText) {
         return editor.edit(textEditorEdit => {
             textEditorEdit.replace(formattedInfo.range, formattedInfo.formattedText);
         }, { undoStopAfter: false, undoStopBefore: false }).then((onFulfilled: boolean) => {
             editor.selection = new vscode.Selection(doc.positionAt(formattedInfo.newIndex), doc.positionAt(formattedInfo.newIndex))
             return onFulfilled;
         });
     } else {
-        return new Promise((resolve, _reject) => {
-            if (formattedInfo.newIndex != formattedInfo.previousIndex) {
-                editor.selection = new vscode.Selection(doc.positionAt(formattedInfo.newIndex), doc.positionAt(formattedInfo.newIndex));
-            }
-            resolve(true);
-        });
+        if (formattedInfo) {
+            return new Promise((resolve, _reject) => {
+                if (formattedInfo.newIndex != formattedInfo.previousIndex) {
+                    editor.selection = new vscode.Selection(doc.positionAt(formattedInfo.newIndex), doc.positionAt(formattedInfo.newIndex));
+                }
+                resolve(true);
+            });
+        } else {
+            return formatRange(doc, new vscode.Range(doc.positionAt(0), doc.positionAt(doc.getText().length)))
+        }
     }
 }