Always collect references for proper program update

Author: sheetalkamat

internal/incremental/affectedfileshandler.go

@@ -107,11 +107,6 @@ func (h *affectedFilesHandler) getFilesAffectedBy(path tspath.Path) []*ast.Sourc
 		return []*ast.SourceFile{file}
 	}
 
-	if !h.program.snapshot.tracksReferences() {
-		h.hasAllFilesExcludingDefaultLibraryFile.Store(true)
-		return h.program.snapshot.getAllFilesExcludingDefaultLibraryFile(h.program.program, file)
-	}
-
 	if info := h.program.snapshot.fileInfos[file.Path()]; info.affectsGlobalScope {
 		h.hasAllFilesExcludingDefaultLibraryFile.Store(true)
 		h.program.snapshot.getAllFilesExcludingDefaultLibraryFile(h.program.program, file)
@@ -200,8 +195,7 @@ func (h *affectedFilesHandler) handleDtsMayChangeOfAffectedFile(dtsMayChange dts
 	// Iterate on referencing modules that export entities from affected file and delete diagnostics and add pending emit
 	// If there was change in signature (dts output) for the changed file,
 	// then only we need to handle pending file emit
-	if !h.program.snapshot.tracksReferences() ||
-		!h.program.snapshot.changedFilesSet.Has(affectedFile.Path()) ||
+	if !h.program.snapshot.changedFilesSet.Has(affectedFile.Path()) ||
 		!h.isChangedSignature(affectedFile.Path()) {
 		return
 	}

internal/incremental/snapshot.go

@@ -187,7 +187,7 @@ type snapshot struct {
 	fileInfos map[tspath.Path]*fileInfo
 	options   *core.CompilerOptions
 	//  Contains the map of ReferencedSet=Referenced files of the file if module emit is enabled
-	referencedMap *collections.ManyToManyMap[tspath.Path, tspath.Path]
+	referencedMap collections.ManyToManyMap[tspath.Path, tspath.Path]
 	// Cache of semantic diagnostics for files with their Path being the key
 	semanticDiagnosticsPerFile map[tspath.Path]*diagnosticsOrBuildInfoDiagnosticsWithFileName
 	// Cache of dts emit diagnostics for files with their Path being the key
@@ -214,16 +214,6 @@ type snapshot struct {
 	allFilesExcludingDefaultLibraryFile []*ast.SourceFile
 }
 
-func (s *snapshot) tracksReferences() bool {
-	return s.options.Module != core.ModuleKindNone
-}
-
-func (s *snapshot) createReferenceMap() {
-	if s.tracksReferences() {
-		s.referencedMap = &collections.ManyToManyMap[tspath.Path, tspath.Path]{}
-	}
-}
-
 func (s *snapshot) createEmitSignaturesMap() {
 	if s.emitSignatures == nil && s.options.Composite.IsTrue() {
 		s.emitSignatures = make(map[tspath.Path]*emitSignature)
@@ -274,16 +264,14 @@ func newSnapshotForProgram(program *compiler.Program, oldProgram *Program) *snap
 		options:                    program.Options(),
 		semanticDiagnosticsPerFile: make(map[tspath.Path]*diagnosticsOrBuildInfoDiagnosticsWithFileName, len(files)),
 	}
-	snapshot.createReferenceMap()
 	if oldProgram != nil && snapshot.options.Composite.IsTrue() {
 		snapshot.latestChangedDtsFile = oldProgram.snapshot.latestChangedDtsFile
 	}
 	if snapshot.options.NoCheck.IsTrue() {
 		snapshot.checkPending = true
 	}
 
-	canUseStateFromOldProgram := oldProgram != nil && snapshot.tracksReferences() == oldProgram.snapshot.tracksReferences()
-	if canUseStateFromOldProgram {
+	if oldProgram != nil {
 		// Copy old snapshot's changed files set
 		snapshot.changedFilesSet = oldProgram.snapshot.changedFilesSet.Clone()
 		if len(oldProgram.snapshot.affectedFilesPendingEmit) != 0 {
@@ -295,7 +283,7 @@ func newSnapshotForProgram(program *compiler.Program, oldProgram *Program) *snap
 		snapshot.buildInfoEmitPending = snapshot.options.IsIncremental()
 	}
 
-	canCopySemanticDiagnostics := canUseStateFromOldProgram &&
+	canCopySemanticDiagnostics := oldProgram != nil &&
 		!tsoptions.CompilerOptionsAffectSemanticDiagnostics(oldProgram.snapshot.options, program.Options())
 	// We can only reuse emit signatures (i.e. .d.ts signatures) if the .d.ts file is unchanged,
 	// which will eg be depedent on change in options like declarationDir and outDir options are unchanged.
@@ -317,30 +305,24 @@ func newSnapshotForProgram(program *compiler.Program, oldProgram *Program) *snap
 		impliedNodeFormat := program.GetSourceFileMetaData(file.Path()).ImpliedNodeFormat
 		affectsGlobalScope := fileAffectsGlobalScope(file)
 		var signature string
-		var newReferences *collections.Set[tspath.Path]
-		if snapshot.referencedMap != nil {
-			newReferences = getReferencedFiles(program, file)
-			if newReferences != nil {
-				snapshot.referencedMap.Add(file.Path(), newReferences)
-			}
+		newReferences := getReferencedFiles(program, file)
+		if newReferences != nil {
+			snapshot.referencedMap.Add(file.Path(), newReferences)
 		}
-		if canUseStateFromOldProgram {
+		if oldProgram != nil {
 			if oldFileInfo, ok := oldProgram.snapshot.fileInfos[file.Path()]; ok {
 				signature = oldFileInfo.signature
 				if oldFileInfo.version == version || oldFileInfo.affectsGlobalScope != affectsGlobalScope || oldFileInfo.impliedNodeFormat != impliedNodeFormat {
 					snapshot.addFileToChangeSet(file.Path())
-				} else if snapshot.referencedMap != nil {
-					oldReferences, _ := oldProgram.snapshot.referencedMap.GetValues(file.Path())
+				} else if oldReferences, _ := oldProgram.snapshot.referencedMap.GetValues(file.Path()); !newReferences.Equals(oldReferences) {
 					// Referenced files changed
-					if !newReferences.Equals(oldReferences) {
-						snapshot.addFileToChangeSet(file.Path())
-					} else {
-						for refPath := range newReferences.Keys() {
-							if program.GetSourceFileByPath(refPath) == nil {
-								// Referenced file was deleted in the new program
-								snapshot.addFileToChangeSet(file.Path())
-								break
-							}
+					snapshot.addFileToChangeSet(file.Path())
+				} else if newReferences != nil {
+					for refPath := range newReferences.Keys() {
+						if program.GetSourceFileByPath(refPath) == nil {
+							// Referenced file was deleted in the new program
+							snapshot.addFileToChangeSet(file.Path())
+							break
 						}
 					}
 				}
@@ -381,7 +363,7 @@ func newSnapshotForProgram(program *compiler.Program, oldProgram *Program) *snap
 			impliedNodeFormat:  impliedNodeFormat,
 		}
 	}
-	if canUseStateFromOldProgram {
+	if oldProgram != nil {
 		// If the global file is removed, add all files as changed
 		allFilesExcludingDefaultLibraryFileAddedToChangeSet := false
 		for filePath, oldInfo := range oldProgram.snapshot.fileInfos {
@@ -417,11 +399,10 @@ func newSnapshotForProgram(program *compiler.Program, oldProgram *Program) *snap
 				snapshot.buildInfoEmitPending = true
 			}
 		}
-	}
-	if canUseStateFromOldProgram &&
-		len(snapshot.semanticDiagnosticsPerFile) != len(snapshot.fileInfos) &&
-		oldProgram.snapshot.checkPending != snapshot.checkPending {
-		snapshot.buildInfoEmitPending = true
+		if len(snapshot.semanticDiagnosticsPerFile) != len(snapshot.fileInfos) &&
+			oldProgram.snapshot.checkPending != snapshot.checkPending {
+			snapshot.buildInfoEmitPending = true
+		}
 	}
 	return snapshot
 }

internal/incremental/tobuildinfo.go

@@ -225,9 +225,6 @@ func (t *toBuildInfo) setCompilerOptions() {
 }
 
 func (t *toBuildInfo) setReferencedMap() {
-	if !t.snapshot.tracksReferences() {
-		return
-	}
 	keys := slices.Collect(maps.Keys(t.snapshot.referencedMap.Keys()))
 	slices.Sort(keys)
 	t.buildInfo.ReferencedMap = core.Map(keys, func(filePath tspath.Path) *BuildInfoReferenceMapEntry {

internal/incremental/tosnapshot.go

@@ -116,7 +116,6 @@ func (t *toSnapshot) setFileInfoAndEmitSignatures() {
 }
 
 func (t *toSnapshot) setReferencedMap() {
-	t.snapshot.createReferenceMap()
 	for _, entry := range t.buildInfo.ReferencedMap {
 		t.snapshot.referencedMap.Add(t.toFilePath(entry.FileId), t.toFilePathSet(entry.FileIdListId))
 	}