Merge pull request #4003 from aparajita/fix-allman-switch

Fix: brace-style rule incorrectly flagging switch (fixes #4002)
eslint · Oct 2, 2015 · 42f6329 · 42f6329
2 parents 3029787 + 70db573
commit 42f6329
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/rules/brace-style.js b/lib/rules/brace-style.js
@@ -182,11 +182,9 @@ module.exports = function(context) {
             tokens = context.getLastTokens(node, 3);
         }
 
-        if (style === "1tbs") {
-            if (tokens[0].loc.start.line !== tokens[1].loc.start.line) {
-                context.report(node, OPEN_MESSAGE);
-            }
-        } else if (tokens[0].loc.start.line === tokens[1].loc.start.line) {
+        if (style !== "allman" && tokens[0].loc.start.line !== tokens[1].loc.start.line) {
+            context.report(node, OPEN_MESSAGE);
+        } else if (style === "allman" && tokens[0].loc.start.line === tokens[1].loc.start.line) {
             context.report(node, OPEN_MESSAGE_ALLMAN);
         }
     }

diff --git a/tests/lib/rules/brace-style.js b/tests/lib/rules/brace-style.js
@@ -112,7 +112,7 @@ ruleTester.run("brace-style", rule, {
             { message: OPEN_MESSAGE_ALLMAN, type: "TryStatement", line: 1},
             { message: OPEN_MESSAGE_ALLMAN, type: "CatchClause", line: 4}
         ] },
-        { code: "switch(x) { \n case 1: \nbar(); \n }\n ", options: ["allman"], errors: [
+        { code: "switch(x) { case 1: \nbar(); }\n ", options: ["allman"], errors: [
             { message: OPEN_MESSAGE_ALLMAN, type: "SwitchStatement", line: 1}
         ] },
         { code: "if (a) { \nb();\n } else { \nc();\n }", options: ["allman"], errors: [