Skip to content

Fix auto-import not offering unsaved exports after auto-imports were computed #64960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ryan Cavanaugh (RyanCavanaugh) merged 1 commit into from
Oct 27, 2026
+32 −3
Merged

Fix auto-import not offering unsaved exports after auto-imports were computed #64960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tsc/internal/ls/autoimport/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ func (b *registryBuilder) markBucketsDirty(change RegistryChange, logger *loggin
// Look up the package name for granular updates
packageName := entry.Value().Paths[path]
entry.Change(func(bucket *RegistryBucket) { bucket.markNodeModulesDirty(packageName) })
if !entry.Value().state.multipleFilesDirty {
if entry.Value().state.multipleFilesDirty {
delete(cleanNodeModulesBuckets, dirPath)
}
}
Expand All @@ -764,7 +764,7 @@ func (b *registryBuilder) markBucketsDirty(change RegistryChange, logger *loggin
if packageName, ok := entry.Value().Paths[path]; ok {
// Use the package name for granular updates
entry.Change(func(bucket *RegistryBucket) { bucket.markNodeModulesDirty(packageName) })
if !entry.Value().state.multipleFilesDirty {
if entry.Value().state.multipleFilesDirty {
delete(cleanNodeModulesBuckets, bucketDirPath)
}
}
Expand All @@ -780,7 +780,7 @@ func (b *registryBuilder) markBucketsDirty(change RegistryChange, logger *loggin
if _, ok := entry.Value().Paths[path]; ok {
// Project buckets don't use package-based granular updates
entry.Change(func(bucket *RegistryBucket) { bucket.markProjectFileDirty(path) })
if !entry.Value().state.multipleFilesDirty {
if entry.Value().state.multipleFilesDirty {
delete(cleanProjectBuckets, projectDirPath)
}
}
Expand Down
29 changes: 29 additions & 0 deletions tsc/internal/ls/autoimport/registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,3 +1276,32 @@ func singleBucket(t *testing.T, buckets []autoimport.BucketStats) autoimport.Buc
}
return buckets[0]
}

func TestUnsavedExportAfterAutoImportsComputed(t *testing.T) {
t.Parallel()
root := "/home/src/proj"
files := map[string]any{
root + "/exporter.ts": "",
root + "/tsconfig.json": `{"compilerOptions":{"module":"esnext","moduleResolution":"bundler","strict":true,"noEmit":true},"include":["*.ts"]}`,
}
session, _ := projecttestutil.Setup(files)
t.Cleanup(session.Close)
ctx := context.Background()
importer := lsproto.DocumentUri("file://" + root + "/importer.ts")
exporter := lsproto.DocumentUri("file://" + root + "/exporter.ts")

session.DidOpenFile(ctx, importer, 1, "export {};", lsproto.LanguageKindTypeScript)
_, err := session.GetCurrentLanguageServiceWithAutoImports(ctx, importer)
assert.NilError(t, err)
session.DidCloseFile(ctx, importer)

session.DidOpenFile(ctx, exporter, 1, "export function unsavedFn() {}", lsproto.LanguageKindTypeScript)
_, err = session.GetLanguageService(ctx, exporter)
assert.NilError(t, err)
session.DidOpenFile(ctx, importer, 1, "unsavedFn;", lsproto.LanguageKindTypeScript)
_, err = session.GetCurrentLanguageServiceWithAutoImports(ctx, importer)
assert.NilError(t, err)
stats := autoImportStats(t, session)
bucket := singleBucket(t, stats.ProjectBuckets)
assert.Assert(t, bucket.ExportCount > 0, "exporter.ts exports should be indexed: %+v", bucket)
}
Loading