Fix the end position of tables and use actual input document in system tests

Author: darkriszty

src/tableFinding/tableFinder.ts

@@ -16,7 +16,7 @@ export class TableFinder {
             let { tableStartRow, tableEndRow } = this.getNextResult(rows, previousRowIndex);
             if (tableStartRow == null || tableEndRow == null)
                 break;
-            result.push(this.getRangeForLines(rows, tableStartRow, tableEndRow));
+            result.push(this.getRangeForLines(tableStartRow, tableEndRow));
             previousRowIndex = tableEndRow;
         }
 
@@ -54,7 +54,7 @@ export class TableFinder {
         // make sure there is at least 1 row after the separator
         return tableEndRow > separatorRowIndex + 1
             ? {
-                tableStartRow: tableStartRow ,
+                tableStartRow: tableStartRow,
                 tableEndRow: tableEndRow - 1
             }
             : null;
@@ -65,10 +65,10 @@ export class TableFinder {
         return relevantRows.join(EOL);
     }
 
-    private getRangeForLines(rows: string[], startLine: number, endLine: number): vscode.Range {
+    private getRangeForLines(startLine: number, endLine: number): vscode.Range {
         return new vscode.Range(
             new vscode.Position(startLine, 0),
-            new vscode.Position(endLine, rows[endLine].length)
+            new vscode.Position(endLine, Number.MAX_SAFE_INTEGER) // avoid calculating the column in the editor, this will be validated by vscode
         );
     }
 }

test/stubs/markdownTextDocumentStub.ts

@@ -38,24 +38,6 @@ export class MarkdownTextDocumentStub implements vscode.TextDocument {
         );
     }
 
-    applyEdits(edits: vscode.TextEdit[]): void {
-        let original = this._lines.join(EOL);
-        for (let edit of edits) {
-            const startIndex = this.indexOf(edit.range.start);
-            const endIndex = this.indexOf(edit.range.end);
-            original = original.substring(0, startIndex) + edit.newText + original.substring(endIndex);
-        }
-        this.setLines(original);
-    }
-
-    indexOf(position: vscode.Position): number {
-        let result = 0;
-        for (let i = 0; i < position.line; i++) {
-            result += this._lines[i].length;
-        }
-        result += position.character;
-        return result;
-    }
 
     lineAt(param: number): vscode.TextLine;
     lineAt(param: vscode.Position): vscode.TextLine;

test/systemTests/tableRangePrettyfierFactory.ts

@@ -29,16 +29,21 @@ export class PrettyfierFromFile {
     }
 
     public assertPrettyfiedAsExpected(fileNamePrefix: string): void {
-        const inputFileContents = this.readFileContents(`${fileNamePrefix}-input.md`);
-        const edits = this.makeTextEdit(inputFileContents);
-        const expectedFileContents = this.readFileContents(`${fileNamePrefix}-expected.md`);
-        this.assertEditsPrettyfied(inputFileContents, edits, expectedFileContents);
+        vscode.workspace.openTextDocument(`${fileNamePrefix}-input.md`)
+            .then(inputDocument => {
+                const edits = this.formatFile(inputDocument);
+                const expectedFileContents = this.readFileContents(`${fileNamePrefix}-expected.md`);
+                this.assertEditsPrettyfied(inputDocument, edits, expectedFileContents);
+            });
     }
 
