Fix incremental updates

Author: sheetalkamat

internal/execute/tsc.go

@@ -56,7 +56,7 @@ func CommandLine(sys System, commandLineArgs []string, testing bool) (ExitStatus
 
 	parsedCommandLine := tsoptions.ParseCommandLine(commandLineArgs, sys)
 	status, incrementalProgram, watcher := tscCompilation(sys, parsedCommandLine, testing)
-	if watcher == nil {
+	if watcher != nil {
 		watcher.start()
 	}
 	return status, parsedCommandLine, incrementalProgram, watcher
@@ -371,7 +371,7 @@ func emitFilesAndReportErrors(
 
 	if sys.Writer() != nil {
 		for _, file := range emitResult.EmittedFiles {
-			fmt.Fprint(sys.Writer(), "TSFILE: ", tspath.GetNormalizedAbsolutePath(file, sys.GetCurrentDirectory()))
+			fmt.Fprint(sys.Writer(), "TSFILE: ", tspath.GetNormalizedAbsolutePath(file, sys.GetCurrentDirectory()), sys.NewLine())
 		}
 		listFiles(sys, program)
 	}

internal/execute/tscincremental_test.go

@@ -33,6 +33,7 @@ func TestIncremental(t *testing.T) {
                         <div />
                     </Component>)`,
 			}, "/home/src/workspaces/project"),
+			edits: noChangeOnlyEdit,
 		},
 		{
 			subScenario: "serializing composite project",

internal/execute/tsctestrunner_test.go

@@ -25,6 +25,10 @@ var noChange = &testTscEdit{
 	edit:    func(sys *testSys) {},
 }
 
+var noChangeOnlyEdit = []*testTscEdit{
+	noChange,
+}
+
 type tscInput struct {
 	subScenario     string
 	commandLineArgs []string

internal/execute/tscwatch_test.go

@@ -63,7 +63,7 @@ func noEmitWatchTestInput(
 		commandLineArgs: commandLineArgs,
 		sys:             sys,
 		edits: []*testTscEdit{
-			newTscEdit("fix syntax error", func(sys *testSys) {
+			newTscEdit("fix error", func(sys *testSys) {
 				sys.WriteFileNoError("/home/src/workspaces/project/a.ts", `const a = "hello";`, false)
 			}),
 			newTscEdit("emit after fixing error", func(sys *testSys) {

internal/incremental/emitfileshandler.go

@@ -97,26 +97,26 @@ func (h *emitFilesHandler) emitAllAffectedFiles(options compiler.EmitOptions) *c
 		if h.ctx.Err() != nil {
 			return nil
 		}
+	}
 
-		// Get updated errors that were not included in affected files emit
-		for path, diagnostics := range h.program.snapshot.emitDiagnosticsPerFile {
-			if _, ok := h.emitUpdates.Load(path); !ok {
-				affectedFile := h.program.program.GetSourceFileByPath(path)
-				if affectedFile == nil || !h.program.program.SourceFileMayBeEmitted(affectedFile, false) {
-					h.deletedPendingKinds.Add(path)
-					continue
-				}
-				pendingKind := h.program.snapshot.affectedFilesPendingEmit[path]
-				h.emitUpdates.Store(path, &emitUpdate{pendingKind: pendingKind, result: &compiler.EmitResult{
-					EmitSkipped: true,
-					Diagnostics: diagnostics.getDiagnostics(h.program.program, affectedFile),
-				}})
+	// Get updated errors that were not included in affected files emit
+	for path, diagnostics := range h.program.snapshot.emitDiagnosticsPerFile {
+		if _, ok := h.emitUpdates.Load(path); !ok {
+			affectedFile := h.program.program.GetSourceFileByPath(path)
+			if affectedFile == nil || !h.program.program.SourceFileMayBeEmitted(affectedFile, false) {
+				h.deletedPendingKinds.Add(path)
+				continue
 			}
+			pendingKind := h.program.snapshot.affectedFilesPendingEmit[path]
+			h.emitUpdates.Store(path, &emitUpdate{pendingKind: pendingKind, result: &compiler.EmitResult{
+				EmitSkipped: true,
+				Diagnostics: diagnostics.getDiagnostics(h.program.program, affectedFile),
+			}})
 		}
-
-		results = h.updateSnapshot()
 	}
 
+	results = h.updateSnapshot()
+
 	// Combine results and update buildInfo
 	if h.isForDtsErrors && options.TargetSourceFile != nil {
 		// Result from cache

internal/incremental/program.go

@@ -230,13 +230,15 @@ func (h *Program) emitBuildInfo(ctx context.Context, options compiler.EmitOption
 	if buildInfoFileName == "" {
 		return nil
 	}
-
-	hasErrors := h.ensureHasErrorsForState(ctx, h.program)
-	if !h.snapshot.buildInfoEmitPending && h.snapshot.hasErrors == hasErrors {
+	if h.snapshot.hasErrors == core.TSUnknown {
+		h.snapshot.hasErrors = h.ensureHasErrorsForState(ctx, h.program)
+		if h.snapshot.hasErrors != h.snapshot.hasErrorsFromOldState {
+			h.snapshot.buildInfoEmitPending = true
+		}
+	}
+	if !h.snapshot.buildInfoEmitPending {
 		return nil
 	}
-	h.snapshot.hasErrors = hasErrors
-	h.snapshot.buildInfoEmitPending = true
 	if ctx.Err() != nil {
 		return nil
 	}
@@ -273,10 +275,6 @@ func (h *Program) emitBuildInfo(ctx context.Context, options compiler.EmitOption
 }
 
 func (h *Program) ensureHasErrorsForState(ctx context.Context, program *compiler.Program) core.Tristate {
-	if h.snapshot.hasErrors != core.TSUnknown {
-		return h.snapshot.hasErrors
-	}
-
 	// Check semantic and emit diagnostics first as we dont need to ask program about it
 	if slices.ContainsFunc(program.GetSourceFiles(), func(file *ast.SourceFile) bool {
 		semanticDiagnostics := h.snapshot.semanticDiagnosticsPerFile[file.Path()]

internal/incremental/snapshot.go

@@ -209,6 +209,7 @@ type snapshot struct {
 
 	// true if build info emit is pending
 	buildInfoEmitPending                    bool
+	hasErrorsFromOldState                   core.Tristate
 	allFilesExcludingDefaultLibraryFileOnce sync.Once
 	//  Cache of all files excluding default library file for the current program
 	allFilesExcludingDefaultLibraryFile []*ast.SourceFile
@@ -232,6 +233,7 @@ func (s *snapshot) addFileToAffectedFilesPendingEmit(filePath tspath.Path, emitK
 	}
 	s.affectedFilesPendingEmit[filePath] = existingKind | emitKind
 	delete(s.emitDiagnosticsPerFile, filePath)
+	s.buildInfoEmitPending = true
 }
 
 func (s *snapshot) getAllFilesExcludingDefaultLibraryFile(program *compiler.Program, firstSourceFile *ast.SourceFile) []*ast.SourceFile {
@@ -278,6 +280,7 @@ func newSnapshotForProgram(program *compiler.Program, oldProgram *Program) *snap
 			snapshot.affectedFilesPendingEmit = maps.Clone(oldProgram.snapshot.affectedFilesPendingEmit)
 		}
 		snapshot.buildInfoEmitPending = oldProgram.snapshot.buildInfoEmitPending
+		snapshot.hasErrorsFromOldState = oldProgram.snapshot.hasErrors
 	} else {
 		snapshot.changedFilesSet = &collections.Set[tspath.Path]{}
 		snapshot.buildInfoEmitPending = snapshot.options.IsIncremental()
@@ -312,7 +315,7 @@ func newSnapshotForProgram(program *compiler.Program, oldProgram *Program) *snap
 		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 {
+				if oldFileInfo.version != version || oldFileInfo.affectsGlobalScope != affectsGlobalScope || oldFileInfo.impliedNodeFormat != impliedNodeFormat {
 					snapshot.addFileToChangeSet(file.Path())
 				} else if oldReferences, _ := oldProgram.snapshot.referencedMap.GetValues(file.Path()); !newReferences.Equals(oldReferences) {
 					// Referenced files changed

internal/tsoptions/declscompiler.go

@@ -1249,7 +1249,7 @@ func optionsHaveChanges(oldOptions *core.CompilerOptions, newOptions *core.Compi
 	}
 	oldOptionsValue := reflect.ValueOf(oldOptions).Elem()
 	return ForEachCompilerOptionValue(newOptions, declFilter, func(option *CommandLineOption, value reflect.Value, i int) bool {
-		return !reflect.DeepEqual(value, oldOptionsValue.Field(i))
+		return !reflect.DeepEqual(value.Interface(), oldOptionsValue.Field(i).Interface())
 	})
 }
 

internal/tsoptions/parsinghelpers.go

@@ -262,7 +262,7 @@ func parseCompilerOptions(key string, value any, allOptions *core.CompilerOption
 	case "isolatedDeclarations":
 		allOptions.IsolatedDeclarations = parseTristate(value)
 	case "jsx":
-		allOptions.Jsx = value.(core.JsxEmit)
+		allOptions.Jsx = floatOrInt32ToFlag[core.JsxEmit](value)
 	case "jsxFactory":
 		allOptions.JsxFactory = parseString(value)
 	case "jsxFragmentFactory":