Linter fixes

Author: jgautheron

api.go

@@ -36,7 +36,9 @@ func PutIssueBuffer(issues []Issue) {
 		issues[i].MatchingConst = ""
 		issues[i].Str = ""
 	}
-	IssuePool.Put(issues[:0]) // Reset length but keep capacity
+	// Return the slice to the pool
+	issuesCopy := make([]Issue, 0, cap(issues))
+	IssuePool.Put(&issuesCopy)
 }
 
 // Config contains all configuration options for the goconst analyzer.

benchmarks_test.go

@@ -185,7 +185,11 @@ func BenchmarkParseDirectoryParallel(b *testing.B) {
 	if err != nil {
 		b.Fatalf("Failed to create temp dir: %v", err)
 	}
-	defer os.RemoveAll(tempDir)
+	defer func() {
+		if err := os.RemoveAll(tempDir); err != nil {
+			b.Errorf("Failed to remove temp dir: %v", err)
+		}
+	}()
 
 	// Create subdirectories to test recursive processing
 	subdirCount := 5
@@ -360,10 +364,16 @@ func BenchmarkFileReadingPerformance(b *testing.B) {
 		if _, err := tempFile.Write(content); err != nil {
 			b.Fatalf("Failed to write to temp file: %v", err)
 		}
-		tempFile.Close()
+		if err := tempFile.Close(); err != nil {
+			b.Fatalf("Failed to close temp file: %v", err)
+		}
 
 		// Clean up the temp file when benchmark is done
-		defer os.Remove(fileName)
+		defer func() {
+			if err := os.Remove(fileName); err != nil {
+				b.Errorf("Failed to remove temp file: %v", err)
+			}
+		}()
 
 		// Benchmark the optimized file reading
 		b.Run(fmt.Sprintf("OptimizedIO_%d", size), func(b *testing.B) {

cmd/goconst/main.go

@@ -114,7 +114,9 @@ func run(path string) (bool, error) {
 
 // usage prints the usage documentation to the specified writer.
 func usage(out io.Writer) {
-	fmt.Fprintf(out, usageDoc)
+	if _, err := fmt.Fprint(out, usageDoc); err != nil {
+		log.Printf("Error writing usage doc: %v", err)
+	}
 }
 
 // printOutput formats and displays the analysis results based on the specified output format.
@@ -124,8 +126,8 @@ func printOutput(strs goconst.Strings, consts goconst.Constants, output string)
 	case "json":
 		enc := json.NewEncoder(os.Stdout)
 		err := enc.Encode(struct {
-			Strings   goconst.Strings   `json:"strings,omitEmpty"`
-			Constants goconst.Constants `json:"constants,omitEmpty"`
+			Strings   goconst.Strings   `json:"strings,omitempty"`
+			Constants goconst.Constants `json:"constants,omitempty"`
 		}{
 			strs, consts,
 		})
@@ -161,7 +163,7 @@ func printOutput(strs goconst.Strings, consts goconst.Constants, output string)
 			}
 		}
 	default:
-		return false, fmt.Errorf(`Unsupported output format: %s`, output)
+		return false, fmt.Errorf("unsupported output format: %s", output)
 	}
 	return len(strs)+len(consts) > 0, nil
 }

cmd/goconst/main_test.go

@@ -56,7 +56,11 @@ func TestRun(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create temp directory: %v", err)
 	}
-	defer os.RemoveAll(tempDir)
+	defer func() {
+		if err := os.RemoveAll(tempDir); err != nil {
+			t.Errorf("Failed to remove temp directory: %v", err)
+		}
+	}()
 
 	// Create a test file with known constants and repeated strings
 	testFile := filepath.Join(tempDir, "test.go")
@@ -86,7 +90,11 @@ func TestInvalidOutputFormat(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create temp directory: %v", err)
 	}
-	defer os.RemoveAll(tempDir)
+	defer func() {
+		if err := os.RemoveAll(tempDir); err != nil {
+			t.Errorf("Failed to remove temp directory: %v", err)
+		}
+	}()
 
 	testFile := filepath.Join(tempDir, "simple.go")
 	testContent := `package test
@@ -122,7 +130,11 @@ func TestOutputFormatting(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create temp directory: %v", err)
 	}
-	defer os.RemoveAll(tempDir)
+	defer func() {
+		if err := os.RemoveAll(tempDir); err != nil {
+			t.Errorf("Failed to remove temp directory: %v", err)
+		}
+	}()
 
 	testFile := filepath.Join(tempDir, "format.go")
 	testContent := `package test
@@ -163,7 +175,9 @@ func test() {
 
 		// Run analysis
 		hasIssues, err := run(tempDir)
-		w.Close()
+		if err := w.Close(); err != nil {
+			t.Errorf("Failed to close writer: %v", err)
+		}
 		out, _ := io.ReadAll(r)
 		output := string(out)
 
@@ -209,7 +223,9 @@ func test() {
 
 		// Run analysis
 		hasIssues, err := run(tempDir)
-		w.Close()
+		if err := w.Close(); err != nil {
+			t.Errorf("Failed to close writer: %v", err)
+		}
 		out, _ := io.ReadAll(r)
 		output := string(out)
 
@@ -241,7 +257,11 @@ func TestGroupedOutput(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create temp directory: %v", err)
 	}
-	defer os.RemoveAll(tempDir)
+	defer func() {
+		if err := os.RemoveAll(tempDir); err != nil {
+			t.Errorf("Failed to remove temp directory: %v", err)
+		}
+	}()
 
 	testFile := filepath.Join(tempDir, "grouped.go")
 	testContent := `package test
@@ -279,7 +299,9 @@ func test() {
 
 		// Run analysis
 		_, err := run(tempDir)
-		w.Close()
+		if err := w.Close(); err != nil {
+			t.Errorf("Failed to close writer: %v", err)
+		}
 		out, _ := io.ReadAll(r)
 		output := string(out)
 

parser.go

@@ -95,7 +95,8 @@ func GetByteBuffer() []byte {
 
 // PutByteBuffer returns a byte buffer to the pool
 func PutByteBuffer(buf []byte) {
-	ByteBufferPool.Put(buf[:0]) // Reset length but keep capacity
+	bufCopy := make([]byte, 0, cap(buf))
+	ByteBufferPool.Put(&bufCopy)
 }
 
 // GetStringBuffer retrieves a string slice from the pool
@@ -105,7 +106,8 @@ func GetStringBuffer() []string {
 
 // PutStringBuffer returns a string slice to the pool
 func PutStringBuffer(slice []string) {
-	StringBufferPool.Put(slice[:0]) // Reset length but keep capacity
+	sliceCopy := make([]string, 0, cap(slice))
+	StringBufferPool.Put(&sliceCopy)
 }
 
 // GetExtendedPosBuffer retrieves an ExtendedPos slice from the pool
@@ -115,7 +117,8 @@ func GetExtendedPosBuffer() []ExtendedPos {
 
 // PutExtendedPosBuffer returns an ExtendedPos slice to the pool
 func PutExtendedPosBuffer(slice []ExtendedPos) {
-	ExtendedPosPool.Put(slice[:0]) // Reset length but keep capacity
+	sliceCopy := make([]ExtendedPos, 0, cap(slice))
+	ExtendedPosPool.Put(&sliceCopy)
 }
 
 const (
@@ -596,7 +599,11 @@ func (p *Parser) readFileEfficiently(path string) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer f.Close()
+	defer func() {
+		if closeErr := f.Close(); closeErr != nil {
+			log.Printf("Error closing file: %v", closeErr)
+		}
+	}()
 
 	// Get file size to allocate buffer exactly once
 	info, err := f.Stat()
@@ -730,88 +737,6 @@ func (p *Parser) ProcessResults() {
 	}
 }
 
-func (p *Parser) parseDir(dir string) error {
-	fset := token.NewFileSet()
-	pkgs, err := parser.ParseDir(fset, dir, func(info os.FileInfo) bool {
-		valid, name := true, info.Name()
-
-		if p.ignoreTests {
-			if strings.HasSuffix(name, testSuffix) {
-				valid = false
-			}
-		}
-
-		if p.ignoreRegex != nil {
-			if p.ignoreRegex.MatchString(dir + name) {
-				valid = false
-			}
-		} else if len(p.ignore) != 0 {
-			// Fallback to non-compiled regex if compilation failed
-			match, err := regexp.MatchString(p.ignore, dir+name)
-			if err != nil {
-				log.Fatal(err)
-				return true
-			}
-			if match {
-				valid = false
-			}
-		}
-
-		return valid
-	}, 0)
-	if err != nil {
-		return err
-	}
-
-	// Process files concurrently with a workgroup
-	var wg sync.WaitGroup
-
-	// Create a flattened list of all files
-	type fileInfo struct {
-		pkg      string
-		fileName string
-		file     *ast.File
-	}
-
-	// Pre-allocate the slice with expected capacity to avoid resizing
-	files := make([]fileInfo, 0, len(pkgs)*10) // Assuming average of 10 files per package
-	for pkgName, pkg := range pkgs {
-		for fn, f := range pkg.Files {
-			files = append(files, fileInfo{
-				pkg:      pkgName,
-				fileName: fn,
-				file:     f,
-			})
-		}
-	}
-
-	// Process files concurrently using a semaphore to limit concurrency
-	sem := make(chan struct{}, p.maxConcurrency)
-	for _, fi := range files {
-		wg.Add(1)
-		sem <- struct{}{} // acquire semaphore
-
-		go func(pkg, fn string, f *ast.File) {
-			defer func() {
-				<-sem // release semaphore
-				wg.Done()
-			}()
-
-			// Create a separate visitor for this file with pre-compiled regex
-			ast.Walk(&treeVisitor{
-				fileSet:     fset,
-				packageName: pkg,
-				fileName:    fn,
-				p:           p,
-				ignoreRegex: p.ignoreStringsRegex,
-			}, f)
-		}(fi.pkg, fi.fileName, fi.file)
-	}
-
-	wg.Wait()
-	return nil
-}
-
 // Strings maps string literals to their positions in the code.
 type Strings map[string][]ExtendedPos
 

parser_test.go

@@ -209,7 +209,11 @@ func TestParseTree(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create temp directory: %v", err)
 	}
-	defer os.RemoveAll(tempDir)
+	defer func() {
+		if err := os.RemoveAll(tempDir); err != nil {
+			t.Errorf("Failed to remove temp directory: %v", err)
+		}
+	}()
 
 	// Create a test file with known constants and repeated strings
 	testFile := filepath.Join(tempDir, "test.go")
@@ -453,7 +457,11 @@ func BenchmarkFileTraversal(b *testing.B) {
 	if err != nil {
 		b.Fatalf("Failed to create temp directory: %v", err)
 	}
-	defer os.RemoveAll(tempDir)
+	defer func() {
+		if err := os.RemoveAll(tempDir); err != nil {
+			b.Errorf("Failed to remove temp directory: %v", err)
+		}
+	}()
 
 	// Create a nested directory structure with test files
 	createBenchmarkFiles(b, tempDir, 5, 10, 5)
@@ -666,7 +674,11 @@ func BenchmarkFileReading(b *testing.B) {
 		if err != nil {
 			b.Fatalf("Failed to create temp file: %v", err)
 		}
-		defer os.Remove(tempFile.Name())
+		defer func() {
+			if err := os.Remove(tempFile.Name()); err != nil {
+				b.Errorf("Failed to remove temp file: %v", err)
+			}
+		}()
 		tempFiles[i] = tempFile.Name()
 
 		// Write a large Go file for testing

visitor.go

@@ -8,17 +8,13 @@ import (
 	"strings"
 )
 
-// treeVisitor carries the package name and file name
-// for passing it to the imports map, and the fileSet for
-// retrieving the token.Position.
+// treeVisitor is used to walk the AST and find strings that could be constants.
 type treeVisitor struct {
-	p                     *Parser
-	fileSet               *token.FileSet
-	packageName, fileName string
-	// Pre-compiled regex for early filtering
+	fileSet     *token.FileSet
+	packageName string
+	fileName    string
+	p          *Parser
 	ignoreRegex *regexp.Regexp
-	// Reusable buffer to avoid allocations when unquoting strings
-	buffer []byte
 }
 
 // Visit browses the AST tree for strings that could be potentially