Skip to content

Commit 6aabbb7

Browse files
committed
use the correct helper
1 parent e0ddf47 commit 6aabbb7

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

src/services/codefixes/useDefaultImport.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import {
1010
factory,
1111
getQuotePreference,
1212
getTokenAtPosition,
13+
hasSyntacticModifier,
1314
Identifier,
14-
isExportModifier,
1515
isExternalModuleReference,
1616
isIdentifier,
1717
isImportDeclaration,
1818
isImportEqualsDeclaration,
1919
isNamespaceImport,
2020
makeImport,
21-
some,
21+
ModifierFlags,
2222
SourceFile,
2323
textChanges,
2424
UserPreferences,
@@ -54,7 +54,7 @@ function getInfo(sourceFile: SourceFile, pos: number): Info | undefined {
5454
if (!isIdentifier(name)) return undefined; // bad input
5555
const { parent } = name;
5656
if (isImportEqualsDeclaration(parent) && isExternalModuleReference(parent.moduleReference)) {
57-
return { importNode: parent, name, moduleSpecifier: parent.moduleReference.expression, exportModifier: some(parent.modifiers, isExportModifier) };
57+
return { importNode: parent, name, moduleSpecifier: parent.moduleReference.expression, exportModifier: hasSyntacticModifier(parent, ModifierFlags.Export) };
5858
}
5959
else if (isNamespaceImport(parent) && isImportDeclaration(parent.parent.parent)) {
6060
const importNode = parent.parent.parent;

src/services/suggestionDiagnostics.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import {
2525
getFunctionFlags,
2626
hasInitializer,
2727
hasPropertyAccessExpressionWithName,
28-
hasSyntacticModifier,
2928
Identifier,
3029
importFromModuleSpecifier,
3130
isAsyncFunction,
@@ -37,7 +36,6 @@ import {
3736
isFunctionExpression,
3837
isFunctionLike,
3938
isIdentifier,
40-
isImportEqualsDeclaration,
4139
isPropertyAccessExpression,
4240
isRequireCall,
4341
isReturnStatement,
@@ -46,7 +44,6 @@ import {
4644
isVariableDeclaration,
4745
isVariableStatement,
4846
MethodDeclaration,
49-
ModifierFlags,
5047
ModuleKind,
5148
Node,
5249
NodeFlags,
@@ -88,7 +85,6 @@ export function computeSuggestionDiagnostics(sourceFile: SourceFile, program: Pr
8885
if (getAllowSyntheticDefaultImports(program.getCompilerOptions())) {
8986
for (const moduleSpecifier of sourceFile.imports) {
9087
const importNode = importFromModuleSpecifier(moduleSpecifier);
91-
if (isImportEqualsDeclaration(importNode) && hasSyntacticModifier(importNode, ModifierFlags.Export)) continue;
9288
const name = importNameForConvertToDefaultImport(importNode);
9389
if (!name) continue;
9490
const module = program.getResolvedModuleFromModuleSpecifier(moduleSpecifier, sourceFile)?.resolvedModule;

tests/cases/fourslash/codeFixUseDefaultImport.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
////import * as n from "./non-existant";
2222
////n;
2323

24-
// @Filename: /f.ts
25-
////export import [|foo|] = require("./a");
26-
2724
for (const file of ["/b.ts", "/c.ts"]) {
2825
goTo.file(file);
2926

@@ -41,7 +38,7 @@ a;`,
4138
});
4239
}
4340

44-
for (const file of ["/d.ts", "/e.ts", "/f.ts"]) {
41+
for (const file of ["/d.ts", "/e.ts"]) {
4542
goTo.file(file);
4643
verify.getSuggestionDiagnostics([]);
4744
}

0 commit comments

Comments
 (0)