Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Phodal
Coca
提交
556edf68
C
Coca
项目概览
Phodal
/
Coca
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
Coca
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
556edf68
编写于
1月 01, 2020
作者:
P
Phodal Huang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: [fullast] make call chain work btter
上级
444c3045
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
9 deletion
+20
-9
_fixtures/abug/BuilderCallSplitIssue.java
_fixtures/abug/BuilderCallSplitIssue.java
+3
-0
core/context/analysis/java_full_app_test.go
core/context/analysis/java_full_app_test.go
+2
-3
core/infrastructure/ast/full/java_full_listener.go
core/infrastructure/ast/full/java_full_listener.go
+15
-6
未找到文件。
_fixtures/abug/BuilderCallSplitIssue.java
浏览文件 @
556edf68
package
com.phodal.coca.bug
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
org.springframework.web.context.support.AnnotationConfigWebApplicationContext
;
public
class
BuilderCallSplitIssue
{
void
someAssert
()
{
AnnotationConfigApplicationContext
ctx
=
new
AnnotationConfigApplicationContext
();
assertThat
(
ctx
.
containsBean
(
TRANSITIVE_BEAN_NAME
)).
isFalse
();
}
}
core/context/analysis/java_full_app_test.go
浏览文件 @
556edf68
...
...
@@ -38,7 +38,7 @@ func TestJavaCallListener_EnterConstructorDeclaration(t *testing.T) {
}
func
getCallNodes
(
codePath
string
)
[]
domain
.
JClassNode
{
identifierApp
:=
new
(
JavaIdentifierApp
)
identifierApp
:=
NewJavaIdentifierApp
(
)
iNodes
:=
identifierApp
.
AnalysisPath
(
codePath
)
var
classes
[]
string
=
nil
for
_
,
node
:=
range
iNodes
{
...
...
@@ -227,6 +227,5 @@ func Test_BuilderCallSplitIssut(t *testing.T) {
}
g
.
Expect
(
methodCallMap
[
"assertThat"
]
.
Class
)
.
To
(
Equal
(
""
))
//g.Expect(methodCallMap["assertThat"].Class).To(Equal("Assertions"))
g
.
Expect
(
methodCallMap
[
"isFalse"
]
.
Class
)
.
To
(
Equal
(
"assertThat(ctx"
))
g
.
Expect
(
methodCallMap
[
"isFalse"
]
.
Class
)
.
To
(
Equal
(
"assertThat"
))
}
core/infrastructure/ast/full/java_full_listener.go
浏览文件 @
556edf68
...
...
@@ -482,8 +482,16 @@ func (s *JavaFullListener) EnterLocalTypeDeclaration(ctx *parser.LocalTypeDeclar
func
(
s
*
JavaFullListener
)
EnterMethodCall
(
ctx
*
parser
.
MethodCallContext
)
{
var
jMethodCall
=
domain
.
NewJMethodCall
()
var
targetCtx
=
ctx
.
GetParent
()
.
GetChild
(
0
)
.
(
antlr
.
ParseTree
)
.
GetText
()
var
targetType
=
parseTargetType
(
targetCtx
)
targetCtx
:=
ctx
.
GetParent
()
.
GetChild
(
0
)
.
(
antlr
.
ParseTree
)
var
targetType
=
parseTargetType
(
targetCtx
.
GetText
())
if
targetCtx
.
GetChild
(
0
)
!=
nil
{
if
reflect
.
TypeOf
(
targetCtx
.
GetChild
(
0
))
.
String
()
==
"*parser.MethodCallContext"
{
methodCallContext
:=
targetCtx
.
GetChild
(
0
)
.
(
*
parser
.
MethodCallContext
)
targetType
=
methodCallContext
.
IDENTIFIER
()
.
GetText
()
}
}
callee
:=
ctx
.
GetChild
(
0
)
.
(
antlr
.
ParseTree
)
.
GetText
()
jMethodCall
.
StartLine
=
ctx
.
GetStart
()
.
GetLine
()
...
...
@@ -522,7 +530,7 @@ func (s *JavaFullListener) EnterMethodCall(ctx *parser.MethodCallContext) {
targetType
=
clz
}
else
{
targetType
=
buildS
pecific
Target
(
targetType
)
targetType
=
buildS
elfThis
Target
(
targetType
)
targetType
=
buildMethodNameForBuilder
(
ctx
,
targetType
)
}
}
...
...
@@ -530,7 +538,7 @@ func (s *JavaFullListener) EnterMethodCall(ctx *parser.MethodCallContext) {
jMethodCall
.
Package
=
packageName
jMethodCall
.
MethodName
=
methodName
// TODO: 处理链试调用
if
isChainCall
(
targetType
)
{
split
:=
strings
.
Split
(
targetType
,
"."
)
targetType
=
split
[
0
]
...
...
@@ -540,7 +548,8 @@ func (s *JavaFullListener) EnterMethodCall(ctx *parser.MethodCallContext) {
if
ctx
.
ExpressionList
()
!=
nil
{
var
parameters
[]
string
for
_
,
expression
:=
range
ctx
.
ExpressionList
()
.
(
*
parser
.
ExpressionListContext
)
.
AllExpression
()
{
parameters
=
append
(
parameters
,
expression
.
(
*
parser
.
ExpressionContext
)
.
GetText
())
expressionCtx
:=
expression
.
(
*
parser
.
ExpressionContext
)
parameters
=
append
(
parameters
,
expressionCtx
.
GetText
())
}
jMethodCall
.
Parameters
=
parameters
}
...
...
@@ -582,7 +591,7 @@ func buildMethodNameForBuilder(ctx *parser.MethodCallContext, targetType string)
return
targetType
}
func
buildS
pecific
Target
(
targetType
string
)
string
{
func
buildS
elfThis
Target
(
targetType
string
)
string
{
isSelfFieldCall
:=
strings
.
Contains
(
targetType
,
"this."
)
if
isSelfFieldCall
{
targetType
=
strings
.
ReplaceAll
(
targetType
,
"this."
,
""
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录