fixes

Author: wzshiming

importer.go

@@ -39,11 +39,6 @@ func NewImporter(options ...Option) *Importer {
 	return i
 }
 
-// Import returns go package scope
-func (i *Importer) Import(path, src string) (Type, error) {
-	return i.importParse(path, src)
-}
-
 // ImportPackage returns go package scope
 func (i *Importer) ImportPackage(path string, pkg *ast.Package) (Type, error) {
 	np := newParser(i, i.isCommentLocator, path, false)
@@ -79,7 +74,14 @@ func (i *Importer) ImportBuild(path string, src string) (*build.Package, error)
 	src = filepath.Clean(src)
 	gopath := filepath.Join(i.ctx.GOPATH, "src")
 	rsrc := src
-	if !filepath.HasPrefix(src, gopath) {
+
+	if filepath.HasPrefix(src, ".") {
+		pwd, err := os.Getwd()
+		if err != nil {
+			return nil, err
+		}
+		rsrc = filepath.Join(pwd, src)
+	} else if !filepath.HasPrefix(src, gopath) {
 		rsrc = filepath.Join(gopath, src)
 	}
 	k := path + " " + rsrc
@@ -88,22 +90,31 @@ func (i *Importer) ImportBuild(path string, src string) (*build.Package, error)
 	}
 	imp, err := i.ctx.Import(path, rsrc, 0)
 	if err != nil {
-		i.errorHandler(err)
+		i.appendError(err)
 		return nil, err
 	}
 	i.bufBuild[k] = imp
 	return imp, nil
 }
 
-func (i *Importer) importName(path string, src string) (name string, goroot bool) {
+// appendError append error
+func (i *Importer) appendError(err error) {
+	if i.errorHandler != nil {
+		i.errorHandler(err)
+	}
+}
+
+// ImportName returns go package name
+func (i *Importer) ImportName(path string, src string) (name string, goroot bool) {
 	imp, err := i.ImportBuild(path, src)
 	if err != nil {
 		return "", false
 	}
 	return imp.Name, imp.Goroot
 }
 
-func (i *Importer) importParse(path string, src string) (Type, error) {
+// Import returns go package scope
+func (i *Importer) Import(path string, src string) (Type, error) {
 	imp, err := i.ImportBuild(path, src)
 	if err != nil {
 		return nil, err
@@ -125,7 +136,7 @@ func (i *Importer) importParse(path string, src string) (Type, error) {
 	}, i.mode)
 
 	if err != nil {
-		i.errorHandler(err)
+		i.appendError(err)
 		return nil, err
 	}
 
@@ -136,6 +147,6 @@ func (i *Importer) importParse(path string, src string) (Type, error) {
 		return t, nil
 	}
 	err = fmt.Errorf(`No go source code was found under the package path "%s"`, path)
-	i.errorHandler(err)
+	i.appendError(err)
 	return nil, err
 }

misc.go

@@ -7,8 +7,9 @@ import (
 )
 
 type importer interface {
-	importParse(path string, src string) (Type, error)
-	importName(path string, src string) (name string, goroot bool)
+	appendError(err error)
+	Import(path string, src string) (Type, error)
+	ImportName(path string, src string) (name string, goroot bool)
 }
 
 // typeName 解析表达式获取类型名字以及是否是导入的

parser.go

@@ -145,8 +145,9 @@ func (r *parser) parseImport(decl *ast.GenDecl) {
 			switch s.Name.Name {
 			case "_":
 			case ".":
-				p, err := r.importer.importParse(path, r.info.PkgPath)
+				p, err := r.importer.Import(path, r.info.PkgPath)
 				if err != nil {
+					r.importer.appendError(err)
 					continue
 				}
 				l := p.NumChild()

types_importer.go

@@ -23,7 +23,10 @@ func (t *typeImport) check() {
 		return
 	}
 
-	s, _ := t.imp.importParse(t.path, t.src)
+	s, err := t.imp.Import(t.path, t.src)
+	if err != nil {
+		t.imp.appendError(err)
+	}
 	t.scope = s
 }
 
@@ -32,7 +35,7 @@ func (t *typeImport) PkgPath() string {
 }
 
 func (t *typeImport) IsGoroot() bool {
-	_, ok := t.imp.importName(t.path, t.src)
+	_, ok := t.imp.ImportName(t.path, t.src)
 	return ok
 }
 
@@ -45,7 +48,7 @@ func (t *typeImport) Name() string {
 		return t.name
 	}
 
-	t.name, _ = t.imp.importName(t.path, t.src)
+	t.name, _ = t.imp.ImportName(t.path, t.src)
 	return t.name
 }