Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8b04cae3
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,发现更多精彩内容 >>
提交
8b04cae3
编写于
9月 12, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #31619
上级
140c1c74
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
1 deletion
+27
-1
src/vs/editor/contrib/snippet/snippetSession.ts
src/vs/editor/contrib/snippet/snippetSession.ts
+11
-1
src/vs/editor/contrib/snippet/test/snippetController2.test.ts
...vs/editor/contrib/snippet/test/snippetController2.test.ts
+16
-0
未找到文件。
src/vs/editor/contrib/snippet/snippetSession.ts
浏览文件 @
8b04cae3
...
...
@@ -106,18 +106,21 @@ export class OneSnippet {
}
}
let
skipThisPlaceholder
=
false
;
if
(
fwd
===
true
&&
this
.
_placeholderGroupsIdx
<
this
.
_placeholderGroups
.
length
-
1
)
{
this
.
_placeholderGroupsIdx
+=
1
;
skipThisPlaceholder
=
true
;
}
else
if
(
fwd
===
false
&&
this
.
_placeholderGroupsIdx
>
0
)
{
this
.
_placeholderGroupsIdx
-=
1
;
skipThisPlaceholder
=
true
;
}
else
{
// the selection of the current placeholder might
// not acurate any more -> simply restore it
}
return
this
.
_editor
.
getModel
().
changeDecorations
(
accessor
=>
{
const
newSelections
=
this
.
_editor
.
getModel
().
changeDecorations
(
accessor
=>
{
const
activePlaceholders
=
new
Set
<
Placeholder
>
();
...
...
@@ -132,6 +135,11 @@ export class OneSnippet {
const
range
=
this
.
_editor
.
getModel
().
getDecorationRange
(
id
);
selections
.
push
(
new
Selection
(
range
.
startLineNumber
,
range
.
startColumn
,
range
.
endLineNumber
,
range
.
endColumn
));
// consider to skip this placeholder index when the decoration
// range is empty but when the placeholder wasn't. that's a strong
// hint that the placeholder has been deleted. (all placeholder must match this)
skipThisPlaceholder
=
skipThisPlaceholder
&&
(
range
.
isEmpty
()
&&
placeholder
.
toString
().
length
>
0
);
accessor
.
changeDecorationOptions
(
id
,
placeholder
.
isFinalTabstop
?
OneSnippet
.
_decor
.
activeFinal
:
OneSnippet
.
_decor
.
active
);
activePlaceholders
.
add
(
placeholder
);
...
...
@@ -152,6 +160,8 @@ export class OneSnippet {
return
selections
;
});
return
!
skipThisPlaceholder
?
newSelections
:
this
.
move
(
fwd
);
}
get
isAtFirstPlaceholder
()
{
...
...
src/vs/editor/contrib/snippet/test/snippetController2.test.ts
浏览文件 @
8b04cae3
...
...
@@ -12,6 +12,7 @@ import { TextModel } from 'vs/editor/common/model/textModel';
import
{
MockContextKeyService
}
from
'
vs/platform/keybinding/test/common/mockKeybindingService
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
NullLogService
}
from
'
vs/platform/log/common/log
'
;
import
{
Handler
}
from
'
vs/editor/common/editorCommon
'
;
suite
(
'
SnippetController2
'
,
function
()
{
...
...
@@ -347,4 +348,19 @@ suite('SnippetController2', function () {
assertSelections
(
editor
,
new
Selection
(
1
,
49
,
1
,
49
));
assertContextKeys
(
contextKeys
,
false
,
false
,
false
);
});
test
(
'
Must tab through deleted tab stops in snippets #31619
'
,
function
()
{
const
ctrl
=
new
SnippetController2
(
editor
,
logService
,
contextKeys
);
model
.
setValue
(
''
);
editor
.
setSelection
(
new
Selection
(
1
,
1
,
1
,
1
));
ctrl
.
insert
(
'
foo${1:a${2:bar}baz}end$0
'
);
assertSelections
(
editor
,
new
Selection
(
1
,
4
,
1
,
11
));
editor
.
trigger
(
'
test
'
,
Handler
.
Cut
,
null
);
assertSelections
(
editor
,
new
Selection
(
1
,
4
,
1
,
4
));
ctrl
.
next
();
assertSelections
(
editor
,
new
Selection
(
1
,
7
,
1
,
7
));
assertContextKeys
(
contextKeys
,
false
,
false
,
false
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录