Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
de8f1b80
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,发现更多精彩内容 >>
提交
de8f1b80
编写于
3月 05, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
reset editor selection when explicitly cancelling snippet mode, #68512
上级
1eb6de1d
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
48 addition
and
2 deletion
+48
-2
src/vs/editor/contrib/snippet/snippetController2.ts
src/vs/editor/contrib/snippet/snippetController2.ts
+8
-2
src/vs/editor/contrib/snippet/test/snippetController2.test.ts
...vs/editor/contrib/snippet/test/snippetController2.test.ts
+40
-0
未找到文件。
src/vs/editor/contrib/snippet/snippetController2.ts
浏览文件 @
de8f1b80
...
...
@@ -193,7 +193,7 @@ export class SnippetController2 implements IEditorContribution {
}
}
cancel
():
void
{
cancel
(
resetSelection
:
boolean
=
false
):
void
{
this
.
_inSnippet
.
reset
();
this
.
_hasPrevTabstop
.
reset
();
this
.
_hasNextTabstop
.
reset
();
...
...
@@ -201,6 +201,12 @@ export class SnippetController2 implements IEditorContribution {
dispose
(
this
.
_session
);
this
.
_session
=
undefined
;
this
.
_modelVersionId
=
-
1
;
if
(
resetSelection
)
{
// reset selection to the primary cursor when being asked
// for. this happens when explicitly cancelling snippet mode,
// e.g. when pressing ESC
this
.
_editor
.
setSelections
([
this
.
_editor
.
getSelection
()]);
}
}
prev
():
void
{
...
...
@@ -257,7 +263,7 @@ registerEditorCommand(new CommandCtor({
registerEditorCommand
(
new
CommandCtor
({
id
:
'
leaveSnippet
'
,
precondition
:
SnippetController2
.
InSnippetMode
,
handler
:
ctrl
=>
ctrl
.
cancel
(),
handler
:
ctrl
=>
ctrl
.
cancel
(
true
),
kbOpts
:
{
weight
:
KeybindingWeight
.
EditorContrib
+
30
,
kbExpr
:
EditorContextKeys
.
editorTextFocus
,
...
...
src/vs/editor/contrib/snippet/test/snippetController2.test.ts
浏览文件 @
de8f1b80
...
...
@@ -361,4 +361,44 @@ suite('SnippetController2', function () {
assertSelections
(
editor
,
new
Selection
(
1
,
7
,
1
,
7
));
assertContextKeys
(
contextKeys
,
false
,
false
,
false
);
});
test
(
'
Cancelling snippet mode should discard added cursors #68512 (soft cancel)
'
,
function
()
{
const
ctrl
=
new
SnippetController2
(
editor
,
logService
,
contextKeys
);
model
.
setValue
(
''
);
editor
.
setSelection
(
new
Selection
(
1
,
1
,
1
,
1
));
ctrl
.
insert
(
'
.REGION ${2:FUNCTION_NAME}
\n
CREATE.FUNCTION ${1:VOID} ${2:FUNCTION_NAME}(${3:})
\n\t
${4:}
\n
END
\n
.ENDREGION$0
'
);
assertSelections
(
editor
,
new
Selection
(
2
,
17
,
2
,
21
));
ctrl
.
next
();
assertSelections
(
editor
,
new
Selection
(
1
,
9
,
1
,
22
),
new
Selection
(
2
,
22
,
2
,
35
));
assertContextKeys
(
contextKeys
,
true
,
true
,
true
);
editor
.
setSelections
([
new
Selection
(
1
,
22
,
1
,
22
),
new
Selection
(
2
,
35
,
2
,
35
)]);
assertContextKeys
(
contextKeys
,
true
,
true
,
true
);
editor
.
setSelections
([
new
Selection
(
2
,
1
,
2
,
1
),
new
Selection
(
2
,
36
,
2
,
36
)]);
assertContextKeys
(
contextKeys
,
false
,
false
,
false
);
assertSelections
(
editor
,
new
Selection
(
2
,
1
,
2
,
1
),
new
Selection
(
2
,
36
,
2
,
36
));
});
test
(
'
Cancelling snippet mode should discard added cursors #68512 (hard cancel)
'
,
function
()
{
const
ctrl
=
new
SnippetController2
(
editor
,
logService
,
contextKeys
);
model
.
setValue
(
''
);
editor
.
setSelection
(
new
Selection
(
1
,
1
,
1
,
1
));
ctrl
.
insert
(
'
.REGION ${2:FUNCTION_NAME}
\n
CREATE.FUNCTION ${1:VOID} ${2:FUNCTION_NAME}(${3:})
\n\t
${4:}
\n
END
\n
.ENDREGION$0
'
);
assertSelections
(
editor
,
new
Selection
(
2
,
17
,
2
,
21
));
ctrl
.
next
();
assertSelections
(
editor
,
new
Selection
(
1
,
9
,
1
,
22
),
new
Selection
(
2
,
22
,
2
,
35
));
assertContextKeys
(
contextKeys
,
true
,
true
,
true
);
editor
.
setSelections
([
new
Selection
(
1
,
22
,
1
,
22
),
new
Selection
(
2
,
35
,
2
,
35
)]);
assertContextKeys
(
contextKeys
,
true
,
true
,
true
);
ctrl
.
cancel
(
true
);
assertContextKeys
(
contextKeys
,
false
,
false
,
false
);
assertSelections
(
editor
,
new
Selection
(
1
,
22
,
1
,
22
));
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录