Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
9418ba5f
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,发现更多精彩内容 >>
提交
9418ba5f
编写于
10月 21, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't forget to push undo stops when executing edits (#36234)
上级
573586d8
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
57 addition
and
1 deletion
+57
-1
src/vs/editor/contrib/indentation/common/indentation.ts
src/vs/editor/contrib/indentation/common/indentation.ts
+2
-0
src/vs/editor/contrib/linesOperations/common/linesOperations.ts
.../editor/contrib/linesOperations/common/linesOperations.ts
+4
-1
src/vs/editor/contrib/linesOperations/test/common/linesOperations.test.ts
...ntrib/linesOperations/test/common/linesOperations.test.ts
+51
-0
未找到文件。
src/vs/editor/contrib/indentation/common/indentation.ts
浏览文件 @
9418ba5f
...
...
@@ -323,7 +323,9 @@ export class ReindentLinesAction extends EditorAction {
}
let
edits
=
getReindentEditOperations
(
model
,
1
,
model
.
getLineCount
());
if
(
edits
)
{
editor
.
pushUndoStop
();
editor
.
executeEdits
(
this
.
id
,
edits
);
editor
.
pushUndoStop
();
}
}
}
...
...
src/vs/editor/contrib/linesOperations/common/linesOperations.ts
浏览文件 @
9418ba5f
...
...
@@ -407,7 +407,9 @@ export abstract class AbstractDeleteAllToBoundaryAction extends EditorAction {
return
EditOperation
.
replace
(
range
,
''
);
});
editor
.
pushUndoStop
();
editor
.
executeEdits
(
this
.
id
,
edits
,
endCursorState
);
editor
.
pushUndoStop
();
}
/**
...
...
@@ -673,8 +675,9 @@ export class JoinLinesAction extends EditorAction {
}
endCursorState
.
unshift
(
endPrimaryCursor
);
editor
.
pushUndoStop
();
editor
.
executeEdits
(
this
.
id
,
edits
,
endCursorState
);
editor
.
pushUndoStop
();
}
}
...
...
src/vs/editor/contrib/linesOperations/test/common/linesOperations.test.ts
浏览文件 @
9418ba5f
...
...
@@ -73,6 +73,32 @@ suite('Editor Contrib - Line Operations', () => {
assert
.
equal
(
model
.
getLineContent
(
5
),
'
horlworld
'
,
'
005
'
);
});
});
test
(
'
issue #36234: should push undo stop
'
,
()
=>
{
withMockCodeEditor
(
[
'
one
'
,
'
two
'
,
'
three
'
],
{},
(
editor
,
cursor
)
=>
{
let
model
=
editor
.
getModel
();
let
deleteAllLeftAction
=
new
DeleteAllLeftAction
();
editor
.
setSelection
(
new
Selection
(
1
,
1
,
1
,
1
));
editor
.
trigger
(
'
keyboard
'
,
Handler
.
Type
,
{
text
:
'
Typing some text here on line
'
});
assert
.
equal
(
model
.
getLineContent
(
1
),
'
Typing some text here on line one
'
);
assert
.
deepEqual
(
editor
.
getSelection
(),
new
Selection
(
1
,
31
,
1
,
31
));
deleteAllLeftAction
.
run
(
null
,
editor
);
assert
.
equal
(
model
.
getLineContent
(
1
),
'
one
'
);
assert
.
deepEqual
(
editor
.
getSelection
(),
new
Selection
(
1
,
1
,
1
,
1
));
editor
.
trigger
(
'
keyboard
'
,
Handler
.
Undo
,
{});
assert
.
equal
(
model
.
getLineContent
(
1
),
'
Typing some text here on line one
'
);
assert
.
deepEqual
(
editor
.
getSelection
(),
new
Selection
(
1
,
31
,
1
,
31
));
});
});
});
suite
(
'
JoinLinesAction
'
,
()
=>
{
...
...
@@ -164,6 +190,31 @@ suite('Editor Contrib - Line Operations', () => {
assert
.
deepEqual
(
editor
.
getSelection
().
toString
(),
new
Selection
(
3
,
4
,
3
,
8
).
toString
(),
'
003
'
);
});
});
test
(
'
should push undo stop
'
,
function
()
{
withMockCodeEditor
(
[
'
hello
'
,
'
world
'
],
{},
(
editor
,
cursor
)
=>
{
let
model
=
editor
.
getModel
();
let
joinLinesAction
=
new
JoinLinesAction
();
editor
.
setSelection
(
new
Selection
(
1
,
6
,
1
,
6
));
editor
.
trigger
(
'
keyboard
'
,
Handler
.
Type
,
{
text
:
'
my dear
'
});
assert
.
equal
(
model
.
getLineContent
(
1
),
'
hello my dear
'
);
assert
.
deepEqual
(
editor
.
getSelection
(),
new
Selection
(
1
,
14
,
1
,
14
));
joinLinesAction
.
run
(
null
,
editor
);
assert
.
equal
(
model
.
getLineContent
(
1
),
'
hello my dear world
'
);
assert
.
deepEqual
(
editor
.
getSelection
(),
new
Selection
(
1
,
14
,
1
,
14
));
editor
.
trigger
(
'
keyboard
'
,
Handler
.
Undo
,
{});
assert
.
equal
(
model
.
getLineContent
(
1
),
'
hello my dear
'
);
assert
.
deepEqual
(
editor
.
getSelection
(),
new
Selection
(
1
,
14
,
1
,
14
));
});
});
});
test
(
'
transpose
'
,
function
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录