Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
4d3b04f9
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,发现更多精彩内容 >>
提交
4d3b04f9
编写于
1月 18, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #41573: Allow cursor to recover from markers even if the view model line mapping changes
上级
b7588a82
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
46 addition
and
3 deletion
+46
-3
src/vs/editor/common/controller/cursor.ts
src/vs/editor/common/controller/cursor.ts
+16
-3
src/vs/editor/test/browser/controller/cursor.test.ts
src/vs/editor/test/browser/controller/cursor.test.ts
+30
-0
未找到文件。
src/vs/editor/common/controller/cursor.ts
浏览文件 @
4d3b04f9
...
...
@@ -92,6 +92,7 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
private
readonly
_configuration
:
editorCommon
.
IConfiguration
;
private
readonly
_model
:
ITextModel
;
private
_knownModelVersionId
:
number
;
private
readonly
_viewModel
:
IViewModel
;
public
context
:
CursorContext
;
private
_cursors
:
CursorCollection
;
...
...
@@ -105,6 +106,7 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
super
();
this
.
_configuration
=
configuration
;
this
.
_model
=
model
;
this
.
_knownModelVersionId
=
this
.
_model
.
getVersionId
();
this
.
_viewModel
=
viewModel
;
this
.
context
=
new
CursorContext
(
this
.
_configuration
,
this
.
_model
,
this
.
_viewModel
);
this
.
_cursors
=
new
CursorCollection
(
this
.
context
);
...
...
@@ -115,6 +117,7 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
this
.
_prevEditOperationType
=
EditOperationType
.
Other
;
this
.
_register
(
this
.
_model
.
onDidChangeRawContent
((
e
)
=>
{
this
.
_knownModelVersionId
=
e
.
versionId
;
if
(
this
.
_isHandling
)
{
return
;
}
...
...
@@ -128,6 +131,16 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
return
;
}
if
(
this
.
_knownModelVersionId
!==
this
.
_model
.
getVersionId
())
{
// There are model change events that I didn't yet receive.
//
// This can happen when editing the model, and the view model receives the change events first,
// and the view model emits line mapping changed events, all before the cursor gets a chance to
// recover from markers.
//
// The model change listener above will be called soon and we'll ensure a valid cursor state there.
return
;
}
// Ensure valid state
this
.
setStates
(
'
viewModel
'
,
CursorChangeReason
.
NotSet
,
this
.
getAll
());
}));
...
...
@@ -136,13 +149,13 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
this
.
context
=
new
CursorContext
(
this
.
_configuration
,
this
.
_model
,
this
.
_viewModel
);
this
.
_cursors
.
updateContext
(
this
.
context
);
};
this
.
_register
(
model
.
onDidChangeLanguage
((
e
)
=>
{
this
.
_register
(
this
.
_
model
.
onDidChangeLanguage
((
e
)
=>
{
updateCursorContext
();
}));
this
.
_register
(
model
.
onDidChangeLanguageConfiguration
(()
=>
{
this
.
_register
(
this
.
_
model
.
onDidChangeLanguageConfiguration
(()
=>
{
updateCursorContext
();
}));
this
.
_register
(
model
.
onDidChangeOptions
(()
=>
{
this
.
_register
(
this
.
_
model
.
onDidChangeOptions
(()
=>
{
updateCursorContext
();
}));
this
.
_register
(
this
.
_configuration
.
onDidChange
((
e
)
=>
{
...
...
src/vs/editor/test/browser/controller/cursor.test.ts
浏览文件 @
4d3b04f9
...
...
@@ -1852,6 +1852,36 @@ suite('Editor Controller - Regression tests', () => {
assertCursor
(
cursor
,
new
Selection
(
1
,
12
,
1
,
12
));
});
});
test
(
'
issue #41573 - delete across multiple lines does not shrink the selection when word wraps
'
,
()
=>
{
const
model
=
TextModel
.
createFromString
([
'
Authorization:
\'
Bearer pHKRfCTFSnGxs6akKlb9ddIXcca0sIUSZJutPHYqz7vEeHdMTMh0SGN0IGU3a0n59DXjTLRsj5EJ2u33qLNIFi9fk5XF8pK39PndLYUZhPt4QvHGLScgSkK0L4gwzkzMloTQPpKhqiikiIOvyNNSpd2o8j29NnOmdTUOKi9DVt74PD2ohKxyOrWZ6oZprTkb3eKajcpnS0LABKfaw2rmv4
\'
,
'
].
join
(
'
\n
'
));
const
config
=
new
TestConfiguration
({
wordWrap
:
'
wordWrapColumn
'
,
wordWrapColumn
:
100
});
const
viewModel
=
new
ViewModel
(
0
,
config
,
model
,
null
);
const
cursor
=
new
Cursor
(
config
,
model
,
viewModel
);
console
.
log
(
viewModel
.
getLineCount
());
moveTo
(
cursor
,
1
,
43
,
false
);
moveTo
(
cursor
,
1
,
147
,
true
);
assertCursor
(
cursor
,
new
Selection
(
1
,
43
,
1
,
147
));
model
.
applyEdits
([{
range
:
new
Range
(
1
,
1
,
1
,
43
),
text
:
''
}]);
assertCursor
(
cursor
,
new
Selection
(
1
,
1
,
1
,
105
));
cursor
.
dispose
();
viewModel
.
dispose
();
config
.
dispose
();
model
.
dispose
();
});
});
suite
(
'
Editor Controller - Cursor Configuration
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录