Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update: curly multi-or-nest flagging semis on next line (fixes #12370) #12378

Merged
merged 2 commits into from Nov 1, 2019
Merged

Update: curly multi-or-nest flagging semis on next line (fixes #12370) #12378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7f4603
Update: Curly multi-or-nest flagging semis on next line (fixes #12370)
cherryblossom000 Oct 4, 2019
62e19fe
Chore: Add more tests to the multi-or-nest option for curly
cherryblossom000 Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/rules/curly.js
View file
Open in desktop
Expand Up @@ -97,10 +97,15 @@ module.exports = {
* @private
*/
function isOneLiner(node) {
const first = sourceCode.getFirstToken(node),
last = sourceCode.getLastToken(node);
if (node.type === "EmptyStatement") {
return true;
}

const first = sourceCode.getFirstToken(node);
const last = sourceCode.getLastToken(node);
const lastExcludingSemicolon = astUtils.isSemicolonToken(last) ? sourceCode.getTokenBefore(last) : last;

return first.loc.start.line === last.loc.end.line;
return first.loc.start.line === lastExcludingSemicolon.loc.end.line;
mdjermanovic marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down
127 changes: 127 additions & 0 deletions tests/lib/rules/curly.js
View file
Open in desktop
Expand Up @@ -185,6 +185,82 @@ ruleTester.run("curly", rule, {
parserOptions: { ecmaVersion: 6 }
},

// https://github.com/eslint/eslint/issues/12370
{
code: "if (foo) doSomething() \n ;",
options: ["multi-or-nest"]
},
{
code: "if (foo) doSomething(); \n else if (bar) doSomethingElse() \n ;",
options: ["multi-or-nest"]
},
{
code: "if (foo) doSomething(); \n else doSomethingElse() \n ;",
options: ["multi-or-nest"]
},
{
code: "if (foo) doSomething(); \n else if (bar) doSomethingElse(); \n else doAnotherThing() \n ;",
options: ["multi-or-nest"]
},
{
code: "for (var i = 0; foo; i++) doSomething() \n ;",
options: ["multi-or-nest"]
},
{
code: "for (var foo in bar) console.log(foo) \n ;",
options: ["multi-or-nest"]
},
{
code: "for (var foo of bar) console.log(foo) \n ;",
options: ["multi-or-nest"],
parserOptions: { ecmaVersion: 6 }
},
{
code: "while (foo) doSomething() \n ;",
options: ["multi-or-nest"]
},
{
code: "do doSomething() \n ;while (foo)",
options: ["multi-or-nest"]
},
{
code: "if (foo)\n;",
options: ["multi-or-nest"]
},
{
code: "if (foo) doSomething(); \n else if (bar)\n;",
options: ["multi-or-nest"]
},
{
code: "if (foo) doSomething(); \n else\n;",
options: ["multi-or-nest"]
},
{
code: "if (foo) doSomething(); \n else if (bar) doSomethingElse(); \n else\n;",
options: ["multi-or-nest"]
},
{
code: "for (var i = 0; foo; i++)\n;",
options: ["multi-or-nest"]
},
{
code: "for (var foo in bar)\n;",
options: ["multi-or-nest"]
},
{
code: "for (var foo of bar)\n;",
options: ["multi-or-nest"],
parserOptions: { ecmaVersion: 6 }
},
{
code: "while (foo)\n;",
options: ["multi-or-nest"]
},
{
code: "do\n;while (foo)",
options: ["multi-or-nest"]
},

// https://github.com/eslint/eslint/issues/3856
{
code: "if (true) { if (false) console.log(1) } else console.log(2)",
Expand Down Expand Up @@ -897,6 +973,57 @@ ruleTester.run("curly", rule, {
output: "if (true)\n{foo()\n;}[1, 2, 3].bar()",
options: ["multi-line"],
errors: [{ messageId: "missingCurlyAfterCondition", data: { name: "if" }, type: "IfStatement" }]
},

// https://github.com/eslint/eslint/issues/12370
{
code: "if (foo) {\ndoSomething()\n;\n}",
output: "if (foo) \ndoSomething()\n;\n",
options: ["multi-or-nest"],
errors: [{ messageId: "unexpectedCurlyAfterCondition", data: { name: "if" }, type: "IfStatement" }]
},
{
code: "if (foo) doSomething();\nelse if (bar) {\ndoSomethingElse()\n;\n}",
output: "if (foo) doSomething();\nelse if (bar) \ndoSomethingElse()\n;\n",
options: ["multi-or-nest"],
errors: [{ messageId: "unexpectedCurlyAfterCondition", data: { name: "if" }, type: "IfStatement" }]
},
{
code: "if (foo) doSomething();\nelse {\ndoSomethingElse()\n;\n}",
output: "if (foo) doSomething();\nelse \ndoSomethingElse()\n;\n",
options: ["multi-or-nest"],
errors: [{ messageId: "unexpectedCurlyAfter", data: { name: "else" }, type: "IfStatement" }]
},
{
code: "for (var i = 0; foo; i++) {\ndoSomething()\n;\n}",
output: "for (var i = 0; foo; i++) \ndoSomething()\n;\n",
options: ["multi-or-nest"],
errors: [{ messageId: "unexpectedCurlyAfterCondition", data: { name: "for" }, type: "ForStatement" }]
},
{
code: "for (var foo in bar) {\ndoSomething()\n;\n}",
output: "for (var foo in bar) \ndoSomething()\n;\n",
options: ["multi-or-nest"],
errors: [{ messageId: "unexpectedCurlyAfter", data: { name: "for-in" }, type: "ForInStatement" }]
},
{
code: "for (var foo of bar) {\ndoSomething()\n;\n}",
output: "for (var foo of bar) \ndoSomething()\n;\n",
options: ["multi-or-nest"],
parserOptions: { ecmaVersion: 6 },
errors: [{ messageId: "unexpectedCurlyAfter", data: { name: "for-of" }, type: "ForOfStatement" }]
},
{
code: "while (foo) {\ndoSomething()\n;\n}",
output: "while (foo) \ndoSomething()\n;\n",
options: ["multi-or-nest"],
errors: [{ messageId: "unexpectedCurlyAfterCondition", data: { name: "while" }, type: "WhileStatement" }]
},
{
code: "do {\ndoSomething()\n;\n} while (foo)",
output: "do \ndoSomething()\n;\n while (foo)",
options: ["multi-or-nest"],
errors: [{ messageId: "unexpectedCurlyAfter", data: { name: "do" }, type: "DoWhileStatement" }]
}
]
});