Add modernize linter to .golangci.yml; apply fixes (#1200)

* Add modernize linter to .golangci.yml; apply fixes

Signed-off-by: egibs <[email protected]>

* Bump golangci-lint to v2.6.1 for good measure

Signed-off-by: egibs <[email protected]>

---------

Signed-off-by: egibs <[email protected]>

Author: egibs

.golangci.yml

@@ -26,6 +26,7 @@ linters:
     - ineffassign
     - makezero
     - misspell
+    - modernize
     - nakedret
     - nestif
     - nilerr

Makefile

@@ -42,7 +42,7 @@ LINTERS :=
 FIXERS :=
 
 GOLANGCI_LINT_CONFIG := $(LINT_ROOT)/.golangci.yml
-GOLANGCI_LINT_VERSION ?= v2.6.0
+GOLANGCI_LINT_VERSION ?= v2.6.1
 GOLANGCI_LINT_BIN := $(LINT_ROOT)/out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH)
 $(GOLANGCI_LINT_BIN):
 	mkdir -p $(LINT_ROOT)/out/linters

pkg/compile/compile_test.go

@@ -267,8 +267,7 @@ func BenchmarkRecursive(b *testing.B) {
 	ctx := context.Background()
 	fss := getAllRuleFS()
 
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		rules, err := Recursive(ctx, fss)
 		if err != nil {
 			b.Fatalf("Compilation failed: %v", err)
@@ -284,8 +283,7 @@ func BenchmarkRecursiveCachedFirstRun(b *testing.B) {
 	ctx := context.Background()
 	fss := getAllRuleFS()
 
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		rules, err := Recursive(ctx, fss)
 		if err != nil {
 			b.Fatalf("Compilation failed: %v", err)
@@ -306,8 +304,7 @@ func BenchmarkRecursiveCachedSubsequentRuns(b *testing.B) {
 		b.Fatalf("Failed to populate cache: %v", err)
 	}
 
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		rules, err := RecursiveCached(ctx, fss)
 		if err != nil {
 			b.Fatalf("Cached compilation failed: %v", err)
@@ -323,8 +320,7 @@ func BenchmarkGetRulesHash(b *testing.B) {
 	ctx := context.Background()
 	realFS := getAllRuleFS()
 
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		hash, err := getRulesHash(ctx, realFS)
 		if err != nil {
 			b.Fatalf("Hash calculation failed: %v", err)
@@ -349,7 +345,7 @@ func BenchmarkCacheOperations(b *testing.B) {
 	cacheFile := filepath.Join(tempDir, "benchmark-rules.cache")
 
 	b.Run("Save", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
+		for i := 0; b.Loop(); i++ {
 			testFile := filepath.Join(tempDir, "test-"+string(rune('a'+i%26))+".cache")
 			err := saveCachedRules(rules, testFile)
 			if err != nil {
@@ -364,7 +360,7 @@ func BenchmarkCacheOperations(b *testing.B) {
 	}
 
 	b.Run("Load", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			loadedRules, err := loadCachedRules(cacheFile)
 			if err != nil {
 				b.Fatalf("Failed to load rules: %v", err)
@@ -382,7 +378,7 @@ func BenchmarkCompareCompilation(b *testing.B) {
 	fss := getAllRuleFS()
 
 	b.Run("Uncached", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			rules, err := Recursive(ctx, fss)
 			if err != nil {
 				b.Fatalf("Uncached compilation failed: %v", err)
@@ -394,7 +390,7 @@ func BenchmarkCompareCompilation(b *testing.B) {
 	})
 
 	b.Run("CachedFirstRun", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			rules, err := Recursive(ctx, fss)
 			if err != nil {
 				b.Fatalf("Compilation failed: %v", err)
@@ -414,7 +410,7 @@ func BenchmarkCompareCompilation(b *testing.B) {
 		}
 
 		b.ResetTimer()
-		for i := 0; i < b.N; i++ {
+		for b.Loop() {
 			rules, err := RecursiveCached(ctx, fss)
 			if err != nil {
 				b.Fatalf("Cached compilation failed: %v", err)

pkg/render/tea.go

@@ -237,19 +237,19 @@ func (m *mainModel) performSearch() {
 		if strings.Contains(lowerLine, term) {
 			foundMatch = true
 			lastIndex := 0
-			resultLine := ""
+			var resultLine strings.Builder
 			for {
 				index := strings.Index(strings.ToLower(line[lastIndex:]), term)
 				if index == -1 {
-					resultLine += line[lastIndex:]
+					resultLine.WriteString(line[lastIndex:])
 					break
 				}
-				resultLine += line[lastIndex : lastIndex+index]
+				resultLine.WriteString(line[lastIndex : lastIndex+index])
 				matchText := line[lastIndex+index : lastIndex+index+len(term)]
-				resultLine += matchStyle.Render(matchText)
+				resultLine.WriteString(matchStyle.Render(matchText))
 				lastIndex += index + len(term)
 			}
-			matchedLines = append(matchedLines, resultLine)
+			matchedLines = append(matchedLines, resultLine.String())
 		} else if foundMatch {
 			matchedLines = append(matchedLines, line)
 			foundMatch = false