Fix: brace-style crash with lone block statements (fixes #7908) (#7909)

eslint · Jan 13, 2017 · b3f2094 · b3f2094
1 parent 5eb2e88
commit b3f2094
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/lib/rules/brace-style.js b/lib/rules/brace-style.js
@@ -138,7 +138,13 @@ module.exports = {
 
         return {
             BlockStatement(node) {
-                validateCurlyPair(sourceCode.getFirstToken(node), sourceCode.getLastToken(node));
+                if (
+                    node.parent.type !== "BlockStatement" &&
+                    node.parent.type !== "SwitchCase" &&
+                    node.parent.type !== "Program"
+                ) {
+                    validateCurlyPair(sourceCode.getFirstToken(node), sourceCode.getLastToken(node));
+                }
             },
             ClassBody(node) {
                 validateCurlyPair(sourceCode.getFirstToken(node), sourceCode.getLastToken(node));

diff --git a/tests/lib/rules/brace-style.js b/tests/lib/rules/brace-style.js
@@ -139,7 +139,38 @@ ruleTester.run("brace-style", rule, {
         {
             code: "(class {})",
             options: ["allman", { allowSingleLine: true }]
-        }
+        },
+
+        // https://github.com/eslint/eslint/issues/7908
+        "{}",
+        `
+            if (foo) {
+
+            }
+
+            {
+
+            }
+        `,
+        `
+            switch (foo) {
+                case bar:
+                    baz();
+                    {
+                        qux();
+                    }
+            }
+        `,
+        `
+            {
+            }
+        `,
+        `
+            {
+                {
+                }
+            }
+        `
     ],
 
     invalid: [