Skip to content

Fix incremental diagnostics after global file deletion #64845

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
John Favret (johnfav03) merged 1 commit into from
Oct 16, 2026
Merged

Fix incremental diagnostics after global file deletion #64845

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
412 changes: 412 additions & 0 deletions tsc/internal/execute/incremental/buildinfo_path_test.go
View file
Open in desktop

Large diffs are not rendered by default.

68 changes: 47 additions & 21 deletions tsc/internal/execute/incremental/programtosnapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,24 @@ func (t *toProgramSnapshot) reuseFromOldProgram() {
if t.snapshot.options.Composite.IsTrue() {
t.snapshot.latestChangedDtsFile = t.oldProgram.snapshot.latestChangedDtsFile
}
t.snapshot.buildInfoEmitPending.Store(t.oldProgram.snapshot.buildInfoEmitPending.Load())
// Copy old snapshot's changed files set
t.oldProgram.snapshot.changedFilesSet.Range(func(key tspath.PathKey) bool {
t.snapshot.changedFilesSet.Add(key)
if t.program.GetSourceFileByPath(key) != nil {
t.snapshot.changedFilesSet.Add(key)
} else {
t.snapshot.buildInfoEmitPending.Store(true)
}
return true
})
t.oldProgram.snapshot.affectedFilesPendingEmit.Range(func(key tspath.PathKey, emitKind FileEmitKind) bool {
t.snapshot.affectedFilesPendingEmit.Store(key, emitKind)
if t.program.GetSourceFileByPath(key) != nil {
t.snapshot.affectedFilesPendingEmit.Store(key, emitKind)
} else {
t.snapshot.buildInfoEmitPending.Store(true)
}
return true
})
t.snapshot.buildInfoEmitPending.Store(t.oldProgram.snapshot.buildInfoEmitPending.Load())
t.snapshot.hasErrorsFromOldState = t.oldProgram.snapshot.hasErrors
t.snapshot.hasSemanticErrorsFromOldState = t.oldProgram.snapshot.hasSemanticErrors
t.snapshot.packageJsonsFromOldState = t.oldProgram.snapshot.packageJsons
Expand Down Expand Up @@ -161,21 +169,41 @@ func (t *toProgramSnapshot) computeProgramFileChanges() {

func (t *toProgramSnapshot) handleFileDelete() {
if t.oldProgram != nil {
// If the global file is removed, add all files as changed
t.oldProgram.snapshot.fileInfos.Range(func(filePath tspath.PathKey, oldInfo *FileInfo) bool {
if _, ok := t.snapshot.fileInfos.Load(filePath); !ok {
if oldInfo.affectsGlobalScope {
for _, file := range t.snapshot.getAllFilesExcludingDefaultLibraryFile(t.program, nil) {
t.snapshot.addFileToChangeSet(file.PathKey())
}
t.globalFileRemoved = true
} else {
t.snapshot.buildInfoEmitPending.Store(true)
}
return false
}
return true
})
forEachDeletedFile(t.oldProgram.snapshot.fileInfos.Range, &t.snapshot.fileInfos, t.handleDeletedFile)
if t.globalFileRemoved {
t.invalidateGlobalScope()
}
}
}

func forEachDeletedFile(
rangeOldFileInfos func(func(tspath.PathKey, *FileInfo) bool),
newFileInfos *collections.SyncMap[tspath.PathKey, *FileInfo],
onDeletedFile func(tspath.PathKey, *FileInfo),
) {
rangeOldFileInfos(func(filePath tspath.PathKey, oldInfo *FileInfo) bool {
if _, retained := newFileInfos.Load(filePath); !retained {
onDeletedFile(filePath, oldInfo)
}
return true
})
}

func (t *toProgramSnapshot) handleDeletedFile(filePath tspath.PathKey, oldInfo *FileInfo) {
t.snapshot.buildInfoEmitPending.Store(true)
t.snapshot.changedFilesSet.Delete(filePath)
t.snapshot.affectedFilesPendingEmit.Delete(filePath)
t.globalFileRemoved = t.globalFileRemoved || oldInfo.affectsGlobalScope
}

func (t *toProgramSnapshot) invalidateGlobalScope() {
t.snapshot.buildInfoEmitPending.Store(true)
for _, file := range t.program.GetSourceFiles() {
if !t.program.IsSourceFileDefaultLibrary(file.PathKey()) {
t.snapshot.addFileToChangeSet(file.PathKey())
} else if !t.program.SkipTypeChecking(file, true) {
t.snapshot.semanticDiagnosticsPerFile.Delete(file.PathKey())
}
}
}

Expand All @@ -195,9 +223,7 @@ func (t *toProgramSnapshot) handleGlobalScopeChange() {
return true
})
if globalScopeLost {
for _, file := range t.snapshot.getAllFilesExcludingDefaultLibraryFile(t.program, nil) {
t.snapshot.addFileToChangeSet(file.PathKey())
}
t.invalidateGlobalScope()
}
}

