From ed650548ec95a6cbea53a53d31df2b71dd1b04f3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 14 Jul 2025 19:33:19 +0000
Subject: [PATCH] Fix debug assertion failure in move to file refactor for
 symbols exported separately

Co-authored-by: RyanCavanaugh <6685088+RyanCavanaugh@users.noreply.github.com>
---
 src/services/refactors/helpers.ts             | 37 ++++++++++---------
 .../moveToNewFileSymbolWithoutParent.ts       | 19 ----------
 2 files changed, 19 insertions(+), 37 deletions(-)
 delete mode 100644 tests/cases/fourslash/moveToNewFileSymbolWithoutParent.ts

diff --git a/src/services/refactors/helpers.ts b/src/services/refactors/helpers.ts
index 7a17fb9367f..27859eca573 100644
--- a/src/services/refactors/helpers.ts
+++ b/src/services/refactors/helpers.ts
@@ -75,24 +75,25 @@ export function addTargetFileImports(
      * but sometimes it fails because of unresolved imports from files, or when a source file is not available for the target file (in this case when creating a new file).
      * So in that case, fall back to copying the import verbatim.
      */
-    importsToCopy.forEach(([isValidTypeOnlyUseSite, declaration], symbol) => {
-        const targetSymbol = skipAlias(symbol, checker);
-        if (checker.isUnknownSymbol(targetSymbol)) {
-            importAdder.addVerbatimImport(Debug.checkDefined(declaration ?? findAncestor(symbol.declarations?.[0], isAnyImportOrRequireStatement)));
-        }
-        else if (targetSymbol.parent === undefined) {
-            if (targetSymbol.flags & SymbolFlags.Module) {
-                Debug.assert(declaration !== undefined, "expected module symbol to have a declaration");
-                importAdder.addImportForModuleSymbol(symbol, isValidTypeOnlyUseSite, declaration);
-            }
-            else {
-                // For symbols without a parent that aren't modules, fall back to verbatim import
-                importAdder.addVerbatimImport(Debug.checkDefined(declaration ?? findAncestor(symbol.declarations?.[0], isAnyImportOrRequireStatement)));
-            }
-        }
-        else {
-            importAdder.addImportFromExportedSymbol(targetSymbol, isValidTypeOnlyUseSite, declaration);
-        }
+    importsToCopy.forEach(([isValidTypeOnlyUseSite, declaration], symbol) => {
+        const targetSymbol = skipAlias(symbol, checker);
+        if (checker.isUnknownSymbol(targetSymbol)) {
+            importAdder.addVerbatimImport(Debug.checkDefined(declaration ?? findAncestor(symbol.declarations?.[0], isAnyImportOrRequireStatement)));
+        }
+        else if (targetSymbol.parent === undefined) {
+            Debug.assert(declaration !== undefined, "expected module symbol to have a declaration");
+            const aliasedSymbol = checker.getAliasedSymbol(symbol);
+            if (aliasedSymbol.flags & SymbolFlags.Module) {
+                importAdder.addImportForModuleSymbol(symbol, isValidTypeOnlyUseSite, declaration);
+            }
+            else {
+                // If the aliased symbol is not a module, fall back to verbatim import
+                importAdder.addVerbatimImport(Debug.checkDefined(declaration ?? findAncestor(symbol.declarations?.[0], isAnyImportOrRequireStatement)));
+            }
+        }
+        else {
+            importAdder.addImportFromExportedSymbol(targetSymbol, isValidTypeOnlyUseSite, declaration);
+        }
     });
 
     addImportsForMovedSymbols(targetFileImportsFromOldFile, oldFile.fileName, importAdder, program);
diff --git a/tests/cases/fourslash/moveToNewFileSymbolWithoutParent.ts b/tests/cases/fourslash/moveToNewFileSymbolWithoutParent.ts
deleted file mode 100644
index d2883aceca0..00000000000
--- a/tests/cases/fourslash/moveToNewFileSymbolWithoutParent.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/// <reference path='fourslash.ts'/>
-
-// Test for the debug assertion failure with symbols exported separately from declaration
-// This reproduces the issue reported in #62029
-
-// @Filename: /bar.ts
-////class Bar {}
-////
-////export default Bar;
-
-// @Filename: /foo.ts
-////import Bar from './bar';
-////
-////[|function makeBar() {
-////    return new Bar();
-////}|]
-
-// Check that the refactor is available
-verify.applicableRefactorAvailableAtMarker("Move to a new file");
\ No newline at end of file