Incremental fixes (#2532)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>

Author: 3 people

internal/execute/incremental/affectedfileshandler.go

@@ -35,7 +35,7 @@ type affectedFilesHandler struct {
 	dtsMayChange                           []dtsMayChange
 	filesToRemoveDiagnostics               collections.SyncSet[tspath.Path]
 	cleanedDiagnosticsOfLibFiles           sync.Once
-	seenFileAndExportsOfFile               collections.SyncMap[tspath.Path, bool]
+	seenFileAndReferences                  collections.SyncMap[tspath.Path, bool]
 }
 
 func (h *affectedFilesHandler) getDtsMayChange(affectedFilePath tspath.Path, affectedFileEmitKind FileEmitKind) dtsMayChange {
@@ -200,6 +200,9 @@ func (h *affectedFilesHandler) handleDtsMayChangeOfAffectedFile(dtsMayChange dts
 		return
 	}
 
+	// At this point affectedFile is actually one of the changed files
+	// that has some change in its .d.ts signature.
+
 	// Since isolated modules dont change js files, files affected by change in signature is itself
 	// But we need to cleanup semantic diagnostics and queue dts emit for affected files
 	if h.program.snapshot.options.IsolatedModules.IsTrue() {
@@ -250,30 +253,36 @@ func (h *affectedFilesHandler) handleDtsMayChangeOfAffectedFile(dtsMayChange dts
 	}
 
 	// Go through files that reference affected file and handle dts emit and semantic diagnostics for them and their references
-	for exportedFromPath := range h.program.snapshot.referencedMap.getReferencedBy(affectedFile.Path()) {
-		if h.handleDtsMayChangeOfGlobalScope(dtsMayChange, exportedFromPath, invalidateJsFiles) {
+	for fileReferencingChangedFile := range h.program.snapshot.referencedMap.getReferencedBy(affectedFile.Path()) {
+		if h.handleDtsMayChangeOfGlobalScope(dtsMayChange, fileReferencingChangedFile, invalidateJsFiles) {
 			return
 		}
-		for filePath := range h.program.snapshot.referencedMap.getReferencedBy(exportedFromPath) {
-			if h.handleDtsMayChangeOfFileAndExportsOfFile(dtsMayChange, filePath, invalidateJsFiles) {
+		// Since references of changed file = affected files - we would have already handled d.ts emit and semantic diagnostics
+		// for those files. Now we need to handle files referencing those affected files to ensure correctness.
+		for fileReferencingAffectedFile := range h.program.snapshot.referencedMap.getReferencedBy(fileReferencingChangedFile) {
+			if h.handleDtsMayChangeOfFileAndReferences(dtsMayChange, fileReferencingAffectedFile, invalidateJsFiles) {
 				return
 			}
 		}
 	}
 }
 
-func (h *affectedFilesHandler) handleDtsMayChangeOfFileAndExportsOfFile(dtsMayChange dtsMayChange, filePath tspath.Path, invalidateJsFiles bool) bool {
-	if existing, loaded := h.seenFileAndExportsOfFile.LoadOrStore(filePath, invalidateJsFiles); loaded && (existing || !invalidateJsFiles) {
+func (h *affectedFilesHandler) handleDtsMayChangeOfFileAndReferences(dtsMayChange dtsMayChange, filePath tspath.Path, invalidateJsFiles bool) bool {
+	if existing, loaded := h.seenFileAndReferences.LoadOrStore(filePath, invalidateJsFiles); loaded && (existing || !invalidateJsFiles) {
 		return false
+	} else if loaded && invalidateJsFiles {
+		h.seenFileAndReferences.Store(filePath, true)
 	}
+
 	if h.handleDtsMayChangeOfGlobalScope(dtsMayChange, filePath, invalidateJsFiles) {
 		return true
 	}
 	h.handleDtsMayChangeOf(dtsMayChange, filePath, invalidateJsFiles)
 
-	// Remove the diagnostics of files that import this file and handle all its exports too
+	// Remove the diagnostics of files that import this file and
+	// any files that are referenced by it (directly or indirectly)
 	for referencingFilePath := range h.program.snapshot.referencedMap.getReferencedBy(filePath) {
-		if h.handleDtsMayChangeOfFileAndExportsOfFile(dtsMayChange, referencingFilePath, invalidateJsFiles) {
+		if h.handleDtsMayChangeOfFileAndReferences(dtsMayChange, referencingFilePath, invalidateJsFiles) {
 			return true
 		}
 	}

internal/execute/tsctests/tsc_test.go

@@ -1880,6 +1880,52 @@ func TestTscIncremental(t *testing.T) {
 			cwd:        "/home/project",
 			ignoreCase: true,
 		},
+		{
+			subScenario: "const enums with refCycle",
+			files: FileMap{
+				"/home/src/workspaces/project/file.ts": stringtestutil.Dedent(`
+					import {A} from "./c"
+					let a = A.ONE
+				`),
+				"/home/src/workspaces/project/b.ts": stringtestutil.Dedent(`
+					import { AWorker } from "./aworker"
+					import { A as ACycle } from "./c"
+					export const enum A {
+						ONE = 1
+					}
+				`),
+				"/home/src/workspaces/project/c.ts": stringtestutil.Dedent(`
+					import {A} from "./b"
+					let b = A.ONE
+					export {A}
+				`),
+				"/home/src/workspaces/project/aworker.ts": stringtestutil.Dedent(`
+					export const AWorker  = 10
+				`),
+				"/home/src/workspaces/project/tsconfig.json": stringtestutil.Dedent(`
+				{
+					"compilerOptions": {
+						"composite": true,
+					}
+				}`),
+			},
+			commandLineArgs: []string{},
+			edits: []*tscEdit{
+				{
+					caption: "change aworker",
+					edit: func(sys *TestSys) {
+						sys.replaceFileText("/home/src/workspaces/project/aworker.ts", "10", "20")
+					},
+				},
+				{
+					caption: "change aworker and enum value",
+					edit: func(sys *TestSys) {
+						sys.replaceFileText("/home/src/workspaces/project/aworker.ts", "20", "30")
+						sys.replaceFileText("/home/src/workspaces/project/b.ts", "1", "2")
+					},
+				},
+			},
+		},
 	}
 
 	for _, test := range testCases {