Fix removal of default import (microsoft#25200)

Andy · web-flow · commit 0b5b7ef5477b · 2018-06-25T12:41:32.000-07:00
diff --git a/src/services/refactors/convertExport.ts b/src/services/refactors/convertExport.ts
@@ -148,7 +148,7 @@ namespace ts.refactor {
                 }
                 else if (namedBindings.kind === SyntaxKind.NamespaceImport) {
                     // `import foo, * as a from "./a";` --> `import * as a from ".a/"; import { foo } from "./a";`
-                    changes.deleteNode(importingSourceFile, ref);
+                    changes.deleteRange(importingSourceFile, { pos: ref.getStart(importingSourceFile), end: namedBindings.getStart(importingSourceFile) });
                     const quotePreference = isStringLiteral(clause.parent.moduleSpecifier) ? quotePreferenceFromString(clause.parent.moduleSpecifier, importingSourceFile) : QuotePreference.Double;
                     const newImport = makeImport(/*default*/ undefined, [makeImportSpecifier(exportName, ref.text)], clause.parent.moduleSpecifier, quotePreference);
                     changes.insertNodeAfter(importingSourceFile, clause.parent, newImport);
diff --git a/tests/cases/fourslash/refactorConvertExport_defaultToNamed.ts b/tests/cases/fourslash/refactorConvertExport_defaultToNamed.ts
@@ -7,7 +7,7 @@
 ////import f from "./a";
 ////import { default as f } from "./a";
 ////import { default as g } from "./a";
-////import f, * as a from "./a"; // TODO: GH#24875
+////import f, * as a from "./a";
 ////
 ////export { default } from "./a";
 ////export { default as f } from "./a";
@@ -29,7 +29,7 @@ edit.applyRefactor({
 `import { f } from "./a";
 import { f } from "./a";
 import { f as g } from "./a";
-import, * as a from "./a"; // TODO: GH#24875
+import * as a from "./a";
 import { f } from "./a";
 
 export { f as default } from "./a";

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ namespace ts.refactor {`
`148`	`148`	`}`
`149`	`149`	`else if (namedBindings.kind === SyntaxKind.NamespaceImport) {`
`150`	`150`	// `import foo, * as a from "./a";` --> `import * as a from ".a/"; import { foo } from "./a";`
`151`		`- changes.deleteNode(importingSourceFile, ref);`
	`151`	`+ changes.deleteRange(importingSourceFile, { pos: ref.getStart(importingSourceFile), end: namedBindings.getStart(importingSourceFile) });`
`152`	`152`	`const quotePreference = isStringLiteral(clause.parent.moduleSpecifier) ? quotePreferenceFromString(clause.parent.moduleSpecifier, importingSourceFile) : QuotePreference.Double;`
`153`	`153`	`const newImport = makeImport(/default/ undefined, [makeImportSpecifier(exportName, ref.text)], clause.parent.moduleSpecifier, quotePreference);`
`154`	`154`	`changes.insertNodeAfter(importingSourceFile, clause.parent, newImport);`