Update golangci-lint, fix issues, modernize (#1981)

Author: jakebailey

.custom-gcl.yml

@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=https://golangci-lint.run/jsonschema/custom-gcl.jsonschema.json
 
-version: v2.5.0
+version: v2.6.0
 
 destination: ./_tools
 

.golangci.yml

@@ -33,6 +33,7 @@ linters:
     - makezero
     - mirror
     - misspell
+    - modernize
     - musttag
     - nakedret
     - nolintlint

internal/ast/ast.go

@@ -24,7 +24,7 @@ func visit(v Visitor, node *Node) bool {
 }
 
 func visitNodes(v Visitor, nodes []*Node) bool {
-	for _, node := range nodes {
+	for _, node := range nodes { //nolint:modernize
 		if v(node) {
 			return true
 		}

internal/binder/binder.go

@@ -2640,7 +2640,7 @@ func isNarrowableReference(node *ast.Node) bool {
 
 func hasNarrowableArgument(expr *ast.Node) bool {
 	call := expr.AsCallExpression()
-	for _, argument := range call.Arguments.Nodes {
+	for _, argument := range call.Arguments.Nodes { //nolint:modernize
 		if containsNarrowableReference(argument) {
 			return true
 		}

internal/checker/grammarchecks.go

@@ -900,7 +900,7 @@ func (c *Checker) checkGrammarHeritageClause(node *ast.HeritageClause) bool {
 		return c.grammarErrorAtPos(node.AsNode(), types.Pos(), 0, diagnostics.X_0_list_cannot_be_empty, listType)
 	}
 
-	for _, node := range types.Nodes {
+	for _, node := range types.Nodes { //nolint:modernize
 		if c.checkGrammarExpressionWithTypeArguments(node) {
 			return true
 		}

internal/checker/mapper.go

@@ -1,6 +1,10 @@
 package checker
 
-import "github.com/microsoft/typescript-go/internal/core"
+import (
+	"slices"
+
+	"github.com/microsoft/typescript-go/internal/core"
+)
 
 // TypeMapperKind
 
@@ -158,10 +162,8 @@ func newArrayToSingleTypeMapper(sources []*Type, target *Type) *TypeMapper {
 }
 
 func (m *ArrayToSingleTypeMapper) Map(t *Type) *Type {
-	for _, s := range m.sources {
-		if t == s {
-			return m.target
-		}
+	if slices.Contains(m.sources, t) {
+		return m.target
 	}
 	return t
 }

internal/checker/nodebuilderimpl.go

@@ -2034,10 +2034,8 @@ func (b *NodeBuilderImpl) shouldUsePlaceholderForProperty(propertySymbol *ast.Sy
 		return false
 	}
 	// (1)
-	for _, elem := range b.ctx.reverseMappedStack {
-		if elem == propertySymbol {
-			return true
-		}
+	if slices.Contains(b.ctx.reverseMappedStack, propertySymbol) {
+		return true
 	}
 	// (2)
 	if len(b.ctx.reverseMappedStack) > 0 {

internal/compiler/fileloader.go

@@ -631,16 +631,22 @@ func getLibraryNameFromLibFileName(libFileName string) string {
 	//                      lib.dom.iterable.d.ts -> @typescript/lib-dom/iterable
 	//                      lib.es2015.symbol.wellknown.d.ts -> @typescript/lib-es2015/symbol-wellknown
 	components := strings.Split(libFileName, ".")
-	var path string
+	var path strings.Builder
+	path.WriteString("@typescript/lib-")
 	if len(components) > 1 {
-		path = components[1]
+		path.WriteString(components[1])
 	}
 	i := 2
 	for i < len(components) && components[i] != "" && components[i] != "d" {
-		path += core.IfElse(i == 2, "/", "-") + components[i]
+		if i == 2 {
+			path.WriteByte('/')
+		} else {
+			path.WriteByte('-')
+		}
+		path.WriteString(components[i])
 		i++
 	}
-	return "@typescript/lib-" + path
+	return path.String()
 }
 
 func getInferredLibraryNameResolveFrom(options *core.CompilerOptions, currentDirectory string, libFileName string) string {

internal/compiler/projectreferenceparser.go

@@ -1,6 +1,8 @@
 package compiler
 
 import (
+	"maps"
+
 	"github.com/microsoft/typescript-go/internal/collections"
 	"github.com/microsoft/typescript-go/internal/core"
 	"github.com/microsoft/typescript-go/internal/tsoptions"
@@ -91,12 +93,8 @@ func (p *projectReferenceParser) initMapperWorker(tasks []*projectReferenceParse
 		if task.resolved == nil || p.loader.projectReferenceFileMapper.opts.Config.ConfigFile == task.resolved.ConfigFile {
 			continue
 		}
-		for key, value := range task.resolved.SourceToProjectReference() {
-			p.loader.projectReferenceFileMapper.sourceToProjectReference[key] = value
-		}
-		for key, value := range task.resolved.OutputDtsToProjectReference() {
-			p.loader.projectReferenceFileMapper.outputDtsToProjectReference[key] = value
-		}
+		maps.Copy(p.loader.projectReferenceFileMapper.sourceToProjectReference, task.resolved.SourceToProjectReference())
+		maps.Copy(p.loader.projectReferenceFileMapper.outputDtsToProjectReference, task.resolved.OutputDtsToProjectReference())
 		if p.loader.projectReferenceFileMapper.opts.canUseProjectReferenceSource() {
 			declDir := task.resolved.CompilerOptions().DeclarationDir
 			if declDir == "" {

internal/core/core.go

@@ -160,7 +160,7 @@ func Same[T any](s1 []T, s2 []T) bool {
 }
 
 func Some[T any](slice []T, f func(T) bool) bool {
-	for _, value := range slice {
+	for _, value := range slice { //nolint:modernize
 		if f(value) {
 			return true
 		}
@@ -407,12 +407,9 @@ func ComputeECMALineStartsSeq(text string) iter.Seq[TextPos] {
 }
 
 func PositionToLineAndCharacter(position int, lineStarts []TextPos) (line int, character int) {
-	line = sort.Search(len(lineStarts), func(i int) bool {
+	line = max(sort.Search(len(lineStarts), func(i int) bool {
 		return int(lineStarts[i]) > position
-	}) - 1
-	if line < 0 {
-		line = 0
-	}
+	})-1, 0)
 	return line, position - int(lineStarts[line])
 }