Merge branch 'feature/Alignments' of https://github.com/darkriszty/MarkdownTablePrettify-VSCodeExt into feature/Alignments

Author: darkriszty

.vscodeignore

@@ -8,4 +8,6 @@ src/**
 tsconfig.json
 vsc-extension-quickstart.md
 .travis.yml
-demonstration.md
+demonstration.md
+package-lock.json
+gulpfile.js

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 ### Added
+- Issue #15: Support alignment options
+
+## 2.0.0 - 2012-02-09
+### Added
 - Issue #12: Full rewrite for refactoring.
 - Issue #11: Support escaping of separators with backslash.
 - Issue #16: Ignore separators that are in code blocks.

package-lock.json

@@ -2,7 +2,7 @@
   "name": "markdown-table-prettify",
   "displayName": "Markdown Table Prettifier",
   "description": "Transforms markdown tables to be more readable.",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "publisher": "darkriszty",
   "repository": {
     "type": "git",

package.json

@@ -13,8 +13,8 @@ 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';
 
 // This method is called when the extension is activated.
 // The extension is activated the very first time the command is executed.
@@ -31,8 +31,8 @@ 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(":")
                 )
             ),
             new TableStringWriter(),

src/extension/extension.ts

@@ -2,7 +2,7 @@ import { Table } from "../models/table";
 import { Cell } from "../models/cell";
 
 export abstract class BasePadCalculator {
-    public abstract getLeftPadding(paddingChar: string, table: Table, cell: Cell): string;
+    public abstract getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string;
     public abstract getRightPadding(paddingChar: string, table: Table, row: number, column: number): string;
 
     protected baseGetRightPadding(paddingChar: string, table: Table, row: number, column: number): string {

src/padCalculation/basePadCalculator.ts

@@ -0,0 +1,26 @@
+import { Table } from "../../models/table";
+import { Cell } from "../../models/cell";
+import { BasePadCalculator } from "../basePadCalculator";
+
+export abstract class CenterPadCalculator extends BasePadCalculator {
+    public getLeftPadding(paddingChar: string, table: Table, row: number, column: number): string {
+        return paddingChar.repeat(Math.floor(this.totalPadCount(table, column, row)));
+    }
+
+    public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {
+        return paddingChar.repeat(Math.ceil(this.totalPadCount(table, column, row)));
+    }
+
+    protected 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 += this.extraPadCount(table);
+        return padCount / 2;
+    }
+
+    protected extraPadCount(table: Table): number {
+        return 2;
+    }
+}

src/padCalculation/center/centerPadCalculator.ts

@@ -0,0 +1,8 @@
+import { Table } from "../../models/table";
+import { CenterPadCalculator } from "./centerPadCalculator";
+
+export class FirstColumnPadCalculator extends CenterPadCalculator {
+    protected extraPadCount(table: Table): number {
+        return table.hasLeftBorder ? 2 : 1;
+    }
+}

src/padCalculation/center/firstColumnPadCalculator.ts

@@ -0,0 +1,3 @@
+export * from "./firstColumnPadCalculator"
+export * from "./middleColumnPadCalculator"
+export * from "./lastColumnPadCalculator"

src/padCalculation/center/index.ts

@@ -0,0 +1,9 @@
+import { Table } from "../../models/table";
+import { CenterPadCalculator } from "./centerPadCalculator";
+
+export class LastColumnPadCalculator extends CenterPadCalculator {
+    public getRightPadding(paddingChar: string, table: Table, row: number, column: number): string {
+        if (!table.hasRightBorder) return "";
+        return super.getRightPadding(paddingChar, table, row, column);
+    }
+}