Skip to content

chore(coverage): simplify findFile #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2025
Merged

chore(coverage): simplify findFile #164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions pkg/testcoverage/coverage/cover.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,9 @@ func findFiles(profiles []*cover.Profile, prefix string) (map[string]fileInfo, e
return result, nil
}

//nolint:maintidx // relax
func findFileCreator() func(file, prefix string) (string, string, bool) { // coverage-ignore
func findFileCreator() func(file, prefix string) (string, string, bool) {
cache := make(map[string]*build.Package)
files := []string(nil)

findRelative := func(file, prefix string) (string, string, bool) {
noPrefixName := stripPrefix(file, prefix)
_, err := os.Stat(noPrefixName)

return noPrefixName, noPrefixName, err == nil
}
files := listAllFiles(".")

findBuildImport := func(file string) (string, string, bool) {
dir, file := filepath.Split(file)
Expand All @@ -156,22 +148,14 @@ func findFileCreator() func(file, prefix string) (string, string, bool) { // cov
}

findWalk := func(file, prefix string) (string, string, bool) {
if files == nil {
files = listAllFiles("./")
}

noPrefixName := stripPrefix(file, prefix)
f, found := hasFile(files, noPrefixName)

return path.NormalizeForOS(f), noPrefixName, found
}

return func(file, prefix string) (string, string, bool) {
if fPath, fNoPrefix, found := findRelative(file, prefix); found {
return fPath, fNoPrefix, found
}

if fPath, fNoPrefix, found := findWalk(file, prefix); found {
if fPath, fNoPrefix, found := findWalk(file, prefix); found { // coverage-ignore
return fPath, fNoPrefix, found
}

Expand All @@ -184,7 +168,7 @@ func findFileCreator() func(file, prefix string) (string, string, bool) { // cov
}

func listAllFiles(rootDir string) []string {
var files []string
files := make([]string, 0)

//nolint:errcheck // error ignored because there is fallback mechanism for finding files
filepath.Walk(rootDir, func(file string, info os.FileInfo, err error) error {
Expand Down
Loading