curly: don't put opening curly inside comment (palantir#3473)

jomaguma · Nov 11, 2017 · 5a9cacc · 5a9cacc
1 parent 6d3f78e
commit 5a9cacc
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 19 deletions.
diff --git a/src/rules/curlyRule.ts b/src/rules/curlyRule.ts
@@ -151,8 +151,8 @@ class CurlyWalker extends Lint.AbstractWalker<Options> {
     private createMissingBraceFix(statement: ts.Statement, node: ts.IterationStatement | ts.IfStatement, sameLine: boolean) {
         if (sameLine) {
             return [
-                Lint.Replacement.appendText(statement.getStart(), "{ "),
-                Lint.Replacement.appendText(statement.getEnd(), " }"),
+                Lint.Replacement.appendText(statement.pos, " {"),
+                Lint.Replacement.appendText(statement.end, " }"),
             ];
         } else {
             const match = /\n([\t ])/.exec(node.getFullText(this.sourceFile)); // determine which character to use (tab or space)
@@ -164,9 +164,8 @@ class CurlyWalker extends Lint.AbstractWalker<Options> {
             const maybeCarriageReturn = this.sourceFile.text[this.sourceFile.getLineEndOfPosition(node.pos) - 1] === "\r" ? "\r" : "";
 
             return [
-                Lint.Replacement.appendText(
-                    this.sourceFile.getLineEndOfPosition(statement.pos), " {"),
-                Lint.Replacement.appendText(statement.getEnd(), `${maybeCarriageReturn}\n${indentation}}`),
+                Lint.Replacement.appendText(statement.pos, " {"),
+                Lint.Replacement.appendText(statement.end, `${maybeCarriageReturn}\n${indentation}}`),
             ];
         }
     }

diff --git a/test/rules/curly/defaults/test.ts.fix b/test/rules/curly/defaults/test.ts.fix
@@ -9,7 +9,7 @@ if (y == 4)
     console.log("y");
 }
 
-    if (z == 5) // failure {
+    if (z == 5) { // failure
         console.log("z");
     }
 
@@ -24,19 +24,19 @@ for (j = 0; j < 1; ++j)
     console.log("j");
 }
 
-  for (k = 0; k < 1; ++k) // failure {
+  for (k = 0; k < 1; ++k) { // failure
       console.log("k");
   }
 
     for (k1 in l1) { console.log("l1"); } // failure
 
-for (k in l) // failure {
+for (k in l) { // failure
     console.log("l");
 }
 
     for (k3 of l3) { console.log("l3"); } // failure
 
-for (k4 of l4) // failure {
+for (k4 of l4) { // failure
     console.log("l4");
 }
 
@@ -51,7 +51,7 @@ while (n < 0)
     console.log("r");
 }
 
-while (n < 0) // failure {
+while (n < 0) { // failure
     console.log("s");
 }
 
@@ -71,7 +71,7 @@ do
 }
 while (j == 1);
 
-do // failure {
+do { // failure
     console.log("o");
 }
 while (k == 1);
@@ -88,6 +88,11 @@ for (let x of [1, 2, 3]) {
     console.log(x);
 }
 
-for (let y of [1, 2, 3]) // failure {
+for (let y of [1, 2, 3]) { // failure
     console.log(y);
 }
+
+if (true) { /* some
+             comment */
+    console.log(z);
+}
diff --git a/test/rules/curly/defaults/test.ts.lint b/test/rules/curly/defaults/test.ts.lint
@@ -107,3 +107,10 @@ for (let y of [1, 2, 3]) // failure
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     console.log(y);
 ~~~~~~~~~~~~~~~~~~~ [for statements must be braced]
+
+if (true) /* some
+~~~~~~~~~~~~~~~~~
+             comment */
+~~~~~~~~~~~~~~~~~~~~~~~
+    console.log(z);
+~~~~~~~~~~~~~~~~~~~ [if statements must be braced]
diff --git a/test/rules/curly/ignore-same-line/test.ts.fix b/test/rules/curly/ignore-same-line/test.ts.fix
@@ -9,7 +9,7 @@ if (y == 4)
     console.log("y");
 }
 
-    if (z == 5) // failure {
+    if (z == 5) { // failure
         console.log("z");
     }
 
@@ -24,19 +24,19 @@ for (j = 0; j < 1; ++j)
     console.log("j");
 }
 
-  for (k = 0; k < 1; ++k) // failure {
+  for (k = 0; k < 1; ++k) { // failure
       console.log("k");
   }
 
 for (k1 in l1) console.log("l1");
 
-for (k in l) // failure {
+for (k in l) { // failure
     console.log("l");
 }
 
 for (k3 of l3) console.log("l3");
 
-for (k4 of l4) // failure {
+for (k4 of l4) { // failure
     console.log("l4");
 }
 
@@ -51,7 +51,7 @@ while (n < 0)
     console.log("r");
 }
 
-while (n < 0) // failure {
+while (n < 0) { // failure
     console.log("s");
 }
 
@@ -71,7 +71,7 @@ do
 }
 while (j == 1);
 
-do // failure {
+do { // failure
     console.log("o");
 }
 while (k == 1);
@@ -88,6 +88,6 @@ for (let x of [1, 2, 3]) {
     console.log(x);
 }
 
-for (let y of [1, 2, 3]) // failure {
+for (let y of [1, 2, 3]) { // failure
     console.log(y);
 }