Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_41695661
jadx
提交
eaeb1142
J
jadx
项目概览
weixin_41695661
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
eaeb1142
编写于
6月 15, 2022
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: check class name collisions (#1526)
上级
1533b7fe
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
94 addition
and
6 deletion
+94
-6
jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
+21
-6
jadx-core/src/test/java/jadx/tests/integration/names/TestCollisionWithJavaLangClasses.java
...s/integration/names/TestCollisionWithJavaLangClasses.java
+59
-0
jadx-core/src/test/java/jadx/tests/integration/names/pkg2/System.java
...c/test/java/jadx/tests/integration/names/pkg2/System.java
+6
-0
jadx-core/src/test/java/jadx/tests/integration/names/pkg2/TestCls.java
.../test/java/jadx/tests/integration/names/pkg2/TestCls.java
+8
-0
未找到文件。
jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
浏览文件 @
eaeb1142
...
...
@@ -614,21 +614,23 @@ public class ClassGen {
if
(
useCls
.
equals
(
extClsInfo
))
{
return
shortName
;
}
if
(
extClsInfo
.
getPackage
().
equals
(
"java.lang"
)
&&
extClsInfo
.
getParentClass
()
==
null
)
{
return
shortName
;
}
if
(
isClassInnerFor
(
useCls
,
extClsInfo
))
{
return
shortName
;
}
if
(
extClsInfo
.
isInner
())
{
return
expandInnerClassName
(
useCls
,
extClsInfo
);
}
if
(
searchCollision
(
cls
.
root
(),
useCls
,
extClsInfo
))
{
if
(
checkInnerCollision
(
cls
.
root
(),
useCls
,
extClsInfo
)
||
checkInPackageCollision
(
cls
.
root
(),
useCls
,
extClsInfo
))
{
return
fullName
;
}
if
(
isBothClassesInOneTopClass
(
useCls
,
extClsInfo
))
{
return
shortName
;
}
// don't add import for top classes from 'java.lang' package (subpackages excluded)
if
(
extClsInfo
.
getPackage
().
equals
(
"java.lang"
)
&&
extClsInfo
.
getParentClass
()
==
null
)
{
return
shortName
;
}
// don't add import if this class from same package
if
(
extClsInfo
.
getPackage
().
equals
(
useCls
.
getPackage
())
&&
!
extClsInfo
.
isInner
())
{
return
shortName
;
...
...
@@ -709,7 +711,7 @@ public class ClassGen {
return
false
;
}
private
static
boolean
searchCollision
(
RootNode
root
,
ClassInfo
useCls
,
ClassInfo
searchCls
)
{
private
static
boolean
checkInnerCollision
(
RootNode
root
,
@Nullable
ClassInfo
useCls
,
ClassInfo
searchCls
)
{
if
(
useCls
==
null
)
{
return
false
;
}
...
...
@@ -726,7 +728,20 @@ public class ClassGen {
}
}
}
return
searchCollision
(
root
,
useCls
.
getParentClass
(),
searchCls
);
return
checkInnerCollision
(
root
,
useCls
.
getParentClass
(),
searchCls
);
}
/**
* Check if class with same name exists in current package
*/
private
static
boolean
checkInPackageCollision
(
RootNode
root
,
ClassInfo
useCls
,
ClassInfo
searchCls
)
{
String
currentPkg
=
useCls
.
getAliasPkg
();
if
(
currentPkg
.
equals
(
searchCls
.
getAliasPkg
()))
{
// search class already from current package
return
false
;
}
String
shortName
=
searchCls
.
getAliasShortName
();
return
root
.
getClsp
().
isClsKnown
(
currentPkg
+
'.'
+
shortName
);
}
private
void
insertRenameInfo
(
ICodeWriter
code
,
ClassNode
cls
)
{
...
...
jadx-core/src/test/java/jadx/tests/integration/names/TestCollisionWithJavaLangClasses.java
0 → 100644
浏览文件 @
eaeb1142
package
jadx.tests.integration.names
;
import
java.util.List
;
import
org.junit.jupiter.api.Test
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
public
class
TestCollisionWithJavaLangClasses
extends
IntegrationTest
{
public
static
class
TestCls1
{
public
static
class
System
{
public
static
void
main
(
String
[]
args
)
{
java
.
lang
.
System
.
out
.
println
(
"Hello world"
);
}
}
}
@Test
public
void
test1
()
{
assertThat
(
getClassNode
(
TestCls1
.
class
))
.
code
()
.
containsOne
(
"java.lang.System.out.println"
);
}
public
static
class
TestCls2
{
public
void
doSomething
()
{
System
.
doSomething
();
java
.
lang
.
System
.
out
.
println
(
"Hello World"
);
}
public
static
class
System
{
public
static
void
doSomething
()
{
}
}
}
@Test
public
void
test2
()
{
assertThat
(
getClassNode
(
TestCls2
.
class
))
.
code
()
.
containsLine
(
2
,
"System.doSomething();"
)
.
containsOne
(
"java.lang.System.out.println"
);
}
@Test
public
void
test3
()
{
List
<
ClassNode
>
classes
=
getClassNodes
(
jadx
.
tests
.
integration
.
names
.
pkg2
.
System
.
class
,
jadx
.
tests
.
integration
.
names
.
pkg2
.
TestCls
.
class
);
assertThat
(
searchCls
(
classes
,
"TestCls"
))
.
code
()
.
containsLine
(
2
,
"System.doSomething();"
)
.
containsOne
(
"java.lang.System.out.println"
);
}
}
jadx-core/src/test/java/jadx/tests/integration/names/pkg2/System.java
0 → 100644
浏览文件 @
eaeb1142
package
jadx.tests.integration.names.pkg2
;
public
class
System
{
public
static
void
doSomething
()
{
}
}
jadx-core/src/test/java/jadx/tests/integration/names/pkg2/TestCls.java
0 → 100644
浏览文件 @
eaeb1142
package
jadx.tests.integration.names.pkg2
;
public
class
TestCls
{
public
void
doSomething
()
{
System
.
doSomething
();
java
.
lang
.
System
.
out
.
println
(
"Hello World"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录