Merge pull request #749 from glebovmaksim/fix-700-formatting

Fix top level formatting (#700)
BetterThanTomorrow · Aug 18, 2020 · 56a7bd7 · 56a7bd7
2 parents c9d525c + 825ae88
commit 56a7bd7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 Changes to Calva.
 
 ## [Unreleased]
+- Fix: [Backspace is not working properly in the output window](https://github.com/BetterThanTomorrow/calva/issues/700)
 
 ## [2.0.120] - 2020-08-17
 - Fix: [Interrupting evaluations produces extra output and no prompt](https://github.com/BetterThanTomorrow/calva/issues/738)

diff --git a/src/calva-fmt/src/format.ts b/src/calva-fmt/src/format.ts
@@ -1,5 +1,6 @@
 import * as vscode from 'vscode';
 import * as config from './config';
+import * as outputWindow from '../../results-output/results-doc'
 import { getIndent, getDocument, getDocumentOffset, MirroredDocument } from "../../doc-mirror";
 const { formatTextAtRange, formatTextAtIdx, formatTextAtIdxOnType, formatText, cljify, jsify } = require('../../../out/cljs-lib/cljs-lib');
 
@@ -80,18 +81,21 @@ export function formatPosition(editor: vscode.TextEditor, onType: boolean = fals
             editor.selection = new vscode.Selection(doc.positionAt(formattedInfo.newIndex), doc.positionAt(formattedInfo.newIndex))
             return onFulfilled;
         });
-    } else {
-        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)))
-        }
     }
+    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);
+        });
+    }
+    if (!onType && !outputWindow.isResultsDoc(doc)) {
+        return formatRange(doc, new vscode.Range(doc.positionAt(0), doc.positionAt(doc.getText().length)))
+    }
+    return new Promise((resolve, _reject) => {
+        resolve(true);
+    });
 }
 
 export function formatPositionCommand(editor: vscode.TextEditor) {