Merge pull request #8 from darkriszty/feature/EntireFileFormatting

Allow formatting when a single table takes up the whole document.

Author: darkriszty

src/extension/tableRangePrettyfier.ts

@@ -17,43 +17,25 @@ export class TableRangePrettyfier implements vscode.DocumentRangeFormattingEditP
         const result: vscode.TextEdit[] = [];
         const selection = document.getText(range);
 
-        // this extension only works on selected tables, not on the entire document
-        const isWholeDocumentFormatting = this.isWholeDocumentFormatting(document, range);
-        if (!isWholeDocumentFormatting) {
-            let message: string = null;
-            let table: ITable = null;
-
-            try {
-                table = this._tableFactory.create(selection);
-                if (table == null) {
-                    message = "Mismatching table column sizes.";
-                } else {
-                    const formattedTable = table.prettyPrint();
-                    result.push(new vscode.TextEdit(range, formattedTable));
-                }
-
-            }
-            catch (ex) {
-                this._logger.logError(ex);
-                console.error("Error: \n\n" + ex);
+        let message: string = null;
+        let table: ITable = null;
+
+        try {
+            table = this._tableFactory.create(selection);
+            if (table == null) {
+                message = "Mismatching table column sizes.";
+            } else {
+                const formattedTable = table.prettyPrint();
+                result.push(new vscode.TextEdit(range, formattedTable));
             }
-
-            if (!!message)
-                this._logger.logInfo(message);
+        } catch (ex) {
+            this._logger.logError(ex);
+            console.error("Error: \n\n" + ex);
         }
 
-        return result;
-    }
-
-    private isWholeDocumentFormatting(document: vscode.TextDocument, range: vscode.Range): boolean {
-        if (document.lineCount < 1)
-            return true;
+        if (!!message)
+            this._logger.logInfo(message);
 
-        const zeroPosition = new vscode.Position(0, 0);
-        const documentEndPosition = document.lineAt(document.lineCount - 1).range.end;
-        if (range.start.isEqual(zeroPosition) && range.end.isEqual(documentEndPosition))
-            return true;
-
-        return false;
+        return result;
     }
 }

test/extension/tableRangePrettyfier.test.ts

@@ -22,17 +22,15 @@ suite("TableRangePrettyfier tests", () => {
     });
 
     test("provideDocumentRangeFormattingEdits() table factory called with invalid table then logInfo() called", () => {
-        const tableText = `
-hello | world
--|-
-new | line
-`;
+        const tableText = `hello | world
+                            -|-
+                            new | line`;
         const mockTableFactory: typeMock.IMock<ITableFactory> = typeMock.Mock.ofType<ITableFactory>();
         const mockLogger: typeMock.IMock<ILogger> = typeMock.Mock.ofType<ILogger>();
         const trp = new TableRangePrettyfier(mockTableFactory.object, mockLogger.object);
 
         const textDoc = new MockMarkdownTextDocument(tableText);
-        const range = textDoc.getRangeForLines(1, 4);
+        const range = textDoc.getRangeForLines(1, 3);
         mockTableFactory
             .setup(t => t.create(textDoc.getText(range)))
             .returns(() => null)
@@ -48,18 +46,16 @@ new | line
     });
 
     test("provideDocumentRangeFormattingEdits() table prettyPrint() called and logInfo() not called", () => {
-        const tableText = `
-hello | world
--|-
-new | line
-`;
+        const tableText = `hello | world
+                            -|-
+                            new | line`;
         const mockTableFactory: typeMock.IMock<ITableFactory> = typeMock.Mock.ofType<ITableFactory>();
         const mockLogger: typeMock.IMock<ILogger> = typeMock.Mock.ofType<ILogger>();
         const mockTable: typeMock.IMock<ITable> = typeMock.Mock.ofType<ITable>();
         const trp = new TableRangePrettyfier(mockTableFactory.object, mockLogger.object);
 
         const textDoc = new MockMarkdownTextDocument(tableText);
-        const range = textDoc.getRangeForLines(1, 4);
+        const range = textDoc.getRangeForLines(1, 3);
 
         mockTable
             .setup(t => t.prettyPrint())
@@ -80,18 +76,16 @@ new | line
     });
 
     test("provideDocumentRangeFormattingEdits() the result of the prettyPrint() is returned", () => {
-        const tableText = `
-hello | world
--|-
-new | line
-`;
+        const tableText = `hello | world
+                            -|-
+                            new | line`;
         const mockTableFactory: typeMock.IMock<ITableFactory> = typeMock.Mock.ofType<ITableFactory>();
         const mockLogger: typeMock.IMock<ILogger> = typeMock.Mock.ofType<ILogger>();
         const mockTable: typeMock.IMock<ITable> = typeMock.Mock.ofType<ITable>();
         const trp = new TableRangePrettyfier(mockTableFactory.object, mockLogger.object);
 
         const textDoc = new MockMarkdownTextDocument(tableText);
-        const range = textDoc.getRangeForLines(1, 4);
+        const range = textDoc.getRangeForLines(1, 3);
 
         mockTable
             .setup(t => t.prettyPrint())