-
-
Notifications
You must be signed in to change notification settings - Fork 369
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add
no-negated-condition rule (#1963)
- Loading branch information
Showing
10 changed files
with
936 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| # Disallow negated conditions | ||
|
|
||
| ✅ This rule is enabled in the `recommended` [config](https://github.com/sindresorhus/eslint-plugin-unicorn#preset-configs). | ||
|
|
||
| 🔧 This rule is automatically fixable by the [`--fix` CLI option](https://eslint.org/docs/latest/user-guide/command-line-interface#--fix). | ||
|
|
||
| <!-- end auto-generated rule header --> | ||
| <!-- Do not manually modify this header. Run: `npm run fix:eslint-docs` --> | ||
|
|
||
| Negated conditions are more difficult to understand. Code can be made more readable by inverting the condition. | ||
|
|
||
| This is an improved version of the [`no-negated-condition`](https://eslint.org/docs/latest/rules/no-negated-condition) ESLint rule that makes it automatically fixable. [ESLint did not want to make it fixable.](https://github.com/eslint/eslint/issues/14792) | ||
|
|
||
| ## Fail | ||
|
|
||
| ```js | ||
| if (!a) { | ||
| doSomethingC(); | ||
| } else { | ||
| doSomethingB(); | ||
| } | ||
| ``` | ||
|
|
||
| ```js | ||
| if (a !== b) { | ||
| doSomethingC(); | ||
| } else { | ||
| doSomethingB(); | ||
| } | ||
| ``` | ||
|
|
||
| ```js | ||
| !a ? c : b | ||
| ``` | ||
|
|
||
| ```js | ||
| if (a != b) { | ||
| doSomethingC(); | ||
| } else { | ||
| doSomethingB(); | ||
| } | ||
| ``` | ||
|
|
||
| ## Pass | ||
|
|
||
| ```js | ||
| if (a) { | ||
| doSomethingB(); | ||
| } else { | ||
| doSomethingC(); | ||
| } | ||
| ``` | ||
|
|
||
| ```js | ||
| if (a === b) { | ||
| doSomethingB(); | ||
| } else { | ||
| doSomethingC(); | ||
| } | ||
| ``` | ||
|
|
||
| ```js | ||
| a ? b : c | ||
| ``` | ||
|
|
||
| ```js | ||
| if (a == b) { | ||
| doSomethingB(); | ||
| } else { | ||
| doSomethingC(); | ||
| } | ||
| ``` | ||
|
|
||
| ```js | ||
| if (!a) { | ||
| doSomething(); | ||
| } | ||
| ``` | ||
|
|
||
| ```js | ||
| if (!a) { | ||
| doSomething(); | ||
| } else if (b) { | ||
| doSomethingElse(); | ||
| } | ||
| ``` | ||
|
|
||
| ```js | ||
| if (a != b) { | ||
| doSomething(); | ||
| } | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| /* | ||
| Based on ESLint builtin `no-negated-condition` rule | ||
| https://github.com/eslint/eslint/blob/5c39425fc55ecc0b97bbd07ac22654c0eb4f789c/lib/rules/no-negated-condition.js | ||
| */ | ||
| 'use strict'; | ||
| const {matches} = require('./selectors/index.js'); | ||
| const { | ||
| removeParentheses, | ||
| fixSpaceAroundKeyword, | ||
| addParenthesizesToReturnOrThrowExpression, | ||
| } = require('./fix/index.js'); | ||
| const { | ||
| getParenthesizedRange, | ||
| isParenthesized, | ||
| } = require('./utils/parentheses.js'); | ||
| const isOnSameLine = require('./utils/is-on-same-line.js'); | ||
| const needsSemicolon = require('./utils/needs-semicolon.js'); | ||
|
|
||
| const MESSAGE_ID = 'no-negated-condition'; | ||
| const messages = { | ||
| [MESSAGE_ID]: 'Unexpected negated condition.', | ||
| }; | ||
|
|
||
| const selector = [ | ||
| matches([ | ||
| 'IfStatement[alternate][alternate.type!="IfStatement"]', | ||
| 'ConditionalExpression', | ||
| ]), | ||
| matches([ | ||
| '[test.type="UnaryExpression"][test.operator="!"]', | ||
| '[test.type="BinaryExpression"][test.operator="!="]', | ||
| '[test.type="BinaryExpression"][test.operator="!=="]', | ||
| ]), | ||
| ].join(''); | ||
|
|
||
| function * convertNegatedCondition(fixer, node, sourceCode) { | ||
| const {test} = node; | ||
| if (test.type === 'UnaryExpression') { | ||
| const token = sourceCode.getFirstToken(test); | ||
|
|
||
| if (node.type === 'IfStatement') { | ||
| yield * removeParentheses(test.argument, fixer, sourceCode); | ||
| } | ||
|
|
||
| yield fixer.remove(token); | ||
| return; | ||
| } | ||
|
|
||
| const token = sourceCode.getTokenAfter( | ||
| test.left, | ||
| token => token.type === 'Punctuator' && token.value === test.operator, | ||
| ); | ||
|
|
||
| yield fixer.replaceText(token, '=' + token.value.slice(1)); | ||
| } | ||
|
|
||
| function * swapConsequentAndAlternate(fixer, node, sourceCode) { | ||
| const isIfStatement = node.type === 'IfStatement'; | ||
| const [consequent, alternate] = [ | ||
| node.consequent, | ||
| node.alternate, | ||
| ].map(node => { | ||
| const range = getParenthesizedRange(node, sourceCode); | ||
| let text = sourceCode.text.slice(...range); | ||
| // `if (!a) b(); else c()` can't fix to `if (!a) c() else b();` | ||
| if (isIfStatement && node.type !== 'BlockStatement') { | ||
| text = `{${text}}`; | ||
| } | ||
|
|
||
| return { | ||
| range, | ||
| text, | ||
| }; | ||
| }); | ||
|
|
||
| if (consequent.text === alternate.text) { | ||
| return; | ||
| } | ||
|
|
||
| yield fixer.replaceTextRange(consequent.range, alternate.text); | ||
| yield fixer.replaceTextRange(alternate.range, consequent.text); | ||
| } | ||
|
|
||
| /** @param {import('eslint').Rule.RuleContext} context */ | ||
| const create = context => ({ | ||
| [selector](node) { | ||
| return { | ||
| node: node.test, | ||
| messageId: MESSAGE_ID, | ||
| /** @param {import('eslint').Rule.RuleFixer} fixer */ | ||
| * fix(fixer) { | ||
| const sourceCode = context.getSourceCode(); | ||
| yield * convertNegatedCondition(fixer, node, sourceCode); | ||
| yield * swapConsequentAndAlternate(fixer, node, sourceCode); | ||
|
|
||
| if ( | ||
| node.type !== 'ConditionalExpression' | ||
| || node.test.type !== 'UnaryExpression' | ||
| ) { | ||
| return; | ||
| } | ||
|
|
||
| yield * fixSpaceAroundKeyword(fixer, node, sourceCode); | ||
|
|
||
| const {test, parent} = node; | ||
| const [firstToken, secondToken] = sourceCode.getFirstTokens(test, 2); | ||
| if ( | ||
| (parent.type === 'ReturnStatement' || parent.type === 'ThrowStatement') | ||
| && parent.argument === node | ||
| && !(isParenthesized(node, sourceCode) && !isParenthesized(test, sourceCode)) | ||
| && !isOnSameLine(firstToken, secondToken) | ||
| ) { | ||
| yield * addParenthesizesToReturnOrThrowExpression(fixer, parent, sourceCode); | ||
| return; | ||
| } | ||
|
|
||
| const tokenBefore = sourceCode.getTokenBefore(node); | ||
| if (needsSemicolon(tokenBefore, sourceCode, secondToken.value)) { | ||
| yield fixer.insertTextBefore(node, ';'); | ||
| } | ||
| }, | ||
| }; | ||
| }, | ||
| }); | ||
|
|
||
| /** @type {import('eslint').Rule.RuleModule} */ | ||
| module.exports = { | ||
| create, | ||
| meta: { | ||
| type: 'suggestion', | ||
| docs: { | ||
| description: 'Disallow negated conditions.', | ||
| }, | ||
| fixable: 'code', | ||
| messages, | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| import outdent from 'outdent'; | ||
| import {getTester} from './utils/test.mjs'; | ||
|
|
||
| const {test} = getTester(import.meta); | ||
|
|
||
| test.snapshot({ | ||
| valid: [ | ||
| 'if (a) {}', | ||
| 'if (a) {} else {}', | ||
| 'if (!a) {}', | ||
| 'if (!a) {} else if (b) {}', | ||
| 'if (!a) {} else if (b) {} else {}', | ||
| 'if (a == b) {}', | ||
| 'if (a == b) {} else {}', | ||
| 'if (a != b) {}', | ||
| 'if (a != b) {} else if (b) {}', | ||
| 'if (a != b) {} else if (b) {} else {}', | ||
| 'if (a !== b) {}', | ||
| 'if (a === b) {} else {}', | ||
| 'a ? b : c', | ||
| ], | ||
| invalid: [ | ||
| 'if (!a) {;} else {;}', | ||
| 'if (a != b) {;} else {;}', | ||
| 'if (a !== b) {;} else {;}', | ||
| '!a ? b : c', | ||
| 'a != b ? c : d', | ||
| 'a !== b ? c : d', | ||
| '(( !a )) ? b : c', | ||
| '!(( a )) ? b : c', | ||
| 'if(!(( a ))) b(); else c();', | ||
| 'if((( !a ))) b(); else c();', | ||
| 'function a() {return!a ? b : c}', | ||
| 'function a() {return!(( a )) ? b : c}', | ||
| outdent` | ||
| function a() { | ||
| return ! // comment | ||
| a ? b : c; | ||
| } | ||
| `, | ||
| outdent` | ||
| function a() { | ||
| return (! // ReturnStatement argument is parenthesized | ||
| a ? b : c); | ||
| } | ||
| `, | ||
| outdent` | ||
| function a() { | ||
| return ( | ||
| ! // UnaryExpression argument is parenthesized | ||
| a) ? b : c; | ||
| } | ||
| `, | ||
| outdent` | ||
| function a() { | ||
| throw ! // comment | ||
| a ? b : c; | ||
| } | ||
| `, | ||
| '!a ? b : c ? d : e', | ||
| '!a ? b : (( c ? d : e ))', | ||
| outdent` | ||
| a | ||
| ![] ? b : c | ||
| `, | ||
| outdent` | ||
| a | ||
| !+b ? c : d | ||
| `, | ||
| outdent` | ||
| a | ||
| !(b) ? c : d | ||
| `, | ||
| outdent` | ||
| a | ||
| !b ? c : d | ||
| `, | ||
| outdent` | ||
| if (!a) | ||
| b() | ||
| else | ||
| c() | ||
| `, | ||
| 'if(!a) b(); else c()', | ||
| outdent` | ||
| function fn() { | ||
| if(!a) b(); else return | ||
| } | ||
| `, | ||
| 'if(!a) {b()} else {c()}', | ||
| 'if(!!a) b(); else c();', | ||
| '(!!a) ? b() : c();', | ||
| outdent` | ||
| function fn() { | ||
| return!a !== b ? c : d | ||
| return((!((a)) != b)) ? c : d | ||
| } | ||
| `, | ||
| outdent` | ||
| if (!a) { | ||
| b(); | ||
| } else if (!c) { | ||
| d(); | ||
| } else { | ||
| e(); | ||
| } | ||
| `, | ||
| ], | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.