Simplify separator row calculation

darkriszty · darkriszty · commit e045e9ae21e5 · 2018-02-23T15:04:49.000+02:00
diff --git a/src/extension/extension.ts b/src/extension/extension.ts
@@ -13,7 +13,6 @@ import { RowViewModelFactory } from '../viewModelFactories/rowViewModelFactory';
 import { TrimmerTransformer } from '../modelFactory/transformers/trimmerTransformer';
 import { BorderTransformer } from '../modelFactory/transformers/borderTransformer';
 import { SelectionInterpreter } from '../modelFactory/selectionInterpreter';
-import { SeparatorPadCalculator } from '../padCalculation/separatorPadCalculator';
 import { PadCalculatorSelector } from '../padCalculation/padCalculatorSelector';
 import { AlignmentMarkerStrategy } from '../viewModelFactories/alignmentMarking';
 
@@ -32,8 +31,7 @@ export function activate(context: vscode.ExtensionContext): void {
             new TableValidator(new SelectionInterpreter()),
             new TableViewModelFactory(
                 new RowViewModelFactory(
-                    new ContentPadCalculator(new PadCalculatorSelector(), " "), 
-                    new SeparatorPadCalculator(new PadCalculatorSelector(), "-"),
+                    new ContentPadCalculator(new PadCalculatorSelector(), " "),
                     new AlignmentMarkerStrategy(":")
                 )
             ),
diff --git a/src/padCalculation/center/lastColumnPadCalculator.ts b/src/padCalculation/center/lastColumnPadCalculator.ts
@@ -4,20 +4,20 @@ import { Cell } from "../../models/cell";
 
 export class LastColumnPadCalculator extends BasePadCalculator {
     public getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string {
-        return paddingChar.repeat(Math.ceil(this.totalPadCount(table, column, row)));
+        return paddingChar.repeat(Math.floor(this.totalPadCount(table, column, row)));
     }
 
     public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {
         if (!table.hasRightBorder) return "";
-        return paddingChar.repeat(Math.floor(this.totalPadCount(table, column, row)));
+        return paddingChar.repeat(Math.ceil(this.totalPadCount(table, column, row)));
     }
 
     private totalPadCount(table: Table, column: number, row: number): number {
         const longestColumnLength = table.getLongestColumnLengths()[column];
         let padCount = longestColumnLength > 0
             ? longestColumnLength - table.rows[row][column].getLength()
             : 1;
-        padCount++;
+        padCount += 2;
         return padCount / 2;
     }
 }
diff --git a/src/padCalculation/separatorPadCalculator.ts b/src/padCalculation/separatorPadCalculator.ts
diff --git a/src/viewModelFactories/rowViewModelFactory.ts b/src/viewModelFactories/rowViewModelFactory.ts
@@ -5,10 +5,10 @@ import { Alignment } from "../models/alignment";
 import { AlignmentMarkerStrategy } from "./alignmentMarking";
 
 export class RowViewModelFactory {
+    private separatorChar : string = "-";
 
     constructor(
         private _contentPadCalculator: PadCalculator,
-        private _separatorPadCalculator: PadCalculator,
         private _alignmentMarkerStrategy: AlignmentMarkerStrategy)
     { }
 
@@ -26,15 +26,17 @@ export class RowViewModelFactory {
         return new RowViewModel(resultRow);
     }
 
-    public buildSeparator(table: Table): RowViewModel {
-        let resultRow = new Array(table.columnCount);
+    public buildSeparator(rows: RowViewModel[], table: Table): RowViewModel {
+        const columnCount = rows[0].columnCount;
+        let lengths = Array(columnCount).fill(0);
 
-        for(let col = 0; col < table.columnCount; col++)
-            resultRow[col] = this._alignmentMarkerStrategy.markerFor(table.alignments[col]).mark(
-                this._separatorPadCalculator.getLeftPadding(table, 1, col) +
-                this._separatorPadCalculator.getRightPadding(table, 0, col)
-            );
+        for (const row of rows) {
+            for (let i = 0; i < columnCount; i++) {
+                lengths[i] = Math.max(lengths[i], (row.getValueAt(i).length));
+            }
+        }
 
-        return new RowViewModel(resultRow);
+        const values = lengths.map(l => this.separatorChar.repeat(l)).map((val ,col) => this._alignmentMarkerStrategy.markerFor(table.alignments[col]).mark(val));
+        return new RowViewModel(values);
     }
 }
diff --git a/src/viewModelFactories/tableViewModelFactory.ts b/src/viewModelFactories/tableViewModelFactory.ts
@@ -16,8 +16,8 @@ export class TableViewModelFactory {
         result.hasLeftBorder = tableWithoutSeparator.hasLeftBorder;
         result.hasRightBorder = tableWithoutSeparator.hasRightBorder;
         result.header = this._rowViewModelFactory.buildRow(0, tableWithoutSeparator);
-        result.separator = this._rowViewModelFactory.buildSeparator(tableWithoutSeparator);
         result.rows = this.buildRows(tableWithoutSeparator);
+        result.separator = this._rowViewModelFactory.buildSeparator(result.rows, tableWithoutSeparator);
 
         return result;
     }
diff --git a/test/systemTests/resources/alignCenterWithoutBorder-expected.md b/test/systemTests/resources/alignCenterWithoutBorder-expected.md
@@ -1,5 +1,5 @@
  Type  |                          Range                          |           Size
-:-----:|:-------------------------------------------------------:|:------------------------:
+:-----:|:-------------------------------------------------------:|:-----------------------:
  sbyte |                       -128 to 127                       |   Signed 8-bit integer
  byte  |                        0 to 255                         |  Unsigned 8-bit integer
  char  |                    U+0000 to U+ffff                     | Unicode 16-bit character
diff --git a/test/systemTests/resources/alignRightWithBorder-input.md b/test/systemTests/resources/alignRightWithBorder-input.md
@@ -1,11 +1,11 @@
 |Type|Range|Size|
 |-:|-:|-:|
-|sbyte|-128to127|Signed8-bit integer|
-|byte|0to255|Unsigned8-bit integer|
-|char|U+0000toU+ffff|Unicode16-bit character|
-|short|-32,768to32,767|Signed16-bit integer|
-|ushort|0to65,535|Unsigned16-bit integer|
-|int|-2,147,483,648to2,147,483,647|Signed32-bit integer|
-|uint|0to4,294,967,295|Unsigned32-bit integer|
-|long|-9,223,372,036,854,775,808to9,223,372,036,854,775,807|Signed64-bit integer|
-|ulong|0to18,446,744,073,709,551,615|Unsigned64-bit integer|
+|sbyte|-128 to 127|Signed 8-bit integer|
+|byte|0 to 255|Unsigned 8-bit integer|
+|char|U+0000 to U+ffff|Unicode 16-bit character|
+|short|-32,768 to 32,767|Signed 16-bit integer|
+|ushort|0 to 65,535|Unsigned 16-bit integer|
+|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|
diff --git a/test/systemTests/resources/alignRightWithoutBorder-input.md b/test/systemTests/resources/alignRightWithoutBorder-input.md
@@ -1,11 +1,11 @@
 Type|Range|Size
 -:|-:|-:
-sbyte|-128to127|Signed8-bit integer
-byte|0to255|Unsigned8-bit integer
-char|U+0000toU+ffff|Unicode16-bit character
-short|-32,768to32,767|Signed16-bit integer
-ushort|0to65,535|Unsigned16-bit integer
-int|-2,147,483,648to2,147,483,647|Signed32-bit integer
-uint|0to4,294,967,295|Unsigned32-bit integer
-long|-9,223,372,036,854,775,808to9,223,372,036,854,775,807|Signed64-bit integer
-ulong|0to18,446,744,073,709,551,615|Unsigned64-bit integer
+sbyte|-128 to 127|Signed 8-bit integer
+byte|0 to 255|Unsigned 8-bit integer
+char|U+0000 to U+ffff|Unicode 16-bit character
+short|-32,768 to 32,767|Signed 16-bit integer
+ushort|0 to 65,535|Unsigned 16-bit integer
+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
diff --git a/test/systemTests/resources/cjkHaveLength2-expected.md b/test/systemTests/resources/cjkHaveLength2-expected.md
@@ -1,5 +1,5 @@
 Type     | Range                                                   | Size
----------|---------------------------------------------------------|--------------------------
+---------|---------------------------------------------------------|-------------------------
 sbyte    | -128 to 127                                             | Signed 8-bit integer
 byte     | 0 to 255                                                | Unsigned 8-bit integer
 char     | U+0000 to U+ffff                                        | Unicode 16-bit character
diff --git a/test/systemTests/resources/emptyCell-expected.md b/test/systemTests/resources/emptyCell-expected.md
@@ -1,5 +1,5 @@
 Type   | Range                                                   | Size
--------|---------------------------------------------------------|--------------------------
+-------|---------------------------------------------------------|-------------------------
        | foo                                                     | bar
 foo    |                                                         | bar
 foo    | bar                                                     |
diff --git a/test/systemTests/resources/emptyMiddleColumn-expected.md b/test/systemTests/resources/emptyMiddleColumn-expected.md
@@ -1,5 +1,5 @@
 Type   |   | Range                                                   | Size
--------|---|---------------------------------------------------------|--------------------------
+-------|---|---------------------------------------------------------|-------------------------
 sbyte  |   | -128 to 127                                             | Signed 8-bit integer
 byte   |   | 0 to 255                                                | Unsigned 8-bit integer
 char   |   | U+0000 to U+ffff                                        | Unicode 16-bit character
diff --git a/test/systemTests/resources/escapeCodeBlock-expected.md b/test/systemTests/resources/escapeCodeBlock-expected.md
@@ -1,5 +1,5 @@
 Type   | Range                                                       | Size
--------|-------------------------------------------------------------|--------------------------
+-------|-------------------------------------------------------------|-------------------------
 sbyte  | -128 `|to|` 127                                             | Signed 8-bit integer
 byte   | 0 `|to|` 255                                                | Unsigned 8-bit integer
 char   | U+0000 `|to|` U+ffff                                        | Unicode 16-bit character
diff --git a/test/systemTests/resources/escapeSeparator-expected.md b/test/systemTests/resources/escapeSeparator-expected.md
@@ -1,5 +1,5 @@
 x       | y       | x&y     | x\|y
---------|---------|---------|-------------
+--------|---------|---------|------------
 `true`  | `true`  | `true`  | `true`
 `true`  | `false` | `false` | `true`
 `true`  | `null`  | `null`  | `null`
diff --git a/test/systemTests/resources/redundantTableEnding-expected.md b/test/systemTests/resources/redundantTableEnding-expected.md
@@ -1,5 +1,5 @@
 Type   | Range                                                   | Size
--------|---------------------------------------------------------|--------------------------
+-------|---------------------------------------------------------|-------------------------
 sbyte  | -128 to 127                                             | Signed 8-bit integer
 byte   | 0 to 255                                                | Unsigned 8-bit integer
 char   | U+0000 to U+ffff                                        | Unicode 16-bit character
diff --git a/test/systemTests/tableRangePrettyfierFactory.ts b/test/systemTests/tableRangePrettyfierFactory.ts
@@ -17,7 +17,6 @@ import { MarkdownTextDocumentStub } from "../stubs/markdownTextDocumentStub";
 import { TrimmerTransformer } from '../../src/modelFactory/transformers/trimmerTransformer';
 import { BorderTransformer } from '../../src/modelFactory/transformers/borderTransformer';
 import { SelectionInterpreter } from '../../src/modelFactory/selectionInterpreter';
-import { SeparatorPadCalculator } from '../../src/padCalculation/separatorPadCalculator';
 import { PadCalculatorSelector } from '../../src/padCalculation/padCalculatorSelector';
 import { AlignmentMarkerStrategy } from '../../src/viewModelFactories/alignmentMarking';
 
@@ -63,7 +62,6 @@ export class PrettyfierFromFile {
             new TableValidator(new SelectionInterpreter()),
             new TableViewModelFactory(new RowViewModelFactory(
                 new ContentPadCalculator(new PadCalculatorSelector(), " "), 
-                new SeparatorPadCalculator(new PadCalculatorSelector(), "-"),
                 new AlignmentMarkerStrategy(":")
             )),
             new TableStringWriter(),
diff --git a/test/unitTests/padCalculation/separatorPadCalculator.test.ts b/test/unitTests/padCalculation/separatorPadCalculator.test.ts
diff --git a/test/unitTests/viewModelFactories/rowViewModelFactory.test.ts b/test/unitTests/viewModelFactories/rowViewModelFactory.test.ts
diff --git a/test/unitTests/viewModelFactories/tableViewModelFactory.test.ts b/test/unitTests/viewModelFactories/tableViewModelFactory.test.ts

Original file line number	Diff line number	Diff line change
`@@ -4,20 +4,20 @@ import { Cell } from "../../models/cell";`
`4`	`4`
`5`	`5`	`export class LastColumnPadCalculator extends BasePadCalculator {`
`6`	`6`	`public getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string {`
`7`		`- return paddingChar.repeat(Math.ceil(this.totalPadCount(table, column, row)));`
	`7`	`+ return paddingChar.repeat(Math.floor(this.totalPadCount(table, column, row)));`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {`
`11`	`11`	`if (!table.hasRightBorder) return "";`
`12`		`- return paddingChar.repeat(Math.floor(this.totalPadCount(table, column, row)));`
	`12`	`+ return paddingChar.repeat(Math.ceil(this.totalPadCount(table, column, row)));`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`private totalPadCount(table: Table, column: number, row: number): number {`
`16`	`16`	`const longestColumnLength = table.getLongestColumnLengths()[column];`
`17`	`17`	`let padCount = longestColumnLength > 0`
`18`	`18`	`? longestColumnLength - table.rows[row][column].getLength()`
`19`	`19`	`: 1;`
`20`		`- padCount++;`
	`20`	`+ padCount += 2;`
`21`	`21`	`return padCount / 2;`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ export class TableViewModelFactory {`
`16`	`16`	`result.hasLeftBorder = tableWithoutSeparator.hasLeftBorder;`
`17`	`17`	`result.hasRightBorder = tableWithoutSeparator.hasRightBorder;`
`18`	`18`	`result.header = this._rowViewModelFactory.buildRow(0, tableWithoutSeparator);`
`19`		`- result.separator = this._rowViewModelFactory.buildSeparator(tableWithoutSeparator);`
`20`	`19`	`result.rows = this.buildRows(tableWithoutSeparator);`
	`20`	`+ result.separator = this._rowViewModelFactory.buildSeparator(result.rows, tableWithoutSeparator);`
`21`	`21`
`22`	`22`	`return result;`
`23`	`23`	`}`