Expand Down
147 changes: 147 additions & 0 deletions tsc/internal/execute/tsctests/tsc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2526,6 +2526,153 @@ func TestTscIncremental(t *testing.T) {
}
}

func TestTscIncrementalDeletion(t *testing.T) {
t.Parallel()
for _, mode := range []struct {
name string
args []string
}{
{},
{" with single threaded", []string{"--singleThreaded"}},
{" with one checker", []string{"--checkers", "1"}},
} {
config := func(options string) string {
return `{"compilerOptions":{"incremental":true,"noEmit":true,"types":[]` + options + `},"files":["a.ts"]}`
}
(&tscInput{
subScenario: "lib and target changes delete mixed library files" + mode.name,
commandLineArgs: mode.args,
files: FileMap{
"/home/src/workspaces/project/tsconfig.json": config(`,"target":"esnext"`),
"/home/src/workspaces/project/a.ts": `export const values = [3, 1, 2].toSorted();`,
getTestLibPathFor("es5"): tscDefaultLibContent,
getTestLibPathFor("esnext.array"): stringtestutil.Dedent(`
/// <reference no-default-lib="true"/>
interface Array<T> {
toSorted(): T[];
}
`),
getTestLibPathFor("decorators"): stringtestutil.Dedent(`
/// <reference no-default-lib="true"/>
export {};
`),
getTestLibPathFor("esnext.full"): stringtestutil.Dedent(`
/// <reference no-default-lib="true"/>
/// <reference lib="es5"/>
/// <reference lib="esnext.array"/>
/// <reference lib="decorators"/>
`),
getTestLibPathFor("es2020"): stringtestutil.Dedent(`
/// <reference no-default-lib="true"/>
/// <reference lib="es5"/>
`),
getTestLibPathFor("es2020.full"): stringtestutil.Dedent(`
/// <reference no-default-lib="true"/>
/// <reference lib="es5"/>
`),
},
edits: []*tscEdit{
{caption: "narrow lib", edit: func(sys *TestSys) {
sys.writeFileNoError("/home/src/workspaces/project/tsconfig.json", config(`,"target":"esnext","lib":["es2020"]`))
}},
noChange,
{caption: "restore lib", edit: func(sys *TestSys) {
sys.writeFileNoError("/home/src/workspaces/project/tsconfig.json", config(`,"target":"esnext"`))
}},
{caption: "narrow target", edit: func(sys *TestSys) {
sys.writeFileNoError("/home/src/workspaces/project/tsconfig.json", config(`,"target":"es2020"`))
}},
noChange,
{caption: "restore target", edit: func(sys *TestSys) {
sys.writeFileNoError("/home/src/workspaces/project/tsconfig.json", config(`,"target":"esnext"`))
}},
noChange,
},
}).run(t, "incremental")
(&tscInput{
subScenario: "mixed file deletion with add and change" + mode.name,
commandLineArgs: mode.args,
files: FileMap{
"/home/src/workspaces/project/tsconfig.json": `{"compilerOptions":{"incremental":true,"noEmit":true,"types":[]}}`,
"/home/src/workspaces/project/consumer.ts": `declare const value: RemovedGlobal; value.property;`,
"/home/src/workspaces/project/global.d.ts": `interface RemovedGlobal { property: string; }`,
"/home/src/workspaces/project/module.d.ts": `export interface ModuleOnly { property: string; }`,
"/home/src/workspaces/project/changed.ts": `export const changed = 1;`,
},
edits: []*tscEdit{
{caption: "delete global and non-global files while adding and changing sources", edit: func(sys *TestSys) {
sys.removeNoError("/home/src/workspaces/project/global.d.ts")
sys.removeNoError("/home/src/workspaces/project/module.d.ts")
sys.replaceFileText("/home/src/workspaces/project/changed.ts", "1", "2")
sys.writeFileNoError("/home/src/workspaces/project/added.ts", `export const added = 1;`)
}},
noChange,
{caption: "restore global file", edit: func(sys *TestSys) {
sys.writeFileNoError("/home/src/workspaces/project/global.d.ts", `interface RemovedGlobal { property: number; }`)
}},
{caption: "delete ordinary source file", edit: func(sys *TestSys) {
sys.removeNoError("/home/src/workspaces/project/added.ts")
}},
noChange,
},
}).run(t, "incremental")
for _, cleared := range []bool{false, true} {
library := tscDefaultLibContent + "\ninterface LibraryConsumer { property: RemovedGlobal; }"
global := "interface RemovedGlobal {}"
if cleared {
library = tscDefaultLibContent + "\ninterface Shared<T> {}"
global = "interface Shared<T, U> {}"
}
(&tscInput{
subScenario: fmt.Sprintf("retained library diagnostics after global deletion cleared %t%s", cleared, mode.name),
commandLineArgs: mode.args,
files: FileMap{
"/home/src/workspaces/project/tsconfig.json": `{"compilerOptions":{"incremental":true,"noEmit":true,"types":[],"lib":["es5"]}}`,
"/home/src/workspaces/project/consumer.ts": "export const unchanged = 1;",
"/home/src/workspaces/project/global.d.ts": global,
"/home/src/workspaces/project/module.d.ts": "export interface Unrelated {}",
getTestLibPathFor("es5"): library,
},
edits: []*tscEdit{
{caption: "delete global and module declarations", edit: func(sys *TestSys) {
sys.removeNoError("/home/src/workspaces/project/global.d.ts")
sys.removeNoError("/home/src/workspaces/project/module.d.ts")
}},
noChange,
{caption: "restore global declaration", edit: func(sys *TestSys) {
sys.writeFileNoError("/home/src/workspaces/project/global.d.ts", global)
}},
noChange,
},
}).run(t, "incremental")
}
}
for _, composite := range []bool{false, true} {
(&tscInput{
subScenario: fmt.Sprintf("unchecked deleted paths with no emit composite %t", composite),
files: FileMap{
"/home/src/workspaces/project/tsconfig.json": fmt.Sprintf(`{"compilerOptions":{"incremental":true,"noCheck":true,"noEmit":true,"composite":%t,"types":[]}}`, composite),
"/home/src/workspaces/project/stable.ts": "export const stable = 1;",
},
edits: []*tscEdit{
{caption: "add unchecked sources", edit: func(sys *TestSys) {
sys.writeFileNoError("/home/src/workspaces/project/first.ts", "export const first = 1;")
sys.writeFileNoError("/home/src/workspaces/project/second.ts", "export const second = 1;")
}},
{caption: "delete unchecked sources", edit: func(sys *TestSys) {
sys.removeNoError("/home/src/workspaces/project/first.ts")
sys.removeNoError("/home/src/workspaces/project/second.ts")
}},
noChange,
{caption: "enable checking and emit", edit: func(sys *TestSys) {
sys.replaceFileText("/home/src/workspaces/project/tsconfig.json", `"noCheck":true,"noEmit":true`, `"noCheck":false,"noEmit":false`)
}},
noChange,
},
}).run(t, "incremental")
}
}

func TestTscLibraryResolution(t *testing.T) {
t.Parallel()
getTscLibraryResolutionFileMap := func(libReplacement bool) FileMap {
Expand Down
Loading
Loading