summaryrefslogtreecommitdiff
path: root/tools/node_modules/eslint/lib/rules/function-call-argument-newline.js
diff options
context:
space:
mode:
Diffstat (limited to 'tools/node_modules/eslint/lib/rules/function-call-argument-newline.js')
-rw-r--r--tools/node_modules/eslint/lib/rules/function-call-argument-newline.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/node_modules/eslint/lib/rules/function-call-argument-newline.js b/tools/node_modules/eslint/lib/rules/function-call-argument-newline.js
index 8bf31f7c71..31ebc097c4 100644
--- a/tools/node_modules/eslint/lib/rules/function-call-argument-newline.js
+++ b/tools/node_modules/eslint/lib/rules/function-call-argument-newline.js
@@ -40,13 +40,13 @@ module.exports = {
const checkers = {
unexpected: {
messageId: "unexpectedLineBreak",
- check: (prevToken, currentToken) => prevToken.loc.start.line !== currentToken.loc.start.line,
+ check: (prevToken, currentToken) => prevToken.loc.end.line !== currentToken.loc.start.line,
createFix: (token, tokenBefore) => fixer =>
fixer.replaceTextRange([tokenBefore.range[1], token.range[0]], " ")
},
missing: {
messageId: "missingLineBreak",
- check: (prevToken, currentToken) => prevToken.loc.start.line === currentToken.loc.start.line,
+ check: (prevToken, currentToken) => prevToken.loc.end.line === currentToken.loc.start.line,
createFix: (token, tokenBefore) => fixer =>
fixer.replaceTextRange([tokenBefore.range[1], token.range[0]], "\n")
}
@@ -61,7 +61,7 @@ module.exports = {
*/
function checkArguments(node, checker) {
for (let i = 1; i < node.arguments.length; i++) {
- const prevArgToken = sourceCode.getFirstToken(node.arguments[i - 1]);
+ const prevArgToken = sourceCode.getLastToken(node.arguments[i - 1]);
const currentArgToken = sourceCode.getFirstToken(node.arguments[i]);
if (checker.check(prevArgToken, currentArgToken)) {
@@ -101,10 +101,10 @@ module.exports = {
} else if (option === "always") {
checkArguments(node, checkers.missing);
} else if (option === "consistent") {
- const firstArgToken = sourceCode.getFirstToken(node.arguments[0]);
+ const firstArgToken = sourceCode.getLastToken(node.arguments[0]);
const secondArgToken = sourceCode.getFirstToken(node.arguments[1]);
- if (firstArgToken.loc.start.line === secondArgToken.loc.start.line) {
+ if (firstArgToken.loc.end.line === secondArgToken.loc.start.line) {
checkArguments(node, checkers.unexpected);
} else {
checkArguments(node, checkers.missing);