Merge pull request #304 from goplus/main

InitGopPkg fix: import if pkg uncomplete
goplus · Nov 1, 2023 · 8e1e74a · 8e1e74a
2 parents 04e1fe1 + 6691bec
commit 8e1e74a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/import.go b/import.go
@@ -220,15 +220,18 @@ func NewContext() *Context {
 }
 
 // InitGopPkg initializes a Go+ packages.
-func (p *Context) InitGopPkg(pkgImp *types.Package) {
+func (p *Context) InitGopPkg(importer types.Importer, pkgImp *types.Package) {
 	pkgPath := pkgImp.Path()
 	if stdPkg(pkgPath) || p.chkGopImports[pkgPath] {
 		return
 	}
+	if !pkgImp.Complete() {
+		importer.Import(pkgPath)
+	}
 	initThisGopPkg(pkgImp)
 	p.chkGopImports[pkgPath] = true
 	for _, imp := range pkgImp.Imports() {
-		p.InitGopPkg(imp)
+		p.InitGopPkg(importer, imp)
 	}
 }
 

diff --git a/internal/foo/foo.go b/internal/foo/foo.go
@@ -13,10 +13,18 @@
 
 package foo
 
+import (
+	"github.com/goplus/gox/internal/bar"
+)
+
 const (
 	GopPackage = true // to indicate this is a Go+ package
 )
 
+func CallBar() *bar.Game {
+	return nil
+}
+
 // -----------------------------------------------------------------------------
 
 type nodeSetIt struct {

diff --git a/package.go b/package.go
@@ -167,7 +167,7 @@ func (p *File) importPkg(this *Package, pkgPath string, src ast.Node) *PkgRef {
 			}
 			panic(e)
 		} else {
-			this.ctx.InitGopPkg(pkgImp)
+			this.ctx.InitGopPkg(this.imp, pkgImp)
 		}
 		pkgImport = &PkgRef{Types: pkgImp}
 		p.importPkgs[pkgPath] = pkgImport