use the correct helper

Author: Andarist

src/services/codefixes/useDefaultImport.ts

@@ -10,18 +10,18 @@ import {
     factory,
     getQuotePreference,
     getTokenAtPosition,
+    hasSyntacticModifier,
     Identifier,
-    isExportModifier,
     isExternalModuleReference,
     isIdentifier,
     isImportDeclaration,
     isImportEqualsDeclaration,
     isNamespaceImport,
     makeImport,
-    some,
+    ModifierFlags,
     SourceFile,
     textChanges,
-    UserPreferences,
+    UserPreferences
 } from "../_namespaces/ts.js";
 
 const fixId = "useDefaultImport";
@@ -54,7 +54,7 @@ function getInfo(sourceFile: SourceFile, pos: number): Info | undefined {
     if (!isIdentifier(name)) return undefined; // bad input
     const { parent } = name;
     if (isImportEqualsDeclaration(parent) && isExternalModuleReference(parent.moduleReference)) {
-        return { importNode: parent, name, moduleSpecifier: parent.moduleReference.expression, exportModifier: some(parent.modifiers, isExportModifier) };
+        return { importNode: parent, name, moduleSpecifier: parent.moduleReference.expression, exportModifier: hasSyntacticModifier(parent, ModifierFlags.Export) };
     }
     else if (isNamespaceImport(parent) && isImportDeclaration(parent.parent.parent)) {
         const importNode = parent.parent.parent;

src/services/suggestionDiagnostics.ts

@@ -25,7 +25,6 @@ import {
     getFunctionFlags,
     hasInitializer,
     hasPropertyAccessExpressionWithName,
-    hasSyntacticModifier,
     Identifier,
     importFromModuleSpecifier,
     isAsyncFunction,
@@ -37,7 +36,6 @@ import {
     isFunctionExpression,
     isFunctionLike,
     isIdentifier,
-    isImportEqualsDeclaration,
     isPropertyAccessExpression,
     isRequireCall,
     isReturnStatement,
@@ -46,7 +44,6 @@ import {
     isVariableDeclaration,
     isVariableStatement,
     MethodDeclaration,
-    ModifierFlags,
     ModuleKind,
     Node,
     NodeFlags,
@@ -59,7 +56,7 @@ import {
     SourceFile,
     SyntaxKind,
     TypeChecker,
-    VariableStatement,
+    VariableStatement
 } from "./_namespaces/ts.js";
 
 const visitedNestedConvertibleFunctions = new Map<string, true>();
@@ -88,7 +85,6 @@ export function computeSuggestionDiagnostics(sourceFile: SourceFile, program: Pr
     if (getAllowSyntheticDefaultImports(program.getCompilerOptions())) {
         for (const moduleSpecifier of sourceFile.imports) {
             const importNode = importFromModuleSpecifier(moduleSpecifier);
-            if (isImportEqualsDeclaration(importNode) && hasSyntacticModifier(importNode, ModifierFlags.Export)) continue;
             const name = importNameForConvertToDefaultImport(importNode);
             if (!name) continue;
             const module = program.getResolvedModuleFromModuleSpecifier(moduleSpecifier, sourceFile)?.resolvedModule;

tests/cases/fourslash/codeFixUseDefaultImport.ts

@@ -21,9 +21,6 @@
 ////import * as n from "./non-existant";
 ////n;
 
-// @Filename: /f.ts
-////export import [|foo|] = require("./a");
-
 for (const file of ["/b.ts", "/c.ts"]) {
     goTo.file(file);
 
@@ -41,7 +38,7 @@ a;`,
     });
 }
 
-for (const file of ["/d.ts", "/e.ts", "/f.ts"]) {
+for (const file of ["/d.ts", "/e.ts"]) {
     goTo.file(file);
     verify.getSuggestionDiagnostics([]);
 }