Skip to content

Commit 88d404d

Browse files
chiawendtljharb
chiawendt
authored and
ljharb
committed
[eslint] remove operator-linebreak override
1 parent 304590a commit 88d404d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+845
-846
lines changed

‎.eslintrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"ignoreTemplateLiterals": true,
2424
"ignoreComments": true,
2525
}],
26-
"operator-linebreak": [2, "after"],
2726
"consistent-return": 0,
2827

2928
"prefer-destructuring": [2, { "array": false, "object": false }, { "enforceForRenamedProperties": false }],

‎lib/rules/boolean-prop-naming.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ module.exports = {
117117
*/
118118
function flowCheck(prop) {
119119
return (
120-
prop.type === 'ObjectTypeProperty' &&
121-
prop.value.type === 'BooleanTypeAnnotation' &&
122-
rule.test(getPropName(prop)) === false
120+
prop.type === 'ObjectTypeProperty'
121+
&& prop.value.type === 'BooleanTypeAnnotation'
122+
&& rule.test(getPropName(prop)) === false
123123
);
124124
}
125125

@@ -131,9 +131,9 @@ module.exports = {
131131
function regularCheck(prop) {
132132
const propKey = getPropKey(prop);
133133
return (
134-
propKey &&
135-
propTypeNames.indexOf(propKey) >= 0 &&
136-
rule.test(getPropName(prop)) === false
134+
propKey
135+
&& propTypeNames.indexOf(propKey) >= 0
136+
&& rule.test(getPropName(prop)) === false
137137
);
138138
}
139139

@@ -144,8 +144,8 @@ module.exports = {
144144
*/
145145
function nestedPropTypes(prop) {
146146
return (
147-
prop.type === 'Property' &&
148-
prop.value.type === 'CallExpression'
147+
prop.type === 'Property'
148+
&& prop.value.type === 'CallExpression'
149149
);
150150
}
151151

@@ -222,9 +222,9 @@ module.exports = {
222222
return;
223223
}
224224
if (
225-
node.value &&
226-
node.value.type === 'CallExpression' &&
227-
propWrapperUtil.isPropWrapperFunction(
225+
node.value
226+
&& node.value.type === 'CallExpression'
227+
&& propWrapperUtil.isPropWrapperFunction(
228228
context,
229229
context.getSourceCode().getText(node.value.callee)
230230
)
@@ -249,8 +249,8 @@ module.exports = {
249249
}
250250
const right = node.parent.right;
251251
if (
252-
right.type === 'CallExpression' &&
253-
propWrapperUtil.isPropWrapperFunction(
252+
right.type === 'CallExpression'
253+
&& propWrapperUtil.isPropWrapperFunction(
254254
context,
255255
context.getSourceCode().getText(right.callee)
256256
)
@@ -292,10 +292,10 @@ module.exports = {
292292
Object.keys(list).forEach((component) => {
293293
// If this is a functional component that uses a global type, check it
294294
if (
295-
list[component].node.type === 'FunctionDeclaration' &&
296-
list[component].node.params &&
297-
list[component].node.params.length &&
298-
list[component].node.params[0].typeAnnotation
295+
list[component].node.type === 'FunctionDeclaration'
296+
&& list[component].node.params
297+
&& list[component].node.params.length
298+
&& list[component].node.params[0].typeAnnotation
299299
) {
300300
const typeNode = list[component].node.params[0].typeAnnotation;
301301
const annotation = typeNode.typeAnnotation;

‎lib/rules/button-has-type.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ const pragmaUtil = require('../util/pragma');
1616

1717
function isCreateElement(node, context) {
1818
const pragma = pragmaUtil.getFromContext(context);
19-
return node.callee &&
20-
node.callee.type === 'MemberExpression' &&
21-
node.callee.property.name === 'createElement' &&
22-
node.callee.object &&
23-
node.callee.object.name === pragma &&
24-
node.arguments.length > 0;
19+
return node.callee
20+
&& node.callee.type === 'MemberExpression'
21+
&& node.callee.property.name === 'createElement'
22+
&& node.callee.object
23+
&& node.callee.object.name === pragma
24+
&& node.arguments.length > 0;
2525
}
2626

2727
// ------------------------------------------------------------------------------

‎lib/rules/destructuring-assignment.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ module.exports = {
8585
function handleClassUsage(node) {
8686
// this.props.Aprop || this.context.aProp || this.state.aState
8787
const isPropUsed = (
88-
node.object.type === 'MemberExpression' && node.object.object.type === 'ThisExpression' &&
89-
(node.object.property.name === 'props' || node.object.property.name === 'context' || node.object.property.name === 'state') &&
90-
!isAssignmentLHS(node)
88+
node.object.type === 'MemberExpression' && node.object.object.type === 'ThisExpression'
89+
&& (node.object.property.name === 'props' || node.object.property.name === 'context' || node.object.property.name === 'state')
90+
&& !isAssignmentLHS(node)
9191
);
9292

9393
if (
94-
isPropUsed && configuration === 'always' &&
95-
!(ignoreClassFields && isInClassProperty(node))
94+
isPropUsed && configuration === 'always'
95+
&& !(ignoreClassFields && isInClassProperty(node))
9696
) {
9797
context.report({
9898
node,
@@ -140,8 +140,8 @@ module.exports = {
140140
}
141141

142142
if (
143-
classComponent && destructuringClass && configuration === 'never' &&
144-
!(ignoreClassFields && node.parent.type === 'ClassProperty')
143+
classComponent && destructuringClass && configuration === 'never'
144+
&& !(ignoreClassFields && node.parent.type === 'ClassProperty')
145145
) {
146146
context.report({
147147
node,

‎lib/rules/display-name.js‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -71,45 +71,45 @@ module.exports = {
7171
*/
7272
function hasTranspilerName(node) {
7373
const namedObjectAssignment = (
74-
node.type === 'ObjectExpression' &&
75-
node.parent &&
76-
node.parent.parent &&
77-
node.parent.parent.type === 'AssignmentExpression' &&
78-
(
79-
!node.parent.parent.left.object ||
80-
node.parent.parent.left.object.name !== 'module' ||
81-
node.parent.parent.left.property.name !== 'exports'
74+
node.type === 'ObjectExpression'
75+
&& node.parent
76+
&& node.parent.parent
77+
&& node.parent.parent.type === 'AssignmentExpression'
78+
&& (
79+
!node.parent.parent.left.object
80+
|| node.parent.parent.left.object.name !== 'module'
81+
|| node.parent.parent.left.property.name !== 'exports'
8282
)
8383
);
8484
const namedObjectDeclaration = (
85-
node.type === 'ObjectExpression' &&
86-
node.parent &&
87-
node.parent.parent &&
88-
node.parent.parent.type === 'VariableDeclarator'
85+
node.type === 'ObjectExpression'
86+
&& node.parent
87+
&& node.parent.parent
88+
&& node.parent.parent.type === 'VariableDeclarator'
8989
);
9090
const namedClass = (
91-
(node.type === 'ClassDeclaration' || node.type === 'ClassExpression') &&
92-
node.id &&
93-
!!node.id.name
91+
(node.type === 'ClassDeclaration' || node.type === 'ClassExpression')
92+
&& node.id
93+
&& !!node.id.name
9494
);
9595

9696
const namedFunctionDeclaration = (
97-
(node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression') &&
98-
node.id &&
99-
!!node.id.name
97+
(node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression')
98+
&& node.id
99+
&& !!node.id.name
100100
);
101101

102102
const namedFunctionExpression = (
103-
astUtil.isFunctionLikeExpression(node) &&
104-
node.parent &&
105-
(node.parent.type === 'VariableDeclarator' || node.parent.method === true) &&
106-
(!node.parent.parent || !utils.isES5Component(node.parent.parent))
103+
astUtil.isFunctionLikeExpression(node)
104+
&& node.parent
105+
&& (node.parent.type === 'VariableDeclarator' || node.parent.method === true)
106+
&& (!node.parent.parent || !utils.isES5Component(node.parent.parent))
107107
);
108108

109109
if (
110-
namedObjectAssignment || namedObjectDeclaration ||
111-
namedClass ||
112-
namedFunctionDeclaration || namedFunctionExpression
110+
namedObjectAssignment || namedObjectDeclaration
111+
|| namedClass
112+
|| namedFunctionDeclaration || namedFunctionExpression
113113
) {
114114
return true;
115115
}
@@ -215,8 +215,8 @@ module.exports = {
215215
const isWrappedInAnotherPragma = utils.getPragmaComponentWrapper(node);
216216

217217
if (
218-
!isWrappedInAnotherPragma &&
219-
(ignoreTranspilerName || !hasTranspilerName(node.arguments[0]))
218+
!isWrappedInAnotherPragma
219+
&& (ignoreTranspilerName || !hasTranspilerName(node.arguments[0]))
220220
) {
221221
return;
222222
}

‎lib/rules/forbid-elements.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ module.exports = {
7272
}
7373

7474
function isValidCreateElement(node) {
75-
return node.callee &&
76-
node.callee.type === 'MemberExpression' &&
77-
node.callee.object.name === 'React' &&
78-
node.callee.property.name === 'createElement' &&
79-
node.arguments.length > 0;
75+
return node.callee
76+
&& node.callee.type === 'MemberExpression'
77+
&& node.callee.object.name === 'React'
78+
&& node.callee.property.name === 'createElement'
79+
&& node.arguments.length > 0;
8080
}
8181

8282
function reportIfForbidden(element, node) {

‎lib/rules/forbid-foreign-prop-types.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,20 @@ module.exports = {
7070
const assignmentExpression = findParentAssignmentExpression(node);
7171

7272
if (
73-
assignmentExpression &&
74-
assignmentExpression.left &&
75-
assignmentExpression.left.property &&
76-
assignmentExpression.left.property.name === 'propTypes'
73+
assignmentExpression
74+
&& assignmentExpression.left
75+
&& assignmentExpression.left.property
76+
&& assignmentExpression.left.property.name === 'propTypes'
7777
) {
7878
return true;
7979
}
8080

8181
const classProperty = findParentClassProperty(node);
8282

8383
if (
84-
classProperty &&
85-
classProperty.key &&
86-
classProperty.key.name === 'propTypes'
84+
classProperty
85+
&& classProperty.key
86+
&& classProperty.key.name === 'propTypes'
8787
) {
8888
return true;
8989
}
@@ -93,18 +93,18 @@ module.exports = {
9393
return {
9494
MemberExpression(node) {
9595
if (
96-
node.property &&
97-
(
98-
!node.computed &&
99-
node.property.type === 'Identifier' &&
100-
node.property.name === 'propTypes' &&
101-
!ast.isAssignmentLHS(node) &&
102-
!isAllowedAssignment(node)
96+
node.property
97+
&& (
98+
!node.computed
99+
&& node.property.type === 'Identifier'
100+
&& node.property.name === 'propTypes'
101+
&& !ast.isAssignmentLHS(node)
102+
&& !isAllowedAssignment(node)
103103
) || (
104-
(node.property.type === 'Literal' || node.property.type === 'JSXText') &&
105-
node.property.value === 'propTypes' &&
106-
!ast.isAssignmentLHS(node) &&
107-
!isAllowedAssignment(node)
104+
(node.property.type === 'Literal' || node.property.type === 'JSXText')
105+
&& node.property.value === 'propTypes'
106+
&& !ast.isAssignmentLHS(node)
107+
&& !isAllowedAssignment(node)
108108
)
109109
) {
110110
context.report({

‎lib/rules/forbid-prop-types.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@ module.exports = {
8686
let target;
8787
let value = declaration.value;
8888
if (
89-
value.type === 'MemberExpression' &&
90-
value.property &&
91-
value.property.name &&
92-
value.property.name === 'isRequired'
89+
value.type === 'MemberExpression'
90+
&& value.property
91+
&& value.property.name
92+
&& value.property.name === 'isRequired'
9393
) {
9494
value = value.object;
9595
}
9696
if (
97-
value.type === 'CallExpression' &&
98-
value.callee.type === 'MemberExpression'
97+
value.type === 'CallExpression'
98+
&& value.callee.type === 'MemberExpression'
9999
) {
100100
value = value.callee;
101101
}
@@ -140,9 +140,9 @@ module.exports = {
140140
return {
141141
ClassProperty(node) {
142142
if (
143-
!propsUtil.isPropTypesDeclaration(node) &&
144-
!shouldCheckContextTypes(node) &&
145-
!shouldCheckChildContextTypes(node)
143+
!propsUtil.isPropTypesDeclaration(node)
144+
&& !shouldCheckContextTypes(node)
145+
&& !shouldCheckChildContextTypes(node)
146146
) {
147147
return;
148148
}
@@ -151,9 +151,9 @@ module.exports = {
151151

152152
MemberExpression(node) {
153153
if (
154-
!propsUtil.isPropTypesDeclaration(node) &&
155-
!shouldCheckContextTypes(node) &&
156-
!shouldCheckChildContextTypes(node)
154+
!propsUtil.isPropTypesDeclaration(node)
155+
&& !shouldCheckContextTypes(node)
156+
&& !shouldCheckChildContextTypes(node)
157157
) {
158158
return;
159159
}
@@ -163,9 +163,9 @@ module.exports = {
163163

164164
MethodDefinition(node) {
165165
if (
166-
!propsUtil.isPropTypesDeclaration(node) &&
167-
!shouldCheckContextTypes(node) &&
168-
!shouldCheckChildContextTypes(node)
166+
!propsUtil.isPropTypesDeclaration(node)
167+
&& !shouldCheckContextTypes(node)
168+
&& !shouldCheckChildContextTypes(node)
169169
) {
170170
return;
171171
}
@@ -184,9 +184,9 @@ module.exports = {
184184
}
185185

186186
if (
187-
!propsUtil.isPropTypesDeclaration(property) &&
188-
!shouldCheckContextTypes(property) &&
189-
!shouldCheckChildContextTypes(property)
187+
!propsUtil.isPropTypesDeclaration(property)
188+
&& !shouldCheckContextTypes(property)
189+
&& !shouldCheckChildContextTypes(property)
190190
) {
191191
return;
192192
}

‎lib/rules/function-component-definition.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ module.exports = {
162162
fixerOptions: {
163163
type: namedConfig,
164164
template: NAMED_FUNCTION_TEMPLATES[namedConfig],
165-
range: node.type === 'FunctionDeclaration' ?
166-
node.range :
167-
node.parent.parent.range
165+
range: node.type === 'FunctionDeclaration'
166+
? node.range
167+
: node.parent.parent.range
168168
}
169169
});
170170
}

0 commit comments

Comments
 (0)