Update: fix brace-style false negative on multiline node (fixes #7493…

…) (#7496)
eslint · Nov 3, 2016 · af1fde1 · af1fde1
1 parent 3798aea
commit af1fde1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/lib/rules/brace-style.js b/lib/rules/brace-style.js
@@ -143,7 +143,7 @@ module.exports = {
                         });
                     }
 
-                    if (curlyTokenEnd.loc.start.line === block.body[block.body.length - 1].loc.start.line) {
+                    if (curlyTokenEnd.loc.start.line === block.body[block.body.length - 1].loc.end.line) {
                         context.report({
                             node: block.body[block.body.length - 1],
                             message: CLOSE_MESSAGE_SINGLE,

diff --git a/tests/lib/rules/brace-style.js b/tests/lib/rules/brace-style.js
@@ -458,6 +458,35 @@ ruleTester.run("brace-style", rule, {
             code: "if (foo) // comment \n{\nbar();\n}",
             output: "if (foo) // comment \n{\nbar();\n}",
             errors: [{ message: OPEN_MESSAGE, type: "IfStatement" }]
-        }
+        },
+
+        // https://github.com/eslint/eslint/issues/7493
+        {
+            code: "if (foo) {\n bar\n.baz }",
+            output: "if (foo) {\n bar\n.baz \n}",
+            errors: [{ message: CLOSE_MESSAGE_SINGLE, type: "ExpressionStatement" }]
+        },
+        {
+            code: "if (foo)\n{\n bar\n.baz }",
+            output: "if (foo)\n{\n bar\n.baz \n}",
+            options: ["allman"],
+            errors: [{ message: CLOSE_MESSAGE_SINGLE, type: "ExpressionStatement" }]
+        },
+        {
+            code: "if (foo) { bar\n.baz }",
+            output: "if (foo) {\n bar\n.baz \n}",
+            options: ["1tbs", { allowSingleLine: true }],
+            errors: [{ message: BODY_MESSAGE, type: "ExpressionStatement" }, { message: CLOSE_MESSAGE_SINGLE, type: "ExpressionStatement" }]
+        },
+        {
+            code: "if (foo) { bar\n.baz }",
+            output: "if (foo) \n{\n bar\n.baz \n}",
+            options: ["allman", { allowSingleLine: true }],
+            errors: [
+                { message: OPEN_MESSAGE_ALLMAN, type: "IfStatement" },
+                { message: BODY_MESSAGE, type: "ExpressionStatement" },
+                { message: CLOSE_MESSAGE_SINGLE, type: "ExpressionStatement" }
+            ]
+        },
     ]
 });