-    private assertEditsPrettyfied(originalInput: string, edits: vscode.TextEdit[], expected: string): void {
-        const doc = new MarkdownTextDocumentStub(originalInput);
-        doc.applyEdits(edits);
-        const actual = doc.getText();
+    private assertEditsPrettyfied(inputDocument: vscode.TextDocument, edits: vscode.TextEdit[], expected: string): void {
+        let actual = inputDocument.getText();
+        for (let edit of edits) {
+            const startIndex = inputDocument.offsetAt(edit.range.start);
+            const endIndex = inputDocument.offsetAt(inputDocument.validatePosition(edit.range.end));
+            actual = actual.substring(0, startIndex) + edit.newText + actual.substring(endIndex);
+        }
 
         const expectedLines = expected.split(/\r\n|\r|\n/);
         const actualLines = actual.split(/\r\n|\r|\n/);
@@ -48,13 +53,16 @@ export class PrettyfierFromFile {
             assert.equal(actualLines[i], expectedLines[i]);
     }
 
-    private makeTextEdit(fileContents: string): vscode.TextEdit[] {
-        const doc = new MarkdownTextDocumentStub(fileContents);
+    private formatFile(doc: vscode.TextDocument): vscode.TextEdit[] {
         return this.createPrettyfier().provideDocumentFormattingEdits(doc, null, null);
     }
 
     private readFileContents(fileName: string) {
-        return fs.readFileSync(path.resolve(__dirname, fileName), 'utf-8');
+        return fs.readFileSync(this.pathFor(fileName), 'utf-8');
+    }
+
+    private pathFor(fileName: string) {
+        return path.resolve(__dirname, fileName);
     }
 
     private createPrettyfier(): TableDocumentPrettyfier {

test/unitTests/tableFinding/tableFinder.test.ts

@@ -38,7 +38,7 @@ suite("TableFinder tests", () => {
         let tableRanges = sut.getTables(document);
 
         assert.equal(tableRanges.length, 1);
-        assert.deepStrictEqual(tableRanges[0], new vscode.Range(0, 0, 3, 27));
+        assert.deepStrictEqual(tableRanges[0], new vscode.Range(0, 0, 3, Number.MAX_SAFE_INTEGER));
     });
 
     test("getTables() for single table the expected range is returned", () => {
@@ -53,7 +53,7 @@ suite("TableFinder tests", () => {
         let tableRanges = sut.getTables(document);
 
         assert.equal(tableRanges.length, 1);
-        assert.deepStrictEqual(tableRanges[0], new vscode.Range(1, 0, 4, 27));
+        assert.deepStrictEqual(tableRanges[0], new vscode.Range(1, 0, 4, Number.MAX_SAFE_INTEGER));
     });
 
     test("getTables() for two tables the expected ranges are returned", () => {
@@ -72,8 +72,8 @@ suite("TableFinder tests", () => {
         let tableRanges = sut.getTables(document);
 
         assert.equal(tableRanges.length, 2);
-        assert.deepStrictEqual(tableRanges[0], new vscode.Range(1, 0, 4, 27));
-        assert.deepStrictEqual(tableRanges[1], new vscode.Range(6, 0, 9, 27));
+        assert.deepStrictEqual(tableRanges[0], new vscode.Range(1, 0, 4, Number.MAX_SAFE_INTEGER));
+        assert.deepStrictEqual(tableRanges[1], new vscode.Range(6, 0, 9, Number.MAX_SAFE_INTEGER));
     });
 
     test("getTables() jumps over invalid tables", () => {
@@ -95,8 +95,8 @@ suite("TableFinder tests", () => {
         let tableRanges = sut.getTables(document);
 
         assert.equal(tableRanges.length, 2);
-        assert.deepStrictEqual(tableRanges[0], new vscode.Range(1, 0, 4, 27));
-        assert.deepStrictEqual(tableRanges[1], new vscode.Range(9, 0, 12, 27));
+        assert.deepStrictEqual(tableRanges[0], new vscode.Range(1, 0, 4, Number.MAX_SAFE_INTEGER));
+        assert.deepStrictEqual(tableRanges[1], new vscode.Range(9, 0, 12, Number.MAX_SAFE_INTEGER));
     });
 
     test("getTables() for table with alignments the expected range is returned", () => {
@@ -111,7 +111,7 @@ suite("TableFinder tests", () => {
         let tableRanges = sut.getTables(document);
 
         assert.equal(tableRanges.length, 1);
-        assert.deepStrictEqual(tableRanges[0], new vscode.Range(1, 0, 4, 27));
+        assert.deepStrictEqual(tableRanges[0], new vscode.Range(1, 0, 4, Number.MAX_SAFE_INTEGER));
     });
 
     function getSut() {