feat(tsfmt): fix many issue by @myitcv #24

Merge branch 'myitcv-newline_and_indent_fixes'
vvakame · Sep 22, 2015 · d0f2719 · d0f2719
2 parents 5581713 + 5b46e5d
commit d0f2719
Show file tree

Hide file tree

Showing 12 changed files with 130 additions and 10 deletions.
diff --git a/lib/cli.ts b/lib/cli.ts
@@ -124,14 +124,14 @@ function showResultHandler(resultMap: lib.ResultMap): Promise<any> {
         Object.keys(resultMap)
             .map(fileName => resultMap[fileName])
             .filter(result => result.error)
-            .forEach(result => console.error(result.message));
+            .forEach(result => process.stderr.write(result.message));
         process.exit(1);
     } else {
         Object.keys(resultMap)
             .map(fileName => resultMap[fileName])
             .forEach(result => {
                 if (result.message) {
-                    console.log(result.message);
+                    process.stdout.write(result.message);
                 }
             });
     }

diff --git a/lib/index.ts b/lib/index.ts
@@ -8,7 +8,7 @@ import * as fs from "fs";
 
 import base from "./provider/base";
 import editorconfig from "./provider/editorconfig";
-import tslintjson from "./provider/tslintjson";
+import tslintjson, {postProcess as tslintPostProcess} from "./provider/tslintjson";
 
 export interface Options {
     dryRun?: boolean;
@@ -21,6 +21,10 @@ export interface Options {
     tsfmt: boolean;
 }
 
+export interface PostProcess {
+    (fileName: string, formattedCode: string, opts: Options, formatOptions: ts.FormatCodeOptions): string;
+}
+
 export interface ResultMap {
     [fileName: string]: Result;
 }
@@ -43,7 +47,7 @@ export function processFiles(files: string[], opts: Options): Promise<ResultMap>
             let result: Result = {
                 fileName: fileName,
                 options: null,
-                message: `${fileName} is not exists. process abort.`,
+                message: `${fileName} does not exist. process abort.\n`,
                 error: true,
                 src: "",
                 dest: ""
@@ -85,6 +89,7 @@ export function processString(fileName: string, content: string, opts: Options):
 
     let formatOptions = createDefaultFormatCodeOptions();
     let optGenPromises: (ts.FormatCodeOptions | Promise<ts.FormatCodeOptions>)[] = [];
+    let postProcesses: PostProcess[] = [];
     if (opts.tsfmt) {
         optGenPromises.push(base(fileName, opts, formatOptions));
     }
@@ -93,6 +98,7 @@ export function processString(fileName: string, content: string, opts: Options):
     }
     if (opts.tslint) {
         optGenPromises.push(tslintjson(fileName, opts, formatOptions));
+        postProcesses.push(tslintPostProcess);
     }
 
     return Promise
@@ -104,18 +110,22 @@ export function processString(fileName: string, content: string, opts: Options):
                 formattedCode += "\n";
             }
 
