Skip to content

Add LoadPackages and small cleanups #13

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
cristaloleg merged 1 commit into from
Feb 20, 2023
Merged

Add LoadPackages and small cleanups #13

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
46 changes: 37 additions & 9 deletions pkgload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,46 @@ type Unit struct {
// If all unit fields are nil, method panics.
// This should never happen for properly-loaded units.
func (u *Unit) NonNil() *packages.Package {
if u.Base != nil {
switch {
case u.Base != nil:
return u.Base
}
if u.Test != nil {
case u.Test != nil:
return u.Test
}
if u.ExternalTest != nil {
case u.ExternalTest != nil:
return u.ExternalTest
}
if u.TestBinary != nil {
case u.TestBinary != nil:
return u.TestBinary
default:
panic("all Unit fields are nil")
}
panic("all unit fields are nil")
}

// LoadPackages with a given config and patterns.
func LoadPackages(cfg *packages.Config, patterns []string) ([]*packages.Package, error) {
pkgs, err := packages.Load(cfg, patterns...)
if err != nil {
return nil, err
}

result := pkgs[:0]
VisitUnits(pkgs, func(u *Unit) {
if u.ExternalTest != nil {
result = append(result, u.ExternalTest)
}

switch {
// Prefer tests to the base package, if present.
case u.Test != nil:
result = append(result, u.Test)
case u.Base != nil:
result = append(result, u.Base)
}
})

sort.SliceStable(pkgs, func(i, j int) bool {
return pkgs[i].PkgPath < pkgs[j].PkgPath
})
return result, nil
}

// Deduplicate returns a copy of pkgs slice where all duplicated
Expand All @@ -74,6 +101,7 @@ func Deduplicate(pkgs []*packages.Package) []*packages.Package {

pkgSet := make(map[pkgKey]*packages.Package)
for _, pkg := range pkgs {
sort.Strings(pkg.GoFiles)
key := pkgKey{
id: pkg.ID,
name: pkg.Name,
Expand Down Expand Up @@ -150,7 +178,7 @@ func VisitUnits(pkgs []*packages.Package, visit func(*Unit)) {
for _, u := range units {
unitList = append(unitList, u)
}
sort.Slice(unitList, func(i, j int) bool {
sort.SliceStable(unitList, func(i, j int) bool {
return unitList[i].NonNil().PkgPath < unitList[j].NonNil().PkgPath
})
for _, u := range unitList {
Expand Down