gopbuild: fix loader gop

goplus · Mar 26, 2023 · c4c4baf · c4c4baf
1 parent 557bbeb
commit c4c4baf
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/gopbuild/build.go b/gopbuild/build.go
@@ -134,6 +134,7 @@ func (p *Package) ToAst() *goast.File {
 type Context struct {
 	ctx  *igop.Context
 	fset *token.FileSet
+	gop  igop.Loader
 }
 
 func IsClass(ext string) (isProj bool, ok bool) {
@@ -144,7 +145,7 @@ func IsClass(ext string) (isProj bool, ok bool) {
 }
 
 func NewContext(ctx *igop.Context) *Context {
-	return &Context{ctx: ctx, fset: token.NewFileSet()}
+	return &Context{ctx: ctx, fset: token.NewFileSet(), gop: igop.NewTypesLoader(ctx, 0)}
 }
 
 func isGopPackage(path string) bool {
@@ -157,6 +158,9 @@ func isGopPackage(path string) bool {
 }
 
 func (c *Context) Import(path string) (*types.Package, error) {
+	if isGopPackage(path) {
+		return c.gop.Import(path)
+	}
 	return c.ctx.Loader.Import(path)
 }