Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,18 +128,25 @@ module.exports = {
call: {
type: "boolean",
},
func: {
type: "boolean",
},
object: {
type: "boolean",
},
simple: {
type: "boolean",
},
addParensOnSameLine: {
type: "boolean",
},
},
},
],
messages: {
needParens: "Ternary clause expression requires enclosing ( .. )",
},
fixable: "code",
},
create(context) {
var defaultsOnly = context.options.length == 0;
Expand All @@ -148,6 +155,7 @@ module.exports = {
var comparisonMode = defaultsOnly || !("comparison" in extraOptions) || extraOptions.comparison === true;
var logicalMode = defaultsOnly || !("logical" in extraOptions) || extraOptions.logical === true;
var callMode = defaultsOnly || !("call" in extraOptions) || extraOptions.call === true;
var funcMode = defaultsOnly || !("func" in extraOptions) || extraOptions.func === false;
var objectMode = defaultsOnly || !("object" in extraOptions) || extraOptions.object === true;
var simpleMode = (!defaultsOnly && extraOptions && extraOptions.simple === true);

Expand All @@ -162,6 +170,7 @@ module.exports = {
(clause.type == "LogicalExpression") ? "logical" :
(clause.type == "UnaryExpression" && clause.operator == "!") ? "logical" :
(["CallExpression","NewExpression",].includes(clause.type)) ? "call" :
(["FunctionExpression","ArrowFunctionExpression",].includes(clause.type)) ? "func" :
(["ArrayExpression","ObjectExpression",].includes(clause.type)) ? "object" :
(["Identifier","MemberExpression","Literal","TemplateLiteral",].includes(clause.type)) ? "simple" :
"complex";
Expand All @@ -172,6 +181,7 @@ module.exports = {
(comparisonMode && exprType == "comparison") ||
(logicalMode && exprType == "logical") ||
(callMode && exprType == "call") ||
(funcMode && exprType == "func") ||
(objectMode && exprType == "object") ||
(simpleMode && exprType == "simple") ||
exprType == "complex"
Expand All @@ -181,6 +191,54 @@ module.exports = {
context.report({
node: clause,
messageId: "needParens",
fix: fixer => {
const fixes = [];

const isSingleLine = (
clause.loc.start.line === clause.loc.end.line
);

const tokenBefore = sourceCode.getTokenBefore(clause);
const tokenAfter = sourceCode.getTokenAfter(clause);

if (isSingleLine || extraOptions.addParensOnSameLine) {
fixes.push(fixer.insertTextBefore(clause, '('))
fixes.push(fixer.insertTextAfter(clause, ')'))
}
else {
if (clause.loc.start.line === tokenBefore.loc.start.line) {
fixes.push(
fixer.replaceTextRange(
[
tokenBefore.range[1],
clause.range[0],
],
' (\n',
)
);
}
else {
fixes.push(fixer.insertTextAfter(tokenBefore, ' (\n'));
}

if (clause.loc.end.line === tokenAfter.loc.end.line) {
fixes.push(
fixer.replaceTextRange(
[
clause.range[1],
tokenAfter.range[0],
],
'\n)\n',
)
);
}
else {
fixes.push(fixer.insertTextBefore(tokenAfter, ')\n'));
}
}

return fixes;
},
});
}
}
Expand Down