fix: fix unstable error count (#133)

Author: hardfist

cmd/rslint/api.go

@@ -3,8 +3,6 @@ package main
 import (
 	"fmt"
 	"os"
-	"slices"
-	"strings"
 	"sync"
 
 	"github.com/microsoft/typescript-go/shim/ast"
@@ -174,42 +172,6 @@ func (h *IPCHandler) HandleLint(req api.LintRequest) (*api.LintResponse, error)
 		programs = append(programs, program)
 	}
 
-	// Find source files from all programs
-	files := []*ast.SourceFile{}
-
-	// If specific files are provided, use those
-	if len(req.Files) > 0 {
-		for _, filePath := range req.Files {
-			absPath := tspath.ResolvePath(configDirectory, filePath)
-			// Try to find the file in any of the programs
-			for _, program := range programs {
-				sourceFile := program.GetSourceFile(absPath)
-				if sourceFile != nil {
-					files = append(files, sourceFile)
-					break // Found in this program, no need to check others
-				}
-			}
-		}
-	} else {
-		// Otherwise use all source files from all programs
-		for _, program := range programs {
-			for _, file := range program.SourceFiles() {
-				p := string(file.Path())
-				if strings.Contains(p, "/node_modules/") {
-					continue
-				}
-				// skip bundled files
-				if strings.Contains(p, "bundled:") {
-					continue
-				}
-				files = append(files, file)
-			}
-		}
-	}
-	slices.SortFunc(files, func(a *ast.SourceFile, b *ast.SourceFile) int {
-		return len(b.Text()) - len(a.Text())
-	})
-
 	// Collect diagnostics
 	var diagnostics []api.Diagnostic
 	var diagnosticsLock sync.Mutex
@@ -249,10 +211,10 @@ func (h *IPCHandler) HandleLint(req api.LintRequest) (*api.LintResponse, error)
 	}
 
 	// Run linter
-	err = linter.RunLinter(
+	lintedFilesCount, err := linter.RunLinter(
 		programs,
 		false, // Don't use single-threaded mode for IPC
-		files,
+		nil,
 		func(sourceFile *ast.SourceFile) []linter.ConfiguredRule {
 			return utils.Map(rulesWithOptions, func(r RuleWithOption) linter.ConfiguredRule {
 
@@ -277,7 +239,7 @@ func (h *IPCHandler) HandleLint(req api.LintRequest) (*api.LintResponse, error)
 	return &api.LintResponse{
 		Diagnostics: diagnostics,
 		ErrorCount:  errorsCount,
-		FileCount:   len(files),
+		FileCount:   int(lintedFilesCount),
 		RuleCount:   len(rulesWithOptions),
 	}, nil
 }

cmd/rslint/cmd.go

@@ -10,9 +10,7 @@ import (
 	"runtime"
 	"runtime/pprof"
 	"runtime/trace"
-	"slices"
 	"strconv"
-	"strings"
 	"sync"
 	"time"
 	"unicode"
@@ -432,23 +430,6 @@ func runCMD() int {
 
 	}
 
-	files := []*ast.SourceFile{}
-	for _, program := range programs {
-		cwdPath := string(tspath.ToPath("", currentDirectory, program.Host().FS().UseCaseSensitiveFileNames()).EnsureTrailingDirectorySeparator())
-		for _, file := range program.SourceFiles() {
-			p := string(file.Path())
-			if strings.Contains(p, "/node_modules/") {
-				continue
-			}
-			if _, matched := strings.CutPrefix(p, cwdPath); matched {
-				files = append(files, file)
-			}
-		}
-		slices.SortFunc(files, func(a *ast.SourceFile, b *ast.SourceFile) int {
-			return len(b.Text()) - len(a.Text())
-		})
-	}
-
 	var wg sync.WaitGroup
 
 	diagnosticsChan := make(chan rule.RuleDiagnostic, 4096)
@@ -494,10 +475,10 @@ func runCMD() int {
 		}
 	}()
 
-	err = linter.RunLinter(
+	lintedfileCount, err := linter.RunLinter(
 		programs,
 		singleThreaded,
-		files,
+		nil,
 		func(sourceFile *ast.SourceFile) []linter.ConfiguredRule {
 			activeRules := rslintconfig.GlobalRuleRegistry.GetEnabledRules(rslintConfig, sourceFile.FileName())
 			return activeRules
@@ -572,7 +553,7 @@ func runCMD() int {
 	}
 
 	filesText := "files"
-	if len(files) == 1 {
+	if lintedfileCount == 1 {
 		filesText = "file"
 	}
 	threadsCount := 1
@@ -593,7 +574,7 @@ func runCMD() int {
 				warningsColorFunc("%d", warningsCount),
 				warningsText,
 				colors.DimText(""),
-				colors.BoldText("%d", len(files)),
+				colors.BoldText("%d", lintedfileCount),
 				filesText,
 				colors.BoldText("%v", time.Since(timeBefore).Round(time.Millisecond)),
 				colors.BoldText("%d", threadsCount),
@@ -610,7 +591,7 @@ func runCMD() int {
 				warningsColorFunc("%d", warningsCount),
 				warningsText,
 				colors.DimText(""),
-				colors.BoldText("%d", len(files)),
+				colors.BoldText("%d", lintedfileCount),
 				filesText,
 				colors.BoldText("%v", time.Since(timeBefore).Round(time.Millisecond)),
 				colors.BoldText("%d", threadsCount),

cmd/rslint/lsp.go

@@ -352,29 +352,6 @@ func runLintWithPrograms(uri lsproto.DocumentUri, programs []*compiler.Program,
 	// Initialize rule registry with all available rules
 	config.RegisterAllTypeSriptEslintPluginRules()
 
-	// Find all source files from all programs, prioritizing the file matching the URI
-	var targetFile *ast.SourceFile
-	uriPath := uriToPath(string(uri))
-
-	for _, program := range programs {
-		for _, file := range program.SourceFiles() {
-
-			if file.FileName() == uriPath {
-				targetFile = file
-			}
-		}
-	}
-
-	// If we found a target file, prioritize it, otherwise use all files
-	var files []*ast.SourceFile
-	if targetFile != nil {
-		files = []*ast.SourceFile{targetFile}
-	} else {
-		log.Printf("Target file not found for URI %s, processing all files", uri)
-	}
-
-	log.Printf("Processing %d files from %d programs", len(files), len(programs))
-
 	// Collect diagnostics
 	var diagnostics []rule.RuleDiagnostic
 	var diagnosticsLock sync.Mutex
@@ -385,12 +362,11 @@ func runLintWithPrograms(uri lsproto.DocumentUri, programs []*compiler.Program,
 		defer diagnosticsLock.Unlock()
 		diagnostics = append(diagnostics, d)
 	}
-
 	// Run linter with all programs using rule registry
-	err := linter.RunLinter(
+	_, err := linter.RunLinter(
 		programs,
 		false, // Don't use single-threaded mode for LSP
-		files,
+		nil,
 		func(sourceFile *ast.SourceFile) []linter.ConfiguredRule {
 			activeRules := config.GlobalRuleRegistry.GetEnabledRules(rslintConfig, sourceFile.FileName())
 			return activeRules