feat(tsfmt): support typescript@1.8.2. add insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces options to tsfmt.json

Author: vvakame

_tslint.json

@@ -36,7 +36,10 @@
     "no-empty": true,
     "no-eval": true,
     "no-string-literal": false,
-    "no-trailing-comma": true,
+    "trailing-comma": [true, {
+      "singleline": "never",
+      "multiline": "always"
+    }],
     "no-trailing-whitespace": true,
     "no-unreachable": true,
     "no-unused-expression": false,

dtsm.json

@@ -14,16 +14,16 @@
   },
   "dependencies": {
     "node/node.d.ts": {
-      "ref": "c393f8974d44840a6c9cc6d5b5c0188a8f05143d"
+      "ref": "dade4414712ce84e3c63393f1aae407e9e7e6af7"
     },
     "mocha/mocha.d.ts": {
-      "ref": "c393f8974d44840a6c9cc6d5b5c0188a8f05143d"
+      "ref": "dade4414712ce84e3c63393f1aae407e9e7e6af7"
     },
     "power-assert/power-assert.d.ts": {
-      "ref": "c393f8974d44840a6c9cc6d5b5c0188a8f05143d"
+      "ref": "dade4414712ce84e3c63393f1aae407e9e7e6af7"
     },
     "glob-expand/glob-expand.d.ts": {
-      "ref": "c393f8974d44840a6c9cc6d5b5c0188a8f05143d"
+      "ref": "dade4414712ce84e3c63393f1aae407e9e7e6af7"
     }
   }
 }

lib/cli.ts

@@ -105,7 +105,7 @@ let root = commandpost
                     tslint: tslint,
                     editorconfig: editorconfig,
                     tsfmt: tsfmt,
-                    verbose: verbose
+                    verbose: verbose,
                 })
                 .then(result => {
                     let resultMap: lib.ResultMap = {};
@@ -124,7 +124,7 @@ let root = commandpost
                     tslint: tslint,
                     editorconfig: editorconfig,
                     tsfmt: tsfmt,
-                    verbose: verbose
+                    verbose: verbose,
                 })
                 .then(showResultHandler)
                 .catch(errorHandler);

lib/index.ts

@@ -52,7 +52,7 @@ export function processFiles(files: string[], opts: Options): Promise<ResultMap>
                 message: `${fileName} does not exist. process abort.\n`,
                 error: true,
                 src: "",
-                dest: ""
+                dest: "",
             };
             return Promise.resolve(result);
         }
@@ -144,7 +144,7 @@ export function processString(fileName: string, content: string, opts: Options):
                 message: message,
                 error: error,
                 src: content,
-                dest: formattedCode
+                dest: formattedCode,
             };
             return Promise.resolve(result);
         });

lib/provider/base.ts

@@ -23,6 +23,8 @@ interface TsfmtSettings {
     // かっこ内が空でない場合に始め括弧の後ろと終わりカッコの前にスペースを挿入する
     insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
     insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets?: boolean;
+    // template string literalsの括弧内にスペースを挿入する
+    insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
     // 新しい行に関数の始め中括弧を配置する
     placeOpenBraceOnNewLineForFunctions?: boolean;
     // 新しい行にコントロールブロックの始め中括弧を配置する
@@ -71,6 +73,9 @@ export default function makeFormatCodeOptions(fileName: string, opts: Options, f
     if (typeof config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets === "boolean") {
         formatOptions.InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets = config.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets;
     }
+    if (typeof config.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces === "boolean") {
+        formatOptions.InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces = config.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces;
+    }
     if (typeof config.placeOpenBraceOnNewLineForFunctions === "boolean") {
         formatOptions.PlaceOpenBraceOnNewLineForFunctions = config.placeOpenBraceOnNewLineForFunctions;
     }

lib/provider/tslintjson.ts

@@ -101,6 +101,6 @@ function createDefaultAdditionalFormatCodeOptions(): AdditionalFormatOptions {
     "use strict";
 
     return {
-        noConsecutiveBlankLines: false
+        noConsecutiveBlankLines: false,
     };
 }

lib/utils.ts

@@ -21,8 +21,9 @@ export function createDefaultFormatCodeOptions(): ts.FormatCodeOptions {
         InsertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
         InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
         InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
+        InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
         PlaceOpenBraceOnNewLineForFunctions: false,
-        PlaceOpenBraceOnNewLineForControlBlocks: false
+        PlaceOpenBraceOnNewLineForControlBlocks: false,
     };
 }