Pass the alignment marker via the ctors

Author: darkriszty

src/extension/extension.ts

@@ -34,7 +34,7 @@ export function activate(context: vscode.ExtensionContext): void {
                 new RowViewModelFactory(
                     new ContentPadCalculator(new PadCalculatorSelector(), " "), 
                     new SeparatorPadCalculator(new PadCalculatorSelector(), "-"),
-                    new AlignmentMarkerStrategy()
+                    new AlignmentMarkerStrategy(":")
                 )
             ),
             new TableStringWriter(),

src/viewModelFactories/alignmentMarking/alignmentMarkerStrategy.ts

@@ -3,12 +3,13 @@ import { IAlignmentMarker, LeftAlignmentMarker, RightAlignmentMarker, CenterAlig
 
 
 export class AlignmentMarkerStrategy {
+    constructor(private _markerChar: string) { }
 
     public markerFor(alignment: Alignment): IAlignmentMarker {
         switch (alignment) {
-            case Alignment.Left: return new LeftAlignmentMarker();
-            case Alignment.Right: return new RightAlignmentMarker();
-            case Alignment.Center: return new CenterAlignmentMarker();
+            case Alignment.Left: return new LeftAlignmentMarker(this._markerChar);
+            case Alignment.Right: return new RightAlignmentMarker(this._markerChar);
+            case Alignment.Center: return new CenterAlignmentMarker(this._markerChar);
             default: return new NotSetAlignmentMarker();
         }
     }

src/viewModelFactories/alignmentMarking/centerAlignmentMarker.ts

@@ -1,10 +1,12 @@
 import { IAlignmentMarker } from ".";
 
 export class CenterAlignmentMarker implements IAlignmentMarker {
+    constructor(private _markerChar: string) { }
+
     public mark(padding: string): string {
         if (padding == null || padding.length < 2) 
             return padding;
 
-        return ":" + padding.substring(1, padding.length - 1) + ":";
+        return this._markerChar + padding.substring(1, padding.length - 1) + this._markerChar;
     }
 }

src/viewModelFactories/alignmentMarking/leftAlignmentMarker.ts

@@ -1,11 +1,11 @@
 import { IAlignmentMarker } from ".";
 
 export class LeftAlignmentMarker implements IAlignmentMarker {
-    constructor() {
-    }
+    constructor(private _markerChar: string) { }
+
     public mark(padding: string): string {
         if (padding == null || padding.length < 2)
             return padding;
-        return ":" + padding.substr(1);
+        return this._markerChar + padding.substr(1);
     }
 }

src/viewModelFactories/alignmentMarking/rightAlignmentMarker.ts

@@ -1,9 +1,11 @@
 import { IAlignmentMarker } from ".";
 
 export class RightAlignmentMarker implements IAlignmentMarker {
+    constructor(private _markerChar: string) { }
+
     public mark(padding: string): string {
         if (padding == null || padding.length < 2)
             return padding;
-        return padding.substring(0, padding.length - 1) + ":";
+        return padding.substring(0, padding.length - 1) + this._markerChar;
     }
 }

test/systemTests/tableRangePrettyfierFactory.ts

@@ -64,7 +64,7 @@ export class PrettyfierFromFile {
             new TableViewModelFactory(new RowViewModelFactory(
                 new ContentPadCalculator(new PadCalculatorSelector(), " "), 
                 new SeparatorPadCalculator(new PadCalculatorSelector(), "-"),
-                new AlignmentMarkerStrategy()
+                new AlignmentMarkerStrategy(":")
             )),
             new TableStringWriter(),
             [ this._logger ]

test/unitTests/viewModelFactories/alignmentMarking/alignmentMarkerStrategy.test.ts

@@ -5,10 +5,10 @@ import { Alignment } from '../../../../src/models/alignment';
 suite("AlignmentMarkerStrategy tests", () => {
 
     test("markerFor() returns a different marker strategy for the different alignemnts", () => {
-        const sut = new AlignmentMarkerStrategy();
+        const sut = new AlignmentMarkerStrategy(":");
         const alignments = [ Alignment.NotSet, Alignment.Left, Alignment.Center, Alignment.Right ];
 
-        const markers: IAlignmentMarker[] = alignments.map(sut.markerFor);
+        const markers: IAlignmentMarker[] = alignments.map(sut.markerFor, sut);
 
         const distinctMarkers = markers.filter((v, i, a) => a.indexOf(v) == i);
 

test/unitTests/viewModelFactories/alignmentMarking/centerAlignmentMarker.test.ts

@@ -43,6 +43,6 @@ suite("CenterAlignmentMarker tests", () => {
     });
 
     function createSut() {
-        return new CenterAlignmentMarker();
+        return new CenterAlignmentMarker(":");
     }
 });

test/unitTests/viewModelFactories/alignmentMarking/leftAlignmentMarker.test.ts

@@ -41,6 +41,6 @@ suite("LeftAlignmentMarker tests", () => {
     });
 
     function createSut() {
-        return new LeftAlignmentMarker();
+        return new LeftAlignmentMarker(":");
     }
 });

test/unitTests/viewModelFactories/alignmentMarking/rightAlignmentMarker.test.ts

@@ -41,6 +41,6 @@ suite("RightAlignmentMarker tests", () => {
     });
 
     function createSut() {
-        return new RightAlignmentMarker();
+        return new RightAlignmentMarker(":");
     }
 });