+            postProcesses.forEach(postProcess => {
+                formattedCode = postProcess(fileName, formattedCode, opts, formatOptions) || formattedCode;
+            });
+
             // TODO replace newline code. NewLineCharacter params affect to only "new" newline. maybe.
             let message: string;
             let error = false;
             if (opts && opts.verify) {
                 if (content !== formattedCode) {
-                    message = `${fileName} is not formatted`;
+                    message = `${fileName} is not formatted\n`;
                     error = true;
                 }
             } else if (opts && opts.replace) {
                 if (content !== formattedCode) {
                     fs.writeFileSync(fileName, formattedCode);
-                    message = `replaced ${fileName}`;
+                    message = `replaced ${fileName}\n`;
                 }
             } else if (opts && !opts.dryRun) {
                 message = formattedCode;

diff --git a/lib/provider/tslintjson.ts b/lib/provider/tslintjson.ts
@@ -12,8 +12,9 @@ interface TslintSettings {
     rules: {
         indent: {
             0: boolean;
-            1: number;
+            1: string;
         };
+        "no-consecutive-blank-lines": boolean,
         whitespace: {
             0: boolean;
             1: string;
@@ -26,6 +27,10 @@ interface TslintSettings {
     };
 }
 
+export interface AdditionalFormatOptions {
+    noConsecutiveBlankLines: boolean;
+}
+
 export default function makeFormatCodeOptions(fileName: string, opts: Options, formatOptions: ts.FormatCodeOptions): ts.FormatCodeOptions {
     "use strict";
 
@@ -42,8 +47,8 @@ export default function makeFormatCodeOptions(fileName: string, opts: Options, f
     if (!config.rules) {
         return formatOptions;
     }
-    if (config.rules.indent && config.rules.indent[0]) {
-        formatOptions.IndentSize = config.rules.indent[1];
+    if (config.rules.indent && config.rules.indent[0] && config.rules.indent[1] === "spaces") {
+        formatOptions.ConvertTabsToSpaces = true;
     }
     if (config.rules.whitespace && config.rules.whitespace[0]) {
         for (let p in config.rules.whitespace) {
@@ -65,3 +70,37 @@ export default function makeFormatCodeOptions(fileName: string, opts: Options, f
 
     return formatOptions;
 }
+
+export function postProcess(fileName: string, formattedCode: string, opts: Options, formatOptions: ts.FormatCodeOptions): string {
+    "use strict";
+
+    let baseDir = opts.baseDir ? path.resolve(opts.baseDir) : path.dirname(path.resolve(fileName));
+    let configFileName = getConfigFileName(baseDir, "tslint.json");
+    if (!configFileName) {
+        return formattedCode;
+    }
+
+    let config: TslintSettings = JSON.parse(<any>fs.readFileSync(configFileName, "utf-8"));
+    if (!config.rules) {
+        return formattedCode;
+    }
+
+    let additionalOptions = createDefaultAdditionalFormatCodeOptions();
+    if (config.rules["no-consecutive-blank-lines"] === true) {
+        additionalOptions.noConsecutiveBlankLines = true;
+    }
+
+    if (additionalOptions.noConsecutiveBlankLines) {
+        formattedCode = formattedCode.replace(/\n+^$/mg, "\n");
+    }
+
+    return formattedCode;
+}
+
+function createDefaultAdditionalFormatCodeOptions(): AdditionalFormatOptions {
+    "use strict";
+
+    return {
+        noConsecutiveBlankLines: false
+    };
+}
diff --git a/test/expected/tslint/no-consecutive-blank-lines/main.json b/test/expected/tslint/no-consecutive-blank-lines/main.json
@@ -0,0 +1,15 @@
+{
+  "IndentSize": 4,
+  "TabSize": 4,
+  "NewLineCharacter": "\r\n",
+  "ConvertTabsToSpaces": true,
+  "InsertSpaceAfterCommaDelimiter": true,
+  "InsertSpaceAfterSemicolonInForStatements": true,
+  "InsertSpaceBeforeAndAfterBinaryOperators": true,
+  "InsertSpaceAfterKeywordsInControlFlowStatements": true,
+  "InsertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
+  "InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
+  "InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
+  "PlaceOpenBraceOnNewLineForFunctions": false,
+  "PlaceOpenBraceOnNewLineForControlBlocks": false
+}
diff --git a/test/expected/tslint/no-consecutive-blank-lines/main.ts b/test/expected/tslint/no-consecutive-blank-lines/main.ts
@@ -0,0 +1,6 @@
+class Sample {
+
+    test() {
+        return "";
+    }
+}
diff --git a/test/expected/tslint/no-trailing-whitespace/main.json b/test/expected/tslint/no-trailing-whitespace/main.json
@@ -0,0 +1,15 @@
+{
+  "IndentSize": 4,
+  "TabSize": 4,
+  "NewLineCharacter": "\r\n",
+  "ConvertTabsToSpaces": true,
+  "InsertSpaceAfterCommaDelimiter": true,
+  "InsertSpaceAfterSemicolonInForStatements": true,
+  "InsertSpaceBeforeAndAfterBinaryOperators": true,
+  "InsertSpaceAfterKeywordsInControlFlowStatements": true,
+  "InsertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
+  "InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
+  "InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
+  "PlaceOpenBraceOnNewLineForFunctions": false,
+  "PlaceOpenBraceOnNewLineForControlBlocks": false
+}
diff --git a/test/expected/tslint/no-trailing-whitespace/main.ts b/test/expected/tslint/no-trailing-whitespace/main.ts
@@ -0,0 +1,5 @@
+class Sample {
+    test() {
+        return "";
+    }
+}
diff --git a/test/fixture/tslint/no-consecutive-blank-lines/main.ts b/test/fixture/tslint/no-consecutive-blank-lines/main.ts
@@ -0,0 +1,15 @@
+class Sample {
+
+
+
+
+	test() {
+		return "";      			
+	}
+}
+
+
+
+
+
+
diff --git a/test/fixture/tslint/no-consecutive-blank-lines/tslint.json b/test/fixture/tslint/no-consecutive-blank-lines/tslint.json
@@ -0,0 +1,5 @@
+{
+    "rules": {
+        "no-consecutive-blank-lines": true
+    }
+}
diff --git a/test/fixture/tslint/no-trailing-whitespace/main.ts b/test/fixture/tslint/no-trailing-whitespace/main.ts
@@ -0,0 +1,5 @@
+class Sample {
+	test() {
+		return "";      			
+	}
+}
diff --git a/test/fixture/tslint/no-trailing-whitespace/tslint.json b/test/fixture/tslint/no-trailing-whitespace/tslint.json
@@ -0,0 +1,5 @@
+{
+    "rules": {
+        "no-trailing-whitespace": true
+    }
+}
diff --git a/test/indexSpec.ts b/test/indexSpec.ts
@@ -173,7 +173,7 @@ describe("tsfmt test", () => {
                 })
                 .then(resultMap => {
                     assert(resultMap[fileName].error);
-                    assert(resultMap[fileName].message === "./test/fixture/tsfmt/a/main.ts is not formatted");
+                    assert(resultMap[fileName].message === "./test/fixture/tsfmt/a/main.ts is not formatted\n");
                 });
         });
     });