Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
ac966ad1
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ac966ad1
编写于
2月 10, 2021
作者:
D
Dmitriy Dolovov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Commonizer] Add getParentEntityId() method to CirEntityId
上级
4bab505c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
45 addition
and
20 deletion
+45
-20
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirName.kt
...rg/jetbrains/kotlin/descriptors/commonizer/cir/CirName.kt
+4
-1
native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/CirEntityIdTest.kt
...ins/kotlin/descriptors/commonizer/core/CirEntityIdTest.kt
+41
-19
未找到文件。
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirName.kt
浏览文件 @
ac966ad1
...
...
@@ -102,9 +102,12 @@ class CirEntityId private constructor(val packageName: CirPackageName, val relat
relativeNameSegments
.
joinTo
(
this
,
"."
)
}
val
isNestedEntity
:
Boolean
get
()
=
relativeNameSegments
.
size
>
1
fun
createNestedEntityId
(
entityName
:
CirName
):
CirEntityId
=
create
(
packageName
,
relativeNameSegments
+
entityName
)
val
isNestedEntity
:
Boolean
get
()
=
relativeNameSegments
.
size
>
1
fun
getParentEntityId
():
CirEntityId
?
=
if
(
isNestedEntity
)
create
(
packageName
,
relativeNameSegments
.
copyOfRange
(
0
,
relativeNameSegments
.
size
-
1
))
else
null
companion
object
{
fun
create
(
entityId
:
String
):
CirEntityId
{
...
...
native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/CirEntityIdTest.kt
浏览文件 @
ac966ad1
...
...
@@ -170,6 +170,30 @@ class CirEntityIdTest {
}
}
@Test
fun
isNested
()
{
listOf
(
""
to
false
,
"/"
to
false
,
"foo/"
to
false
,
"foo/bar/"
to
false
,
"My"
to
false
,
"My.Test"
to
true
,
"My.Test.Class"
to
true
,
"/My"
to
false
,
"/My.Test"
to
true
,
"/My.Test.Class"
to
true
,
"foo/My"
to
false
,
"foo/My.Test"
to
true
,
"foo/My.Test.Class"
to
true
,
"foo/bar/My"
to
false
,
"foo/bar/My.Test"
to
true
,
"foo/bar/My.Test.Class"
to
true
,
).
forEach
{
(
rawEntityId
,
isNested
)
->
assertEquals
(
isNested
,
CirEntityId
.
create
(
rawEntityId
).
isNestedEntity
)
}
}
@Test
fun
createNested
()
{
val
nested1
=
CirName
.
create
(
"Nested1"
)
...
...
@@ -203,26 +227,24 @@ class CirEntityIdTest {
}
@Test
fun
isNested
()
{
fun
createParent
()
{
listOf
(
""
to
false
,
"/"
to
false
,
"foo/"
to
false
,
"foo/bar/"
to
false
,
"My"
to
false
,
"My.Test"
to
true
,
"My.Test.Class"
to
true
,
"/My"
to
false
,
"/My.Test"
to
true
,
"/My.Test.Class"
to
true
,
"foo/My"
to
false
,
"foo/My.Test"
to
true
,
"foo/My.Test.Class"
to
true
,
"foo/bar/My"
to
false
,
"foo/bar/My.Test"
to
true
,
"foo/bar/My.Test.Class"
to
true
,
).
forEach
{
(
rawEntityId
,
isNested
)
->
assertEquals
(
isNested
,
CirEntityId
.
create
(
rawEntityId
).
isNestedEntity
)
""
to
null
,
"foo/"
to
null
,
"foo/bar/"
to
null
,
"Outer"
to
null
,
"foo/Outer"
to
null
,
"foo/bar/Outer"
to
null
,
"Outer.Nested1"
to
"Outer"
,
"foo/Outer.Nested1"
to
"foo/Outer"
,
"foo/bar/Outer.Nested1"
to
"foo/bar/Outer"
,
"Outer.Nested1.Nested2"
to
"Outer.Nested1"
,
"foo/Outer.Nested1.Nested2"
to
"foo/Outer.Nested1"
,
"foo/bar/Outer.Nested1.Nested2"
to
"foo/bar/Outer.Nested1"
).
forEach
{
(
rawEntityId
,
rawParentEntityId
)
->
val
entityId
=
CirEntityId
.
create
(
rawEntityId
)
val
parentEntityId
=
rawParentEntityId
?.
let
(
CirEntityId
::
create
)
assertSame
(
parentEntityId
,
entityId
.
getParentEntityId
())
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录