Merge pull request microsoft#32531 from microsoft/importFixCompletion

When the exported symbol is merged symbol from declaration use that name

Author: sheetalkamat

src/services/codefixes/importFixes.ts

@@ -445,9 +445,12 @@ namespace ts.codefix {
             const aliased = checker.getImmediateAliasedSymbol(defaultExport);
             return aliased && getDefaultExportInfoWorker(aliased, Debug.assertDefined(aliased.parent), checker, compilerOptions);
         }
-        else {
-            return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target!) };
+
+        if (defaultExport.escapedName !== InternalSymbolName.Default &&
+            defaultExport.escapedName !== InternalSymbolName.ExportEquals) {
+            return { symbolForMeaning: defaultExport, name: defaultExport.getName() };
         }
+        return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target!) };
     }
 
     function getNameForExportDefault(symbol: Symbol): string | undefined {

tests/cases/fourslash/completionsImport_default_symbolName.ts

@@ -0,0 +1,44 @@
+/// <reference path="fourslash.ts" />
+
+// @module: commonjs
+
+// @Filename: /node_modules/@types/range-parser/index.d.ts
+////declare function RangeParser(): string;
+////declare namespace RangeParser {
+////    interface Options {
+////        combine?: boolean;
+////    }
+////}
+////export = RangeParser;
+
+// @Filename: /b.ts
+////R/*0*/
+
+verify.completions(
+    {
+        marker: "0",
+        includes: {
+            name: "RangeParser",
+            kind: "function",
+            kindModifiers: "declare",
+            source: "/node_modules/@types/range-parser/index",
+            sourceDisplay: "range-parser",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions,
+            text: `namespace RangeParser
+function RangeParser(): string`
+        },
+        preferences: {
+            includeCompletionsForModuleExports: true
+        }
+    },
+);
+
+verify.applyCodeActionFromCompletion("0", {
+    name: "RangeParser",
+    source: "/node_modules/@types/range-parser/index",
+    description: `Import 'RangeParser' from module "range-parser"`,
+    newFileContent: `import RangeParser = require("range-parser");
+
+R`,
+});