close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal/imports: actually cache resolvers 

I forgot to actually save the resolver instances...

Change-Id: Ieff4f22d29038895dc15be97491476f414544a5c
Reviewed-on: https://go-review.googlesource.com/c/tools/+/181337
Run-TryBot: Heschi Kreinick <heschi@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Cottrell <iancottrell@google.com>
This commit is contained in:
Heschi Kreinick 2019-06-07 16:25:48 -04:00
parent e6ce0ddf03
commit e9a20a1396
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/imports/fix.go
View File

@ -539,14 +539,17 @@ func (e *ProcessEnv) getResolver() resolver {
return e.resolver return e.resolver
} }
if e.ForceGoPackages { if e.ForceGoPackages {
return &goPackagesResolver{env: e} e.resolver = &goPackagesResolver{env: e}
return e.resolver
} }
out, err := e.invokeGo("env", "GOMOD") out, err := e.invokeGo("env", "GOMOD")
if err != nil || len(bytes.TrimSpace(out.Bytes())) == 0 { if err != nil || len(bytes.TrimSpace(out.Bytes())) == 0 {
return &gopathResolver{env: e} e.resolver = &gopathResolver{env: e}
return e.resolver
} }
return &moduleResolver{env: e} e.resolver = &moduleResolver{env: e}
return e.resolver
} }
func (e *ProcessEnv) newPackagesConfig(mode packages.LoadMode) *packages.Config { func (e *ProcessEnv) newPackagesConfig(mode packages.LoadMode) *packages.Config {