zlei6/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2026-05-09 16:10:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

(goctl:) fix circle import in case new parser (#3750)

Browse Source 
Co-authored-by: Kevin Wan <wanjunfeng@gmail.com>
This commit is contained in:
kesonan
2023-11-29 19:13:39 +08:00
committed by GitHub
parent c46bcf7e1b
commit 5e63002cf8
4 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/goctl/pkg/parser/api/parser/analyzer.go
View File

@@ -5,8 +5,10 @@ import (
"sort"
"strings"
"github.com/zeromicro/go-zero/core/lang"
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
"github.com/zeromicro/go-zero/tools/goctl/pkg/parser/api/ast"
"github.com/zeromicro/go-zero/tools/goctl/pkg/parser/api/importstack"
"github.com/zeromicro/go-zero/tools/goctl/pkg/parser/api/placeholder"
"github.com/zeromicro/go-zero/tools/goctl/pkg/parser/api/token"
)
@@ -390,9 +392,14 @@ func Parse(filename string, src interface{}) (*spec.ApiSpec, error) {
return nil, err
}
var importManager = make(map[string]placeholder.Type)
importManager[ast.Filename] = placeholder.PlaceHolder
api, err := convert2API(ast, importManager)
is := importstack.New()
err := is.Push(ast.Filename)
if err != nil {
return nil, err
}
importSet := map[string]lang.PlaceholderType{}
api, err := convert2API(ast, importSet, is)
if err != nil {
return nil, err
}