Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6891688d
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,发现更多精彩内容 >>
未验证
提交
6891688d
编写于
9月 23, 2020
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Be sure to execute grouped undo / redo elements in order (#101789)
上级
92a0f560
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
5 deletion
+43
-5
src/vs/platform/undoRedo/common/undoRedoService.ts
src/vs/platform/undoRedo/common/undoRedoService.ts
+40
-4
src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
+3
-1
未找到文件。
src/vs/platform/undoRedo/common/undoRedoService.ts
浏览文件 @
6891688d
...
...
@@ -985,9 +985,9 @@ export class UndoRedoService implements IUndoRedoService {
});
}
private
_
continueUndoInGroup
(
groupId
:
number
):
Promise
<
void
>
|
void
{
private
_
findClosestUndoElementInGroup
(
groupId
:
number
):
[
StackElement
|
null
,
string
|
null
]
{
if
(
!
groupId
)
{
return
;
return
[
null
,
null
]
;
}
// find another element with the same groupId and with the highest groupOrder ready to be undone
...
...
@@ -1007,6 +1007,15 @@ export class UndoRedoService implements IUndoRedoService {
}
}
return
[
matchedElement
,
matchedStrResource
];
}
private
_continueUndoInGroup
(
groupId
:
number
):
Promise
<
void
>
|
void
{
if
(
!
groupId
)
{
return
;
}
const
[,
matchedStrResource
]
=
this
.
_findClosestUndoElementInGroup
(
groupId
);
if
(
matchedStrResource
)
{
return
this
.
undo
(
matchedStrResource
);
}
...
...
@@ -1024,6 +1033,15 @@ export class UndoRedoService implements IUndoRedoService {
return
;
}
if
(
element
.
groupId
)
{
// this element is a part of a group, we need to make sure undoing in a group is in order
const
[
matchedElement
,
matchedStrResource
]
=
this
.
_findClosestUndoElementInGroup
(
element
.
groupId
);
if
(
element
!==
matchedElement
&&
matchedStrResource
)
{
// there is an element in the same group that should be undone before this one
return
this
.
undo
(
matchedStrResource
);
}
}
try
{
if
(
element
.
type
===
UndoRedoElementType
.
Workspace
)
{
return
this
.
_workspaceUndo
(
strResource
,
element
);
...
...
@@ -1190,9 +1208,9 @@ export class UndoRedoService implements IUndoRedoService {
});
}
private
_
continueRedoInGroup
(
groupId
:
number
):
Promise
<
void
>
|
void
{
private
_
findClosestRedoElementInGroup
(
groupId
:
number
):
[
StackElement
|
null
,
string
|
null
]
{
if
(
!
groupId
)
{
return
;
return
[
null
,
null
]
;
}
// find another element with the same groupId and with the lowest groupOrder ready to be redone
...
...
@@ -1212,6 +1230,15 @@ export class UndoRedoService implements IUndoRedoService {
}
}
return
[
matchedElement
,
matchedStrResource
];
}
private
_continueRedoInGroup
(
groupId
:
number
):
Promise
<
void
>
|
void
{
if
(
!
groupId
)
{
return
;
}
const
[,
matchedStrResource
]
=
this
.
_findClosestRedoElementInGroup
(
groupId
);
if
(
matchedStrResource
)
{
return
this
.
redo
(
matchedStrResource
);
}
...
...
@@ -1229,6 +1256,15 @@ export class UndoRedoService implements IUndoRedoService {
return
;
}
if
(
element
.
groupId
)
{
// this element is a part of a group, we need to make sure redoing in a group is in order
const
[
matchedElement
,
matchedStrResource
]
=
this
.
_findClosestRedoElementInGroup
(
element
.
groupId
);
if
(
element
!==
matchedElement
&&
matchedStrResource
)
{
// there is an element in the same group that should be redone before this one
return
this
.
redo
(
matchedStrResource
);
}
}
try
{
if
(
element
.
type
===
UndoRedoElementType
.
Workspace
)
{
return
this
.
_workspaceRedo
(
strResource
,
element
);
...
...
src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
浏览文件 @
6891688d
...
...
@@ -210,7 +210,9 @@ suite('UndoRedoService', () => {
});
test
(
'
UndoRedoGroup.None uses id 0
'
,
()
=>
{
assert
.
equal
(
UndoRedoGroup
.
None
,
0
);
assert
.
equal
(
UndoRedoGroup
.
None
.
id
,
0
);
assert
.
equal
(
UndoRedoGroup
.
None
.
nextOrder
(),
0
);
assert
.
equal
(
UndoRedoGroup
.
None
.
nextOrder
(),
0
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录