Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3929ea09
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,体验更适合开发者的 AI 搜索 >>
提交
3929ea09
编写于
4月 26, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #48741: Sort reverse edit operations only if order is not significant
上级
b1f5a4d5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
4 deletion
+34
-4
src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
...r/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
+12
-4
src/vs/editor/test/common/model/editableTextModel.test.ts
src/vs/editor/test/common/model/editableTextModel.test.ts
+22
-0
未找到文件。
src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
浏览文件 @
3929ea09
...
...
@@ -206,13 +206,17 @@ export class PieceTreeTextBuffer implements ITextBuffer {
// Sort operations ascending
operations
.
sort
(
PieceTreeTextBuffer
.
_sortOpsAscending
);
let
hasTouchingRanges
=
false
;
for
(
let
i
=
0
,
count
=
operations
.
length
-
1
;
i
<
count
;
i
++
)
{
let
rangeEnd
=
operations
[
i
].
range
.
getEndPosition
();
let
nextRangeStart
=
operations
[
i
+
1
].
range
.
getStartPosition
();
if
(
nextRangeStart
.
isBefore
(
rangeEnd
))
{
// overlapping ranges
throw
new
Error
(
'
Overlapping ranges are not allowed!
'
);
if
(
nextRangeStart
.
isBeforeOrEqual
(
rangeEnd
))
{
if
(
nextRangeStart
.
isBefore
(
rangeEnd
))
{
// overlapping ranges
throw
new
Error
(
'
Overlapping ranges are not allowed!
'
);
}
hasTouchingRanges
=
true
;
}
}
...
...
@@ -256,7 +260,11 @@ export class PieceTreeTextBuffer implements ITextBuffer {
forceMoveMarkers
:
op
.
forceMoveMarkers
};
}
reverseOperations
.
sort
((
a
,
b
)
=>
a
.
sortIndex
-
b
.
sortIndex
);
// Can only sort reverse operations when the order is not significant
if
(
!
hasTouchingRanges
)
{
reverseOperations
.
sort
((
a
,
b
)
=>
a
.
sortIndex
-
b
.
sortIndex
);
}
this
.
_mightContainRTL
=
mightContainRTL
;
this
.
_mightContainNonBasicASCII
=
mightContainNonBasicASCII
;
...
...
src/vs/editor/test/common/model/editableTextModel.test.ts
浏览文件 @
3929ea09
...
...
@@ -1091,4 +1091,26 @@ suite('EditorModel - EditableTextModel.applyEdits', () => {
model
.
dispose
();
});
test
(
'
issue #48741: Broken undo stack with move lines up with multiple cursors
'
,
()
=>
{
let
model
=
createEditableTextModelFromString
([
'
line1
'
,
'
line2
'
,
'
line3
'
,
''
,
].
join
(
'
\n
'
));
const
undoEdits
=
model
.
applyEdits
([
{
range
:
new
Range
(
4
,
1
,
4
,
1
),
text
:
'
line3
'
,
},
{
range
:
new
Range
(
3
,
1
,
3
,
6
),
text
:
null
,
},
{
range
:
new
Range
(
2
,
1
,
3
,
1
),
text
:
null
,
},
{
range
:
new
Range
(
3
,
6
,
3
,
6
),
text
:
'
\n
line2
'
}
]);
model
.
applyEdits
(
undoEdits
);
assert
.
deepEqual
(
model
.
getValue
(),
'
line1
\n
line2
\n
line3
\n
'
);
model
.
dispose
();
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录