Added util and refactored both fixer for newline-before-return and cu…

…rly rule
palantir · Jan 29, 2019 · 37646c5 · 37646c5
1 parent 9db2506
commit 37646c5
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 32 deletions.
diff --git a/src/rules/curlyRule.ts b/src/rules/curlyRule.ts
@@ -19,6 +19,7 @@ import { isBlock, isIfStatement, isIterationStatement, isSameLine } from "tsutil
 import * as ts from "typescript";
 
 import * as Lint from "../index";
+import { newLineWithIndentation } from "../utils";
 
 import { codeExamples } from "./code-examples/curly.examples";
 
@@ -172,29 +173,10 @@ class CurlyWalker extends Lint.AbstractWalker<Options> {
                 Lint.Replacement.appendText(statement.end, " }"),
             ];
         } else {
-            const match = /\n([\t ])/.exec(node.getFullText(this.sourceFile)); // determine which character to use (tab or space)
-            const indentation =
-                match === null
-                    ? ""
-                    : // indentation should match start of statement
-                      match[1].repeat(
-                          ts.getLineAndCharacterOfPosition(
-                              this.sourceFile,
-                              node.getStart(this.sourceFile),
-                          ).character,
-                      );
-
-            const maybeCarriageReturn =
-                this.sourceFile.text[this.sourceFile.getLineEndOfPosition(node.pos) - 1] === "\r"
-                    ? "\r"
-                    : "";
-
+            const newLine = newLineWithIndentation(node, this.sourceFile);
             return [
                 Lint.Replacement.appendText(statement.pos, " {"),
-                Lint.Replacement.appendText(
-                    statement.end,
-                    `${maybeCarriageReturn}\n${indentation}}`,
-                ),
+                Lint.Replacement.appendText(statement.end, `${newLine}}`),
             ];
         }
     }

diff --git a/src/rules/newlineBeforeReturnRule.ts b/src/rules/newlineBeforeReturnRule.ts
@@ -19,6 +19,7 @@ import { getPreviousStatement } from "tsutils";
 import * as ts from "typescript";
 
 import * as Lint from "../index";
+import { newLineWithIndentation } from "../utils";
 
 export class Rule extends Lint.Rules.AbstractRule {
     /* tslint:disable:object-literal-sort-keys */
@@ -55,12 +56,6 @@ class NewlineBeforeReturnWalker extends Lint.AbstractWalker<void> {
         return ts.forEachChild(sourceFile, cb);
     }
 
-    private getIndentation(node: ts.Node): string {
-        const text = this.sourceFile.text.substr(node.pos, node.getStart() - node.pos);
-        const matches = text.match(/([ \t]*)$/);
-        return matches !== null ? matches[1] : "";
-    }
-
     private visitReturnStatement(node: ts.ReturnStatement) {
         const prev = getPreviousStatement(node);
         if (prev === undefined) {
@@ -86,13 +81,12 @@ class NewlineBeforeReturnWalker extends Lint.AbstractWalker<void> {
         }
         const prevLine = ts.getLineAndCharacterOfPosition(this.sourceFile, prev.end).line;
         if (prevLine >= line - 1) {
-            const indentationCurrent = this.getIndentation(node);
-            const indentationPrev = this.getIndentation(prev);
-
             const fixer = Lint.Replacement.replaceFromTo(
-                start - indentationCurrent.length,
+                line === prevLine ? node.pos : node.pos + 1,
                 start,
-                line === prevLine ? `\n\n${indentationPrev}` : `\n${indentationCurrent}`,
+                line === prevLine
+                    ? newLineWithIndentation(prev, this.sourceFile, 2)
+                    : newLineWithIndentation(prev, this.sourceFile),
             );
 
             // Previous statement is on the same or previous line

diff --git a/src/utils.ts b/src/utils.ts
@@ -294,6 +294,31 @@ function tryResolveSync(packageName: string, relativeTo?: string): string | unde
     }
 }
 
+/**
+ * Gets the full indentation of the provided node
+ */
+export function getIndentation(node: ts.Node, sourceFile: ts.SourceFile): string {
+    const text = sourceFile.text.substr(node.pos, node.getStart() - node.pos);
+    const matches = text.match(/([ \t]*)$/);
+    return matches !== null ? matches[1] : "";
+}
+
+/**
+ * Creates x new lines with a proper indentation at the last one based on the provided node
+ */
+export function newLineWithIndentation(
+    node: ts.Node,
+    sourceFile: ts.SourceFile,
+    linesCount: number = 1,
+) {
+    const maybeCarriageReturn =
+        sourceFile.text[sourceFile.getLineEndOfPosition(node.pos) - 1] === "\r" ? "\r" : "";
+
+    const indentation = getIndentation(node, sourceFile);
+
+    return `${`${maybeCarriageReturn}\n`.repeat(linesCount)}${indentation}`;
+}
+
 /**
  * @deprecated Copied from tsutils 2.27.2. This will be removed once TSLint requires tsutils > 3.0.
  */

diff --git a/test/rules/newline-before-return/default/test.ts.fix b/test/rules/newline-before-return/default/test.ts.fix
@@ -39,6 +39,18 @@ function foo(fn) {
     return;
 }
 
+function foo(fn) {
+    fn();
+
+    return;
+}
+
+function foo(fn) {
+    fn();
+
+    return;
+}
+
 function foo() {
     return;
 }

diff --git a/test/rules/newline-before-return/default/test.ts.lint b/test/rules/newline-before-return/default/test.ts.lint
@@ -38,6 +38,16 @@ function foo(fn) {
           ~nil [0]
 }
 
+function foo(fn) {
+    fn();   return;
+            ~nil [0]
+}
+
+function foo(fn) {
+    fn();          return;
+                   ~nil [0]
+}
+
 function foo() {
     return;
 }