Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
c558df5b
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,发现更多精彩内容 >>
提交
c558df5b
编写于
12月 01, 2020
作者:
D
Dmitriy Novozhilov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[CMI] Fix rendering metainfos at the end of file
上级
ceb44ddc
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
40 addition
and
24 deletion
+40
-24
compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoRenderer.kt
...org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoRenderer.kt
+40
-24
未找到文件。
compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoRenderer.kt
浏览文件 @
c558df5b
...
@@ -30,12 +30,31 @@ object CodeMetaInfoRenderer {
...
@@ -30,12 +30,31 @@ object CodeMetaInfoRenderer {
builder
.
append
(
originalText
)
builder
.
append
(
originalText
)
return
return
}
}
val
sortedMetaInfos
=
getSortedCodeMetaInfos
(
codeMetaInfos
)
val
sortedMetaInfos
=
getSortedCodeMetaInfos
(
codeMetaInfos
)
.
groupBy
{
it
.
start
}
val
opened
=
Stack
<
CodeMetaInfo
>()
val
opened
=
Stack
<
CodeMetaInfo
>()
for
((
i
,
c
)
in
originalText
.
withIndex
())
{
for
((
i
,
c
)
in
originalText
.
withIndex
())
{
checkOpenedAndCloseStringIfNeeded
(
opened
,
i
,
builder
)
processMetaInfosStartedAtOffset
(
i
,
sortedMetaInfos
,
opened
,
builder
)
val
matchedCodeMetaInfos
=
sortedMetaInfos
.
filter
{
it
.
start
==
i
}
builder
.
append
(
c
)
}
val
lastSymbolIsNewLine
=
builder
.
last
()
==
'\n'
if
(
lastSymbolIsNewLine
)
{
builder
.
deleteCharAt
(
builder
.
length
-
1
)
}
processMetaInfosStartedAtOffset
(
originalText
.
length
,
sortedMetaInfos
,
opened
,
builder
)
if
(
lastSymbolIsNewLine
)
{
builder
.
appendLine
()
}
}
private
fun
processMetaInfosStartedAtOffset
(
offset
:
Int
,
sortedMetaInfos
:
Map
<
Int
,
List
<
CodeMetaInfo
>>,
opened
:
Stack
<
CodeMetaInfo
>,
builder
:
StringBuilder
)
{
checkOpenedAndCloseStringIfNeeded
(
opened
,
offset
,
builder
)
val
matchedCodeMetaInfos
=
sortedMetaInfos
[
offset
]
?:
emptyList
()
if
(
matchedCodeMetaInfos
.
isNotEmpty
())
{
if
(
matchedCodeMetaInfos
.
isNotEmpty
())
{
openStartTag
(
builder
)
openStartTag
(
builder
)
val
iterator
=
matchedCodeMetaInfos
.
listIterator
()
val
iterator
=
matchedCodeMetaInfos
.
listIterator
()
...
@@ -57,10 +76,7 @@ object CodeMetaInfoRenderer {
...
@@ -57,10 +76,7 @@ object CodeMetaInfoRenderer {
}
}
}
}
// Here we need to handle meta infos which has start == end and close them immediately
// Here we need to handle meta infos which has start == end and close them immediately
checkOpenedAndCloseStringIfNeeded
(
opened
,
i
,
builder
)
checkOpenedAndCloseStringIfNeeded
(
opened
,
offset
,
builder
)
builder
.
append
(
c
)
}
checkOpenedAndCloseStringIfNeeded
(
opened
,
originalText
.
length
,
builder
)
}
}
private
val
metaInfoComparator
=
(
compareBy
<
CodeMetaInfo
>
{
it
.
start
}
then
compareByDescending
{
it
.
end
})
then
compareBy
{
it
.
tag
}
private
val
metaInfoComparator
=
(
compareBy
<
CodeMetaInfo
>
{
it
.
start
}
then
compareByDescending
{
it
.
end
})
then
compareBy
{
it
.
tag
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录