Fix: Curly rule doesn't account for leading comment (fixes eslint#7538)

wwwillchen · Nov 5, 2016 · 1bf8a2c · 1bf8a2c
1 parent f5764ee
commit 1bf8a2c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/docs/rules/curly.md b/docs/rules/curly.md
@@ -183,6 +183,11 @@ while (true) {
 for (var i = 0; foo; i++) {
     doSomething();
 }
+
+if (foo) {
+    // some comment
+    bar();
+}
 ```
 
 Examples of **correct** code for the `"multi-or-nest"` option:

diff --git a/lib/rules/curly.js b/lib/rules/curly.js
@@ -290,7 +290,7 @@ module.exports = {
                 }
             } else if (multiOrNest) {
                 if (hasBlock && body.body.length === 1 && isOneLiner(body.body[0])) {
-                    expected = false;
+                    expected = !!(body.body[0].leadingComments && body.body[0].leadingComments.length);
                 } else if (!isOneLiner(body)) {
                     expected = true;
                 }

diff --git a/tests/lib/rules/curly.js b/tests/lib/rules/curly.js
@@ -126,6 +126,14 @@ ruleTester.run("curly", rule, {
             code: "if (foo) \n quz = true;",
             options: ["multi-or-nest"]
         },
+        {
+            code: "if (foo) { \n // line of comment \n quz = true; \n }",
+            options: ["multi-or-nest"]
+        },
+        {
+            code: "// line of comment \n if (foo) \n quz = true; \n",
+            options: ["multi-or-nest"]
+        },
         {
             code: "while (true) \n doSomething();",
             options: ["multi-or-nest"]