Instantiate the pad calculator selector outside the calculator

Author: darkriszty

src/extension/extension.ts

@@ -14,6 +14,7 @@ import { TrimmerTransformer } from '../modelFactory/transformers/trimmerTransfor
 import { BorderTransformer } from '../modelFactory/transformers/borderTransformer';
 import { SelectionInterpreter } from '../modelFactory/selectionInterpreter';
 import { SeparatorPadCalculator } from '../padCalculation/separatorPadCalculator';
+import { ColumnBasedPadCalculatorSelector } from '../padCalculation/columnBasedPadCalculatorSelector';
 
 // This method is called when the extension is activated.
 // The extension is activated the very first time the command is executed.
@@ -29,7 +30,10 @@ export function activate(context: vscode.ExtensionContext): void {
             ),
             new TableValidator(new SelectionInterpreter()),
             new TableViewModelFactory(
-                new RowViewModelFactory(new ContentPadCalculator(), new SeparatorPadCalculator())
+                new RowViewModelFactory(
+                    new ContentPadCalculator(new ColumnBasedPadCalculatorSelector()), 
+                    new SeparatorPadCalculator(new ColumnBasedPadCalculatorSelector())
+                )
             ),
             new TableStringWriter(),
             [ new VsWindowLogger(), new ConsoleLogger() ])

src/padCalculation/contentPadCalculator.ts

@@ -4,11 +4,13 @@ import { ColumnBasedPadCalculatorSelector } from "./columnBasedPadCalculatorSele
 
 export class ContentPadCalculator implements PadCalculator {
 
+    constructor(private _padCalculatorSelector: ColumnBasedPadCalculatorSelector) { }
+
     public getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string {
-        return new ColumnBasedPadCalculatorSelector().select(table, column).getLeftPadding(paddingChar, table, table.rows[row][column]);
+        return this._padCalculatorSelector.select(table, column).getLeftPadding(paddingChar, table, table.rows[row][column]);
     }
 
     public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {
-        return new ColumnBasedPadCalculatorSelector().select(table, column).getRightPadding(paddingChar, table, row, column);
+        return this._padCalculatorSelector.select(table, column).getRightPadding(paddingChar, table, row, column);
     }
 }

test/systemTests/tableRangePrettyfierFactory.ts

@@ -18,6 +18,7 @@ import { TrimmerTransformer } from '../../src/modelFactory/transformers/trimmerT
 import { BorderTransformer } from '../../src/modelFactory/transformers/borderTransformer';
 import { SelectionInterpreter } from '../../src/modelFactory/selectionInterpreter';
 import { SeparatorPadCalculator } from '../../src/padCalculation/separatorPadCalculator';
+import { ColumnBasedPadCalculatorSelector } from '../../src/padCalculation/columnBasedPadCalculatorSelector';
 
 export class PrettyfierFromFile {
     private readonly _logger: ILogger;
@@ -59,7 +60,10 @@ export class PrettyfierFromFile {
                 new TrimmerTransformer(new BorderTransformer(null))
             ),
             new TableValidator(new SelectionInterpreter()),
-            new TableViewModelFactory(new RowViewModelFactory(new ContentPadCalculator(), new SeparatorPadCalculator())),
+            new TableViewModelFactory(new RowViewModelFactory(
+                new ContentPadCalculator(new ColumnBasedPadCalculatorSelector()), 
+                new SeparatorPadCalculator(new ColumnBasedPadCalculatorSelector())
+            )),
             new TableStringWriter(),
             [ this._logger ]
         );

test/unitTests/padCalculation/contentPadCalculator.test.ts

@@ -5,6 +5,7 @@ import { Table } from '../../../src/models/table';
 import { Alignment } from '../../../src/models/alignment';
 import { Cell } from '../../../src/models/cell';
 import { PadCalculator } from '../../../src/padCalculation/padCalculator';
+import { ColumnBasedPadCalculatorSelector } from '../../../src/padCalculation/columnBasedPadCalculatorSelector';
 
 suite("ContentPadCalculator tests", () => {
 
@@ -338,6 +339,6 @@ suite("ContentPadCalculator tests", () => {
     }
 
     function createCalculator(): PadCalculator { 
-        return new ContentPadCalculator(); 
+        return new ContentPadCalculator(new ColumnBasedPadCalculatorSelector()); 
     }
 });

test/unitTests/padCalculation/separatorPadCalculator.test.ts

@@ -5,6 +5,7 @@ import { Alignment } from '../../../src/models/alignment';
 import { Cell } from '../../../src/models/cell';
 import { PadCalculator } from '../../../src/padCalculation/padCalculator';
 import { SeparatorPadCalculator } from '../../../src/padCalculation/separatorPadCalculator';
+import { ColumnBasedPadCalculatorSelector } from '../../../src/padCalculation/columnBasedPadCalculatorSelector';
 
 suite("SeparatorPadCalculator tests", () => {
 
@@ -149,6 +150,6 @@ suite("SeparatorPadCalculator tests", () => {
     }
 
     function createCalculator(): PadCalculator { 
-        return new SeparatorPadCalculator(); 
+        return new SeparatorPadCalculator(new ColumnBasedPadCalculatorSelector());
     }
 });