Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d3e67801
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d3e67801
编写于
3月 01, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
There must always be at least one visible line (#44805)
上级
47497b7c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
0 deletion
+44
-0
src/vs/editor/common/viewModel/splitLinesCollection.ts
src/vs/editor/common/viewModel/splitLinesCollection.ts
+11
-0
src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
+33
-0
未找到文件。
src/vs/editor/common/viewModel/splitLinesCollection.ts
浏览文件 @
d3e67801
...
...
@@ -288,6 +288,7 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
let
hiddenAreaIdx
=
-
1
;
let
nextLineNumberToUpdateHiddenArea
=
(
hiddenAreaIdx
+
1
<
hiddenAreas
.
length
)
?
hiddenAreaEnd
+
1
:
this
.
lines
.
length
+
2
;
let
hasVisibleLine
=
false
;
for
(
let
i
=
0
;
i
<
this
.
lines
.
length
;
i
++
)
{
let
lineNumber
=
i
+
1
;
...
...
@@ -306,6 +307,7 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
lineChanged
=
true
;
}
}
else
{
hasVisibleLine
=
true
;
// Line should be visible
if
(
!
this
.
lines
[
i
].
isVisible
())
{
this
.
lines
[
i
]
=
this
.
lines
[
i
].
setVisible
(
true
);
...
...
@@ -318,6 +320,11 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
}
}
if
(
!
hasVisibleLine
)
{
// Cannot have everything be hidden => reveal everything!
this
.
setHiddenAreas
([]);
}
return
true
;
}
...
...
@@ -465,6 +472,10 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
public
acceptVersionId
(
versionId
:
number
):
void
{
this
.
_validModelVersionId
=
versionId
;
if
(
this
.
lines
.
length
===
1
&&
!
this
.
lines
[
0
].
isVisible
())
{
// At least one line must be visible => reset hidden areas
this
.
setHiddenAreas
([]);
}
}
public
getViewLineCount
():
number
{
...
...
src/vs/editor/test/common/viewModel/viewModelImpl.test.ts
浏览文件 @
d3e67801
...
...
@@ -74,6 +74,39 @@ suite('ViewModel', () => {
});
});
test
(
'
issue #44805: No visible lines via API call
'
,
()
=>
{
const
text
=
[
'
line1
'
,
'
line2
'
,
'
line3
'
];
testViewModel
(
text
,
{},
(
viewModel
,
model
)
=>
{
assert
.
equal
(
viewModel
.
getLineCount
(),
3
);
viewModel
.
setHiddenAreas
([
new
Range
(
1
,
1
,
3
,
1
)]);
assert
.
ok
(
viewModel
.
getVisibleRanges
()
!==
null
);
});
});
test
(
'
issue #44805: No visible lines via undoing
'
,
()
=>
{
const
text
=
[
''
];
testViewModel
(
text
,
{},
(
viewModel
,
model
)
=>
{
assert
.
equal
(
viewModel
.
getLineCount
(),
1
);
model
.
pushEditOperations
([],
[{
range
:
new
Range
(
1
,
1
,
1
,
1
),
text
:
'
line1
\n
line2
\n
line3
'
}],
()
=>
([]));
viewModel
.
setHiddenAreas
([
new
Range
(
1
,
1
,
1
,
1
)]);
assert
.
equal
(
viewModel
.
getLineCount
(),
2
);
model
.
undo
();
assert
.
ok
(
viewModel
.
getVisibleRanges
()
!==
null
);
});
});
function
assertGetPlainTextToCopy
(
text
:
string
[],
ranges
:
Range
[],
emptySelectionClipboard
:
boolean
,
expected
:
string
|
string
[]):
void
{
testViewModel
(
text
,
{},
(
viewModel
,
model
)
=>
{
let
actual
=
viewModel
.
getPlainTextToCopy
(
ranges
,
emptySelectionClipboard
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录