Use the document formatter for system tests

Author: darkriszty

src/tableFinding/tableFinder.ts

@@ -68,7 +68,7 @@ export class TableFinder {
     private getRangeForLines(rows: string[], startLine: number, endLine: number): vscode.Range {
         return new vscode.Range(
             new vscode.Position(startLine, 0),
-            new vscode.Position(endLine, rows[endLine - 1].length)
+            new vscode.Position(endLine, rows[endLine].length)
         );
     }
 }

test/stubs/markdownTextDocumentStub.ts

@@ -13,8 +13,7 @@ export class MarkdownTextDocumentStub implements vscode.TextDocument {
     lineCount: number;
 
     constructor(text: string) {
-        this._lines = text.split(/\r\n|\r|\n/);
-        this.lineCount = this._lines.length;
+        this.setLines(text);
 
         this.fileName = "test.md";
         this.isUntitled = false;
@@ -23,6 +22,11 @@ export class MarkdownTextDocumentStub implements vscode.TextDocument {
         this.isDirty = false;
     }
 
+    private setLines(text: string) {
+        this._lines = text.split(/\r\n|\r|\n/);
+        this.lineCount = this._lines.length;
+    }
+
     getFullRange(): vscode.Range {
         return this.getRangeForLines(0, this._lines.length - 1);
     }
@@ -34,6 +38,25 @@ 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;
     lineAt(param: any) {

test/systemTests/resources/alignCenterWithBorder-input.md

@@ -8,4 +8,4 @@
 |int|-2,147,483,648 to 2,147,483,647|Signed 32-bit integer|
 |uint|0 to 4,294,967,295|Unsigned 32-bit integer|
 |long|-9,223,372,036,854,775,808 to 9,223,372,036,854,775,807|Signed 64-bit integer|
-|ulong|0 to 18,446,744,073,709,551,615|Unsigned 64-bit integer|
+|ulong|0 to 18,446,744,073,709,551,615|Unsigned 64-bit integer|

test/systemTests/tableRangePrettyfierFactory.ts

@@ -18,6 +18,8 @@ import { BorderTransformer } from '../../src/modelFactory/transformers/borderTra
 import { SelectionInterpreter } from '../../src/modelFactory/selectionInterpreter';
 import { PadCalculatorSelector } from '../../src/padCalculation/padCalculatorSelector';
 import { AlignmentMarkerStrategy } from '../../src/viewModelFactories/alignmentMarking';
+import { TableDocumentPrettyfier } from '../../src/extension/tableDocumentPrettyfier';
+import { TableFinder } from '../../src/tableFinding/tableFinder';
 
 export class PrettyfierFromFile {
     private readonly _logger: ILogger;
@@ -27,44 +29,51 @@ export class PrettyfierFromFile {
     }
 
     public assertPrettyfiedAsExpected(fileNamePrefix: string): void {
-        this.assertEditsPrettyfied(
-            this.makeTextEdit(this.readFileContents(`${fileNamePrefix}-input.md`)),
-            this.readFileContents(`${fileNamePrefix}-expected.md`)
-        );
+        const inputFileContents = this.readFileContents(`${fileNamePrefix}-input.md`);
+        const edits = this.makeTextEdit(inputFileContents);
+        const expectedFileContents = this.readFileContents(`${fileNamePrefix}-expected.md`);
+        this.assertEditsPrettyfied(inputFileContents, edits, expectedFileContents);
     }
 
-    private assertEditsPrettyfied(edits: vscode.TextEdit[], expected: string): void {
-        assert.equal(edits.length, 1);
+    private assertEditsPrettyfied(originalInput: string, edits: vscode.TextEdit[], expected: string): void {
+        const doc = new MarkdownTextDocumentStub(originalInput);
+        doc.applyEdits(edits);
+        const actual = doc.getText();
+
         const expectedLines = expected.split(/\r\n|\r|\n/);
-        const actualLines = edits[0].newText.split(/\r\n|\r|\n/);
+        const actualLines = actual.split(/\r\n|\r|\n/);
+
         assert.equal(actualLines.length, expectedLines.length);
         for (let i = 0; i < actualLines.length; i++)
             assert.equal(actualLines[i], expectedLines[i]);
     }
 
     private makeTextEdit(fileContents: string): vscode.TextEdit[] {
         const doc = new MarkdownTextDocumentStub(fileContents);
-        return this.createPrettyfier().provideDocumentRangeFormattingEdits(doc, doc.getFullRange(), null, null);
+        return this.createPrettyfier().provideDocumentFormattingEdits(doc, null, null);
     }
 
     private readFileContents(fileName: string) {
         return fs.readFileSync(path.resolve(__dirname, fileName), 'utf-8');
     }
 
-    private createPrettyfier(): TableDocumentRangePrettyfier {
-        return new TableDocumentRangePrettyfier(
-            new TableFactory(
-                new AlignmentFactory(),
-                new SelectionInterpreter(false),
-                new TrimmerTransformer(new BorderTransformer(null))
-            ),
-            new TableValidator(new SelectionInterpreter(false)),
-            new TableViewModelFactory(new RowViewModelFactory(
-                new ContentPadCalculator(new PadCalculatorSelector(), " "), 
-                new AlignmentMarkerStrategy(":")
-            )),
-            new TableStringWriter(),
-            [ this._logger ]
+    private createPrettyfier(): TableDocumentPrettyfier {
+        return new TableDocumentPrettyfier(
+            new TableFinder(new TableValidator(new SelectionInterpreter(true))),
+            new TableDocumentRangePrettyfier(
+                new TableFactory(
+                    new AlignmentFactory(),
+                    new SelectionInterpreter(false),
+                    new TrimmerTransformer(new BorderTransformer(null))
+                ),
+                new TableValidator(new SelectionInterpreter(false)),
+                new TableViewModelFactory(new RowViewModelFactory(
+                    new ContentPadCalculator(new PadCalculatorSelector(), " "), 
+                    new AlignmentMarkerStrategy(":")
+                )),
+                new TableStringWriter(),
+                [ this._logger ]
+            )
         );
     }
 }