Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
fc63b52c
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
fc63b52c
编写于
9月 23, 2021
作者:
H
Henning Dieterichs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Considers showIfCollapsed for injected text decorations.
上级
dd01064f
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
6 deletion
+14
-6
src/vs/editor/common/model/textModel.ts
src/vs/editor/common/model/textModel.ts
+2
-2
src/vs/editor/contrib/inlineCompletions/ghostTextWidget.ts
src/vs/editor/contrib/inlineCompletions/ghostTextWidget.ts
+2
-1
src/vs/editor/test/common/model/modelInjectedText.test.ts
src/vs/editor/test/common/model/modelInjectedText.test.ts
+3
-0
src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts
...editor/test/common/viewModel/splitLinesCollection.test.ts
+2
-1
src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
+4
-2
src/vs/workbench/contrib/testing/browser/testingDecorations.ts
...s/workbench/contrib/testing/browser/testingDecorations.ts
+1
-0
未找到文件。
src/vs/editor/common/model/textModel.ts
浏览文件 @
fc63b52c
...
...
@@ -3267,13 +3267,13 @@ class DecorationsTrees {
public
getInjectedTextInInterval
(
host
:
IDecorationsTreesHost
,
start
:
number
,
end
:
number
,
filterOwnerId
:
number
):
model
.
IModelDecoration
[]
{
const
versionId
=
host
.
getVersionId
();
const
result
=
this
.
_injectedTextDecorationsTree
.
intervalSearch
(
start
,
end
,
filterOwnerId
,
false
,
versionId
);
return
this
.
_ensureNodesHaveRanges
(
host
,
result
);
return
this
.
_ensureNodesHaveRanges
(
host
,
result
)
.
filter
((
i
)
=>
i
.
options
.
showIfCollapsed
||
!
i
.
range
.
isEmpty
())
;
}
public
getAllInjectedText
(
host
:
IDecorationsTreesHost
,
filterOwnerId
:
number
):
model
.
IModelDecoration
[]
{
const
versionId
=
host
.
getVersionId
();
const
result
=
this
.
_injectedTextDecorationsTree
.
search
(
filterOwnerId
,
false
,
versionId
);
return
this
.
_ensureNodesHaveRanges
(
host
,
result
);
return
this
.
_ensureNodesHaveRanges
(
host
,
result
)
.
filter
((
i
)
=>
i
.
options
.
showIfCollapsed
||
!
i
.
range
.
isEmpty
())
;
}
public
getAll
(
host
:
IDecorationsTreesHost
,
filterOwnerId
:
number
,
filterOutValidation
:
boolean
,
overviewRulerOnly
:
boolean
):
model
.
IModelDecoration
[]
{
...
...
src/vs/editor/contrib/inlineCompletions/ghostTextWidget.ts
浏览文件 @
fc63b52c
...
...
@@ -283,7 +283,8 @@ class DecorationsWidget implements IDisposable {
range
:
Range
.
fromPositions
(
new
Position
(
lineNumber
,
p
.
column
)),
options
:
shouldUseInjectedText
?
{
description
:
'
ghost-text
'
,
after
:
{
content
:
contentText
,
inlineClassName
:
p
.
preview
?
'
ghost-text-decoration-preview
'
:
'
ghost-text-decoration
'
}
after
:
{
content
:
contentText
,
inlineClassName
:
p
.
preview
?
'
ghost-text-decoration-preview
'
:
'
ghost-text-decoration
'
},
showIfCollapsed
:
true
,
}
:
{
...
decorationType
.
resolve
()
}
...
...
src/vs/editor/test/common/model/modelInjectedText.test.ts
浏览文件 @
fc63b52c
...
...
@@ -35,6 +35,7 @@ suite('Editor Model - Injected Text Events', () => {
options
:
{
after
:
{
content
:
'
injected1
'
},
description
:
'
test1
'
,
showIfCollapsed
:
true
},
range
:
new
Range
(
1
,
1
,
1
,
1
),
}]);
...
...
@@ -51,12 +52,14 @@ suite('Editor Model - Injected Text Events', () => {
options
:
{
after
:
{
content
:
'
injected1
'
},
description
:
'
test1
'
,
showIfCollapsed
:
true
},
range
:
new
Range
(
2
,
1
,
2
,
1
),
},
{
options
:
{
after
:
{
content
:
'
injected2
'
},
description
:
'
test2
'
,
showIfCollapsed
:
true
},
range
:
new
Range
(
2
,
2
,
2
,
2
),
}]);
...
...
src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts
浏览文件 @
fc63b52c
...
...
@@ -746,7 +746,8 @@ suite('SplitLinesCollection', () => {
description
:
'
example
'
,
after
:
{
content
:
'
very very long injected text that causes a line break
'
}
},
showIfCollapsed
:
true
,
}
}]);
...
...
src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
浏览文件 @
fc63b52c
...
...
@@ -310,7 +310,8 @@ suite('ViewModel', () => {
description
:
'
test
'
,
before
:
{
content
:
'
bar
'
}
},
showIfCollapsed
:
true
}
},
{
...
...
@@ -319,7 +320,8 @@ suite('ViewModel', () => {
description
:
'
test
'
,
before
:
{
content
:
'
bz
'
}
},
showIfCollapsed
:
true
}
},
]);
...
...
src/vs/workbench/contrib/testing/browser/testingDecorations.ts
浏览文件 @
fc63b52c
...
...
@@ -754,6 +754,7 @@ class TestMessageDecoration implements ITestDecoration {
content
:
renderStringAsPlaintext
(
message
),
inlineClassName
:
`test-message-inline-content test-message-inline-content-s
${
severity
}
${
this
.
contentIdClass
}
`
};
options
.
showIfCollapsed
=
true
;
const
rulerColor
=
severity
===
TestMessageType
.
Error
?
overviewRulerError
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录