Fixesg

Author: jakebailey

.golangci.yml

@@ -67,6 +67,7 @@ linters:
         - all
         - -QF1001
         - -QF1003
+        - -SA1019
         - -SA6005
         - -SA9003
         - -ST1000

internal/execute/tsctestrunner_test.go

@@ -84,7 +84,7 @@ func (test *tscInput) run(t *testing.T, scenario string) {
 			var nonIncrementalSys *testSys
 			commandLineArgs := core.IfElse(do.commandLineArgs == nil, test.commandLineArgs, do.commandLineArgs)
 			wg.Queue(func() {
-				baselineBuilder.WriteString(fmt.Sprintf("\n\nEdit [%d]:: %s\n", index, do.caption))
+				fmt.Fprintf(baselineBuilder, "\n\nEdit [%d]:: %s\n", index, do.caption)
 				if do.edit != nil {
 					do.edit(sys)
 				}
@@ -113,10 +113,10 @@ func (test *tscInput) run(t *testing.T, scenario string) {
 
 			diff := getDiffForIncremental(sys, nonIncrementalSys)
 			if diff != "" {
-				baselineBuilder.WriteString(fmt.Sprintf("\n\nDiff:: %s\n", core.IfElse(do.expectedDiff == "", "!!! Unexpected diff, please review and either fix or write explanation as expectedDiff !!!", do.expectedDiff)))
+				fmt.Fprintf(baselineBuilder, "\n\nDiff:: %s\n", core.IfElse(do.expectedDiff == "", "!!! Unexpected diff, please review and either fix or write explanation as expectedDiff !!!", do.expectedDiff))
 				baselineBuilder.WriteString(diff)
 			} else if do.expectedDiff != "" {
-				baselineBuilder.WriteString(fmt.Sprintf("\n\nDiff:: %s !!! Diff not found but explanation present, please review and remove the explanation !!!\n", do.expectedDiff))
+				fmt.Fprintf(baselineBuilder, "\n\nDiff:: %s !!! Diff not found but explanation present, please review and remove the explanation !!!\n", do.expectedDiff)
 			}
 		}
 		baseline.Run(t, strings.ReplaceAll(test.subScenario, " ", "-")+".js", baselineBuilder.String(), baseline.Options{Subfolder: filepath.Join(test.getBaselineSubFolder(), scenario)})

internal/fourslash/baselineutil.go

@@ -420,7 +420,7 @@ func (t *textWithContext) add(detail *baselineDetail) {
 				if t.isLibFile {
 					t.newContent.WriteString("--- (line: --) skipped ---\n")
 				} else {
-					t.newContent.WriteString(fmt.Sprintf("--- (line: %v) skipped ---\n", locationLineIndex-t.nLinesContext+1))
+					fmt.Fprintf(t.newContent, "--- (line: %v) skipped ---\n", locationLineIndex-t.nLinesContext+1)
 				}
 				t.newContent.WriteString(t.sliceOfContent(
 					t.getIndex(t.lineStarts.LineStarts[locationLineIndex-t.nLinesContext+1]),
@@ -459,20 +459,20 @@ func (t *textWithContext) sliceOfContent(start *int, end *int) string {
 	return t.content[*start:*end]
 }
 
-func (t *textWithContext) getIndex(i interface{}) *int {
-	switch i.(type) {
+func (t *textWithContext) getIndex(i any) *int {
+	switch i := i.(type) {
 	case *int:
-		return i.(*int)
+		return i
 	case int:
-		return ptrTo(i.(int))
+		return ptrTo(i)
 	case core.TextPos:
-		return ptrTo(int(i.(core.TextPos)))
+		return ptrTo(int(i))
 	case *core.TextPos:
-		return ptrTo(int(*i.(*core.TextPos)))
+		return ptrTo(int(*i))
 	case lsproto.Position:
-		return t.getIndex(t.converters.LineAndCharacterToPosition(t, i.(lsproto.Position)))
+		return t.getIndex(t.converters.LineAndCharacterToPosition(t, i))
 	case *lsproto.Position:
-		return t.getIndex(t.converters.LineAndCharacterToPosition(t, *i.(*lsproto.Position)))
+		return t.getIndex(t.converters.LineAndCharacterToPosition(t, *i))
 	}
 	panic(fmt.Sprintf("getIndex: unsupported type %T", i))
 }

internal/incremental/snapshot.go

@@ -293,10 +293,10 @@ func diagnosticToStringBuilder(diagnostic *ast.Diagnostic, file *ast.SourceFile,
 		)))
 	}
 	if diagnostic.File() != nil {
-		builder.WriteString(fmt.Sprintf("(%d,%d): ", diagnostic.Pos(), diagnostic.Len()))
+		fmt.Fprintf(builder, "(%d,%d): ", diagnostic.Pos(), diagnostic.Len())
 	}
 	builder.WriteString(diagnostic.Category().Name())
-	builder.WriteString(fmt.Sprintf("%d: ", diagnostic.Code()))
+	fmt.Fprintf(builder, "%d: ", diagnostic.Code())
 	builder.WriteString(diagnostic.Message())
 	for _, chain := range diagnostic.MessageChain() {
 		diagnosticToStringBuilder(chain, file, builder)

internal/tsoptions/tsconfigparsing.go

@@ -540,7 +540,7 @@ type CommandLineOptionNameMap map[string]*CommandLineOption
 func (m CommandLineOptionNameMap) Get(name string) *CommandLineOption {
 	opt, ok := m[name]
 	if !ok {
-		opt, _ = m[strings.ToLower(name)]
+		opt = m[strings.ToLower(name)]
 	}
 	return opt
 }