Skip to content

monoimporter: fix package import attempt order #70

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
hugelgupf merged 1 commit into from
Apr 6, 2022
Merged

monoimporter: fix package import attempt order #70

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: 19 additions & 5 deletions src/pkg/monoimporter/monoimporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,25 @@ func (i *Importer) Import(importPath string) (*types.Package, error) {
return pkg, nil
}

finders := []finder{
i.mapped,
i.unmapped,
i.stdlib,
i.stdlibZip,
var finders []finder
// stdlibZip and mapped do exact file matching based on
// importPath, they never return the wrong package.
if i.stdlibZip != nil {
finders = append(finders, i.stdlibZip)
}
if i.mapped != nil {
finders = append(finders, i.mapped)
}
// stdlib and unmapped match based on file path suffix, so they
// may return the wrong package. Match to stdlib first, because
// stdlib contains shorter paths. (E.g. "errors" can match to
// either "errors" in stdlib or "golang.org/x/crypto/errors"
// but it should match to stdlib)
if i.stdlib != nil {
finders = append(finders, i.stdlib)
}
if i.unmapped != nil {
finders = append(finders, i.unmapped)
}
file := find(finders, importPath)
if file == nil {
Expand Down