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

Fix: indent for async arrow functions (fixes #13497) #13544

Merged
merged 10 commits into from Aug 14, 2020
Merged

Fix: indent for async arrow functions (fixes #13497) #13544

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4e462f5
Fix: indent for async arrow functions (fixes #13497)
anikethsaha Aug 2, 2020
4c96415
Update: addde open paren check and tests
anikethsaha Aug 3, 2020
ba1ca62
Chore: changed variable name to nextToken
anikethsaha Aug 4, 2020
88e08ba
Chore: added tests with comments
anikethsaha Aug 5, 2020
de61f62
Chore: added one more test case
anikethsaha Aug 5, 2020
e4885f9
Chore: simplified logic
anikethsaha Aug 6, 2020
de59fe2
Chore: tests indentation
anikethsaha Aug 8, 2020
9f04863
Chore: fixed indentation of the test cases
anikethsaha Aug 9, 2020
7fd1423
Chore: formatting for the test cases
anikethsaha Aug 9, 2020
f5d0afe
Chore: using descriptive skip options instead of number
anikethsaha Aug 13, 2020
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
7 changes: 4 additions & 3 deletions lib/rules/indent.js
View file
Open in desktop
Expand Up @@ -1084,16 +1084,17 @@ module.exports = {
},

ArrowFunctionExpression(node) {
const firstToken = sourceCode.getFirstToken(node);
const maybeOpeningParen = sourceCode.getFirstToken(node, node.async ? 1 : 0);
anikethsaha marked this conversation as resolved.
Show resolved Hide resolved

if (astUtils.isOpeningParenToken(firstToken)) {
const openingParen = firstToken;
if (astUtils.isOpeningParenToken(maybeOpeningParen)) {
const openingParen = maybeOpeningParen;
const closingParen = sourceCode.getTokenBefore(node.body, astUtils.isClosingParenToken);

parameterParens.add(openingParen);
parameterParens.add(closingParen);
addElementListIndent(node.params, openingParen, closingParen, options.FunctionExpression.parameters);
}

addBlocklessNodeIndent(node.body);
},

Expand Down
134 changes: 134 additions & 0 deletions tests/lib/rules/indent.js
View file
Open in desktop
Expand Up @@ -5724,6 +5724,105 @@ ruleTester.run("indent", rule, {
`,
options: [4, { MemberExpression: 2 }],
parserOptions: { ecmaVersion: 2015 }
},
{
code: unIndent`
const foo = async (arg1,
arg2) =>
{
return arg1 + arg2;
}
`,
options: [2, { FunctionDeclaration: { parameters: "first" }, FunctionExpression: { parameters: "first" } }]
},
{
code: unIndent`
const foo = async /* some comments */(arg1,
arg2) =>
{
return arg1 + arg2;
}
`,
options: [2, { FunctionDeclaration: { parameters: "first" }, FunctionExpression: { parameters: "first" } }]
},
{
code: unIndent`
const a = async
b => {}
`,
options: [2]
},
{
code: unIndent`
const foo = (arg1,
arg2) => async (arr1,
arr2) =>
{
return arg1 + arg2;
}
`,
options: [2, { FunctionDeclaration: { parameters: "first" }, FunctionExpression: { parameters: "first" } }]
},
{
code: unIndent`
const foo = async (arg1,
arg2) =>
{
return arg1 + arg2;
}
`,
options: [2]
},
{
code: unIndent`
const foo = async /*comments*/(arg1,
arg2) =>
{
return arg1 + arg2;
}
`,
options: [2]
},
{
code: unIndent`
const foo = async (arg1,
arg2) =>
{
return arg1 + arg2;
}
`,
options: [2, { FunctionDeclaration: { parameters: 4 }, FunctionExpression: { parameters: 4 } }]
},
{
code: unIndent`
const foo = (arg1,
arg2) =>
{
return arg1 + arg2;
}
`,
options: [2, { FunctionDeclaration: { parameters: 4 }, FunctionExpression: { parameters: 4 } }]
},
{
code: unIndent`
async function fn(ar1,
ar2){}
`,
options: [2, { FunctionDeclaration: { parameters: "first" }, FunctionExpression: { parameters: "first" } }]
},
{
code: unIndent`
async function /* some comments */ fn(ar1,
ar2){}
`,
options: [2, { FunctionDeclaration: { parameters: "first" }, FunctionExpression: { parameters: "first" } }]
},
{
code: unIndent`
async /* some comments */ function fn(ar1,
ar2){}
`,
options: [2, { FunctionDeclaration: { parameters: "first" }, FunctionExpression: { parameters: "first" } }]
}
],

Expand Down Expand Up @@ -11473,6 +11572,41 @@ ruleTester.run("indent", rule, {
[6, 4, 0, "Punctuator"],
[7, 4, 0, "Punctuator"]
])
},
{
code: unIndent`
const foo = async (arg1,
arg2) =>
{
return arg1 + arg2;
}
`,
output: unIndent`
const foo = async (arg1,
arg2) =>
{
return arg1 + arg2;
}
`,
options: [2, { FunctionDeclaration: { parameters: "first" }, FunctionExpression: { parameters: "first" } }],
parserOptions: { ecmaVersion: 2020 },
errors: expectedErrors([
[2, 19, 20, "Identifier"]
])
},
{
code: unIndent`
const a = async
b => {}
`,
output: unIndent`
const a = async
b => {}
`,
options: [2],
errors: expectedErrors([
[2, 0, 1, "Identifier"]
])
}
]
});