Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
a6d74abc
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a6d74abc
编写于
8月 23, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add failing test, fix test, the feature is actually not done. thi is so tdd - #9764
上级
3e87aced
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
43 addition
and
2 deletion
+43
-2
src/vs/editor/contrib/snippet/common/snippet.ts
src/vs/editor/contrib/snippet/common/snippet.ts
+21
-0
src/vs/editor/contrib/snippet/common/snippetController.ts
src/vs/editor/contrib/snippet/common/snippetController.ts
+4
-2
src/vs/editor/contrib/snippet/test/common/snippetController.test.ts
...tor/contrib/snippet/test/common/snippetController.test.ts
+18
-0
未找到文件。
src/vs/editor/contrib/snippet/common/snippet.ts
浏览文件 @
a6d74abc
...
...
@@ -59,6 +59,27 @@ export class CodeSnippet implements ICodeSnippet {
this
.
parseTemplate
(
snippetTemplate
);
}
get
isInsertOnly
():
boolean
{
return
this
.
placeHolders
.
length
===
0
;
}
get
isSingleTabstopOnly
():
boolean
{
if
(
this
.
placeHolders
.
length
!==
1
)
{
return
false
;
}
const
[
placeHolder
]
=
this
.
placeHolders
;
if
(
placeHolder
.
value
!==
''
||
placeHolder
.
occurences
.
length
!==
1
)
{
return
false
;
}
const
[
placeHolderRange
]
=
placeHolder
.
occurences
;
if
(
!
Range
.
isEmpty
(
placeHolderRange
))
{
return
false
;
}
return
true
;
}
private
parseTemplate
(
template
:
string
):
void
{
var
placeHoldersMap
:
collections
.
IStringDictionary
<
IPlaceHolder
>
=
{};
...
...
src/vs/editor/contrib/snippet/common/snippetController.ts
浏览文件 @
a6d74abc
...
...
@@ -380,9 +380,11 @@ export class SnippetController {
public
run
(
snippet
:
CodeSnippet
,
overwriteBefore
:
number
,
overwriteAfter
:
number
,
stripPrefix
?:
boolean
):
void
{
this
.
_runAndRestoreController
(()
=>
{
if
(
snippet
.
placeHolders
.
length
===
0
)
{
// No placeholders => execute for all editor selections
if
(
snippet
.
isInsertOnly
||
snippet
.
isSingleTabstopOnly
)
{
// Only inserts text, not placeholders, tabstops etc
// Only cursor endposition
this
.
_runForAllSelections
(
snippet
,
overwriteBefore
,
overwriteAfter
,
stripPrefix
);
}
else
{
let
prepared
=
SnippetController
.
_prepareSnippet
(
this
.
_editor
,
this
.
_editor
.
getSelection
(),
snippet
,
overwriteBefore
,
overwriteAfter
,
stripPrefix
);
this
.
_runPreparedSnippetForPrimarySelection
(
prepared
,
true
);
...
...
src/vs/editor/contrib/snippet/test/common/snippetController.test.ts
浏览文件 @
a6d74abc
...
...
@@ -7,6 +7,7 @@
import
*
as
assert
from
'
assert
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
CodeSnippet
}
from
'
vs/editor/contrib/snippet/common/snippet
'
;
import
{
SnippetController
}
from
'
vs/editor/contrib/snippet/common/snippetController
'
;
import
{
MockCodeEditor
,
withMockCodeEditor
}
from
'
vs/editor/test/common/mocks/mockCodeEditor
'
;
...
...
@@ -219,4 +220,21 @@ suite('SnippetController', () => {
assert
.
equal
(
snippetController
.
isInSnippetMode
(),
false
);
});
});
test
(
'
Final tabstop with multiple selection
'
,
()
=>
{
snippetTest
((
editor
,
cursor
,
codeSnippet
,
snippetController
)
=>
{
editor
.
setSelections
([
new
Selection
(
1
,
1
,
1
,
1
),
new
Selection
(
2
,
1
,
2
,
1
),
]);
codeSnippet
=
new
CodeSnippet
(
'
foo{{}}
'
);
snippetController
.
run
(
codeSnippet
,
0
,
0
,
false
);
assert
.
equal
(
editor
.
getSelections
().
length
,
2
);
const
[
first
,
second
]
=
editor
.
getSelections
();
assert
.
ok
(
first
.
equalsRange
({
startLineNumber
:
1
,
startColumn
:
4
,
endLineNumber
:
1
,
endColumn
:
4
}));
assert
.
ok
(
second
.
equalsRange
({
startLineNumber
:
2
,
startColumn
:
4
,
endLineNumber
:
2
,
endColumn
:
4
}));
});
});
});
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录