fix: fix filename id issues

上级 07a25476
......@@ -74,6 +74,9 @@ func CommentAnalysis(path string, app app_concept.AbstractAnalysisApp, filter fu
content, _ := ioutil.ReadFile(file)
members := app.IdentAnalysis(string(content), file)
codeMembers = append(codeMembers, members...)
identModel, _ := json.MarshalIndent(codeMembers, "", "\t")
cmd_util.WriteToCocaFile("members.json", string(identModel))
}
for _, file := range files {
......
......@@ -132,7 +132,7 @@ func BuildMethodCall(codeFunc *CodeFunction, item ast.Stmt, fields []CodeField,
for _, param := range codeFunc.Parameters {
if param.ParamName == caller {
target := ParseTarget(caller, fields, localVars, codeFunc)
packageName := getPackageName(target, imports)
packageName := getPackageName(target, callee, imports)
call.Package = packageName
call.MethodName = callee
......@@ -186,7 +186,7 @@ func BuildMethodCallExprStmt(it *ast.ExprStmt, codeFunc *CodeFunction, fields []
func BuildCallFromExpr(expr *ast.CallExpr, codeFunc *CodeFunction, fields []CodeField, imports []CodeImport, currentPackage string, localVars []CodeProperty) CodeCall {
_, selector, selName := BuildExpr(expr.Fun.(ast.Expr))
target := ParseTarget(selector, fields, localVars, codeFunc)
packageName := getPackageName(target, imports)
packageName := getPackageName(target, selector, imports)
if packageName == "" {
packageName = currentPackage
}
......@@ -221,7 +221,7 @@ func BuildCallFromExpr(expr *ast.CallExpr, codeFunc *CodeFunction, fields []Code
return call
}
func getPackageName(target string, imports []CodeImport) string {
func getPackageName(target string, selector string, imports []CodeImport) string {
packageName := ""
if strings.Contains(target, ".") {
split := strings.Split(target, ".")
......
......@@ -217,7 +217,7 @@ func AddInterface(x *ast.InterfaceType, ident string, codeFile *core_domain.Code
func setMemberPackageInfo(member *core_domain.CodeMember, codeFile *core_domain.CodeFile) {
member.AliasPackage = codeFile.PackageName
member.FileID = codeFile.PackageName
member.FileID = codeFile.FullName
member.BuildMemberId()
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册