Remove EndWrite and use string builder directly for baselining

Author: sheetalkamat

cmd/tsgo/sys.go

@@ -46,11 +46,6 @@ func (s *osSys) Writer() io.Writer {
 	return s.writer
 }
 
-func (s *osSys) EndWrite() {
-	// do nothing, this is needed in the interface for testing
-	// todo: revisit if improving tsc/build/watch unittest baselines
-}
-
 func (s *osSys) WriteOutputIsTTY() bool {
 	return term.IsTerminal(int(os.Stdout.Fd()))
 }

internal/execute/outputs.go

@@ -40,12 +40,10 @@ func createDiagnosticReporter(sys System, options *core.CompilerOptions) diagnos
 	if !shouldBePretty(sys, options) {
 		return func(diagnostic *ast.Diagnostic) {
 			diagnosticwriter.WriteFormatDiagnostic(sys.Writer(), diagnostic, formatOpts)
-			sys.EndWrite()
 		}
 	}
 	return func(diagnostic *ast.Diagnostic) {
 		diagnosticwriter.FormatDiagnosticsWithColorAndContext(sys.Writer(), []*ast.Diagnostic{diagnostic}, formatOpts)
-		sys.EndWrite()
 	}
 }
 
@@ -132,7 +130,6 @@ func createReportErrorSummary(sys System, options *core.CompilerOptions) func(di
 		formatOpts := getFormatOptsOfSys(sys)
 		return func(diagnostics []*ast.Diagnostic) {
 			diagnosticwriter.WriteErrorSummaryText(sys.Writer(), diagnostics, formatOpts)
-			sys.EndWrite()
 		}
 	}
 	return func(diagnostics []*ast.Diagnostic) {}
