Skip to content

Commit 2711f35

Browse files
committed
Small cleanups
1 parent 6703676 commit 2711f35

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

src/rule-generated-flow-types.js

+4-10
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,20 @@ function getOptions(optionValue) {
2828
return DEFAULT_FLOW_TYPES_OPTIONS;
2929
}
3030

31+
function getTypeImportName(node) {
32+
return (node.specifiers[0].local || node.specifiers[0].imported).name;
33+
}
34+
3135
function genImportFixRange(type, imports, requires) {
3236
const typeImports = imports.filter(node => node.importKind === 'type');
3337
const alreadyHasImport = typeImports.some(node =>
3438
node.specifiers.some(
3539
specifier => (specifier.imported || specifier.local).name === type
3640
)
3741
);
38-
3942
if (alreadyHasImport) {
4043
return null;
4144
}
42-
43-
function getTypeImportName(node) {
44-
return (node.specifiers[0].local || node.specifiers[0].imported).name;
45-
}
46-
4745
if (typeImports.length > 0) {
4846
let precedingImportIndex = 0;
4947
while (
@@ -52,18 +50,14 @@ function genImportFixRange(type, imports, requires) {
5250
) {
5351
precedingImportIndex++;
5452
}
55-
5653
return typeImports[precedingImportIndex].range;
5754
}
58-
5955
if (imports.length > 0) {
6056
return imports[imports.length - 1].range;
6157
}
62-
6358
if (requires.length > 0) {
6459
return requires[requires.length - 1].range;
6560
}
66-
6761
// start of file
6862
return [0, 0];
6963
}

src/rule-unused-fields.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,11 @@ function rule(context) {
168168
MemberExpression: visitMemberExpression,
169169
OptionalMemberExpression: visitMemberExpression,
170170
ObjectPattern(node) {
171-
node.properties
172-
.filter(node => node.type === 'Property')
173-
.filter(node => !node.computed)
174-
.forEach(node => {
171+
node.properties.forEach(node => {
172+
if (node.type === 'Property' && !node.computed) {
175173
foundMemberAccesses[node.key.name] = true;
176-
});
174+
}
175+
});
177176
},
178177
MethodDefinition(node) {
179178
currentMethod.unshift(node.key.name);

0 commit comments

Comments
 (0)