@@ -175,7 +172,6 @@ func reportStatistics(sys System, program *compiler.Program, result compileAndEm
 
 func printVersion(sys System) {
 	fmt.Fprintln(sys.Writer(), diagnostics.Version_0.Format(core.Version()))
-	sys.EndWrite()
 }
 
 func printHelp(sys System, commandLine *tsoptions.ParsedCommandLine) {
@@ -268,7 +264,6 @@ func printEasyHelp(sys System, simpleOptions []*tsoptions.CommandLineOption) {
 	for _, chunk := range output {
 		fmt.Fprint(sys.Writer(), chunk)
 	}
-	sys.EndWrite()
 }
 
 func generateSectionOptionsOutput(

internal/execute/system.go

@@ -9,7 +9,6 @@ import (
 
 type System interface {
 	Writer() io.Writer
-	EndWrite() // needed for testing
 	FS() vfs.FS
 	DefaultLibraryPath() string
 	GetCurrentDirectory() string

internal/execute/testsys_test.go

@@ -71,7 +71,6 @@ func newTestSys(tscInput *tscInput) *testSys {
 		},
 		defaultLibraryPath: libPath,
 		cwd:                cwd,
-		output:             []string{},
 		currentWrite:       &strings.Builder{},
 		start:              time.Now(),
 		env:                tscInput.env,
@@ -101,8 +100,6 @@ type snapshot struct {
 }
 
 type testSys struct {
-	// todo: original has write to output as a string[] because the separations are needed for baselining
-	output         []string
 	currentWrite   *strings.Builder
 	serializedDiff *snapshot
 
@@ -179,23 +176,16 @@ func (s *testSys) GetEnvironmentVariable(name string) string {
 }
 
 func sanitizeSysOutput(output string, prefixLine string, replaceString string) string {
-	if index := strings.Index(output, prefixLine); index != -1 {
-		indexOfNewLine := strings.Index(output[index:], "\n")
-		if indexOfNewLine != -1 {
-			output = output[:index] + replaceString + output[index+indexOfNewLine+1:]
+	for {
+		if index := strings.Index(output, prefixLine); index != -1 {
+			indexOfNewLine := strings.Index(output[index:], "\n")
+			if indexOfNewLine != -1 {
+				output = output[:index] + replaceString + output[index+indexOfNewLine+1:]
+				continue
+			}
 		}
+		return output
 	}
-	return output
-}
-
-func (s *testSys) EndWrite() {
-	// todo: revisit if improving tsc/build/watch unittest baselines
-	output := s.currentWrite.String()
-	s.currentWrite.Reset()
-	output = sanitizeSysOutput(output, "Version "+core.Version(), "Version "+harnessutil.FakeTSVersion+"\n")
-	output = sanitizeSysOutput(output, "build starting at ", "")
-	output = sanitizeSysOutput(output, "build finished in ", "")
-	s.output = append(s.output, output)
 }
 
 func (s *testSys) baselineProgram(baseline *strings.Builder, program *incremental.Program, watcher *execute.Watcher) {
@@ -253,16 +243,19 @@ func (s *testSys) serializeState(baseline *strings.Builder) {
 
 func (s *testSys) baselineOutput(baseline io.Writer) {
 	fmt.Fprint(baseline, "\nOutput::\n")
-	if len(s.output) == 0 {
-		fmt.Fprint(baseline, "No output\n")
-		return
-	}
-	// todo screen clears
-	s.printOutputs(baseline)
+	fmt.Fprint(baseline, s.getOutput())
+}
+
+func (s *testSys) getOutput() string {
+	output := s.currentWrite.String()
+	output = sanitizeSysOutput(output, "Version "+core.Version(), "Version "+harnessutil.FakeTSVersion+"\n")
+	output = sanitizeSysOutput(output, "build starting at ", "")
+	output = sanitizeSysOutput(output, "build finished in ", "")
+	return output
 }
 
 func (s *testSys) clearOutput() {
-	s.output = []string{}
+	s.currentWrite.Reset()
 }
 
 func (s *testSys) baselineFSwithDiff(baseline io.Writer) {
@@ -368,11 +361,6 @@ func (s *testSys) addFsEntryDiff(diffs map[string]string, newDirContent *diffEnt
 	}
 }
 
-func (s *testSys) printOutputs(baseline io.Writer) {
-	// todo sanitize sys output
-	fmt.Fprint(baseline, strings.Join(s.output, "\n"))
-}
-
 func (s *testSys) writeFileNoError(path string, content string, writeByteOrderMark bool) {
 	if err := s.fsFromFileMap().WriteFile(path, content, writeByteOrderMark); err != nil {
 		panic(err)

internal/execute/tsc.go

@@ -53,7 +53,6 @@ func CommandLine(sys System, commandLineArgs []string, testing bool) CommandLine
 		switch strings.ToLower(commandLineArgs[0]) {
 		case "-b", "--b", "-build", "--build":
 			fmt.Fprintln(sys.Writer(), "Build mode is currently unsupported.")
-			sys.EndWrite()
 			return CommandLineResult{Status: ExitStatusNotImplemented}
 			// case "-f":
 			// 	return fmtMain(sys, commandLineArgs[1], commandLineArgs[1])

internal/execute/tsctestrunner_test.go

@@ -160,8 +160,8 @@ func getDiffForIncremental(incrementalSys *testSys, nonIncrementalSys *testSys)
 		}
 	}
 
-	incrementalOutput := strings.Join(incrementalSys.output, "")
-	nonIncrementalOutput := strings.Join(nonIncrementalSys.output, "")
+	incrementalOutput := incrementalSys.getOutput()
+	nonIncrementalOutput := nonIncrementalSys.getOutput()
 	if incrementalOutput != nonIncrementalOutput {
 		diffBuilder.WriteString(baseline.DiffText("nonIncremental.output.txt", "incremental.output.txt", nonIncrementalOutput, incrementalOutput))
 	}

testdata/baselines/reference/tsbuild/commandLine/when-build-not-first-argument.js

@@ -5,5 +5,4 @@ Input::
 tsgo --verbose --build
 ExitStatus:: DiagnosticsPresent_OutputsSkipped
 Output::
-error TS5093: Compiler option '--verbose' may only be used with '--build'.
-error TS6369: Option '--build' must be the first command line argument.
+error TS5093: Compiler option '--verbose' may only be used with '--build'.error TS6369: Option '--build' must be the first command line argument.

testdata/baselines/reference/tsc/commandLine/does-not-add-color-when-NO_COLOR-is-set.js

@@ -6,7 +6,6 @@ tsgo
 ExitStatus:: DiagnosticsPresent_OutputsSkipped
 Output::
 Version FakeTSVersion
-
 tsc: The TypeScript Compiler - Version FakeTSVersion
 
 COMMON COMMANDS

testdata/baselines/reference/tsc/commandLine/help-all.js

@@ -5,5 +5,4 @@ Input::
 tsgo --help --all
 ExitStatus:: Success
 Output::
-No output
 

testdata/baselines/reference/tsc/commandLine/show-help-with-ExitStatus.DiagnosticsPresent_OutputsSkipped-when-host-cannot-provide-terminal-width.js

@@ -6,7 +6,6 @@ tsgo
 ExitStatus:: DiagnosticsPresent_OutputsSkipped
 Output::
 Version FakeTSVersion
-
 tsc: The TypeScript Compiler - Version FakeTSVersion
 
 COMMON COMMANDS