Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
46098598
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,发现更多精彩内容 >>
提交
46098598
编写于
10月 02, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #81137
上级
ff42be5d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
18 deletion
+23
-18
src/vs/editor/contrib/snippet/snippetSession.ts
src/vs/editor/contrib/snippet/snippetSession.ts
+2
-2
src/vs/editor/contrib/snippet/snippetVariables.ts
src/vs/editor/contrib/snippet/snippetVariables.ts
+9
-4
src/vs/editor/contrib/snippet/test/snippetVariables.test.ts
src/vs/editor/contrib/snippet/test/snippetVariables.test.ts
+12
-12
未找到文件。
src/vs/editor/contrib/snippet/snippetSession.ts
浏览文件 @
46098598
...
...
@@ -392,7 +392,7 @@ export class SnippetSession {
const
modelBasedVariableResolver
=
editor
.
invokeWithinContext
(
accessor
=>
new
ModelBasedVariableResolver
(
accessor
.
get
(
ILabelService
,
optional
),
model
));
const
clipboardService
=
editor
.
invokeWithinContext
(
accessor
=>
accessor
.
get
(
IClipboardService
,
optional
));
c
lipboardText
=
clipboardText
||
clipboardService
&&
clipboardService
.
readTextSync
();
c
onst
readClipboardText
=
()
=>
clipboardText
||
clipboardService
&&
clipboardService
.
readTextSync
();
let
delta
=
0
;
...
...
@@ -445,7 +445,7 @@ export class SnippetSession {
snippet
.
resolveVariables
(
new
CompositeSnippetVariableResolver
([
modelBasedVariableResolver
,
new
ClipboardBasedVariableResolver
(
c
lipboardText
,
idx
,
indexedSelections
.
length
,
editor
.
getOption
(
EditorOption
.
multiCursorPaste
)
===
'
spread
'
),
new
ClipboardBasedVariableResolver
(
readC
lipboardText
,
idx
,
indexedSelections
.
length
,
editor
.
getOption
(
EditorOption
.
multiCursorPaste
)
===
'
spread
'
),
new
SelectionBasedVariableResolver
(
model
,
selection
),
new
CommentBasedVariableResolver
(
model
),
new
TimeBasedVariableResolver
,
...
...
src/vs/editor/contrib/snippet/snippetVariables.ts
浏览文件 @
46098598
...
...
@@ -164,10 +164,14 @@ export class ModelBasedVariableResolver implements VariableResolver {
}
}
export
interface
IReadClipboardText
{
():
string
|
undefined
;
}
export
class
ClipboardBasedVariableResolver
implements
VariableResolver
{
constructor
(
private
readonly
_
clipboardText
:
string
|
undefined
,
private
readonly
_
readClipboardText
:
IReadClipboardText
,
private
readonly
_selectionIdx
:
number
,
private
readonly
_selectionCount
:
number
,
private
readonly
_spread
:
boolean
...
...
@@ -180,7 +184,8 @@ export class ClipboardBasedVariableResolver implements VariableResolver {
return
undefined
;
}
if
(
!
this
.
_clipboardText
)
{
const
clipboardText
=
this
.
_readClipboardText
();
if
(
!
clipboardText
)
{
return
undefined
;
}
...
...
@@ -188,12 +193,12 @@ export class ClipboardBasedVariableResolver implements VariableResolver {
// text whenever there the line count equals the cursor count
// and when enabled
if
(
this
.
_spread
)
{
const
lines
=
this
.
_
clipboardText
.
split
(
/
\r\n
|
\n
|
\r
/
).
filter
(
s
=>
!
isFalsyOrWhitespace
(
s
));
const
lines
=
clipboardText
.
split
(
/
\r\n
|
\n
|
\r
/
).
filter
(
s
=>
!
isFalsyOrWhitespace
(
s
));
if
(
lines
.
length
===
this
.
_selectionCount
)
{
return
lines
[
this
.
_selectionIdx
];
}
}
return
this
.
_
clipboardText
;
return
clipboardText
;
}
}
export
class
CommentBasedVariableResolver
implements
VariableResolver
{
...
...
src/vs/editor/contrib/snippet/test/snippetVariables.test.ts
浏览文件 @
46098598
...
...
@@ -236,28 +236,28 @@ suite('Snippet Variables Resolver', function () {
test
(
'
Add variable to insert value from clipboard to a snippet #40153
'
,
function
()
{
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
undefined
,
1
,
0
,
true
),
'
CLIPBOARD
'
,
undefined
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
()
=>
undefined
,
1
,
0
,
true
),
'
CLIPBOARD
'
,
undefined
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
null
!
,
1
,
0
,
true
),
'
CLIPBOARD
'
,
undefined
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
()
=>
null
!
,
1
,
0
,
true
),
'
CLIPBOARD
'
,
undefined
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
''
,
1
,
0
,
true
),
'
CLIPBOARD
'
,
undefined
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
()
=>
''
,
1
,
0
,
true
),
'
CLIPBOARD
'
,
undefined
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
'
foo
'
,
1
,
0
,
true
),
'
CLIPBOARD
'
,
'
foo
'
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
()
=>
'
foo
'
,
1
,
0
,
true
),
'
CLIPBOARD
'
,
'
foo
'
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
'
foo
'
,
1
,
0
,
true
),
'
foo
'
,
undefined
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
'
foo
'
,
1
,
0
,
true
),
'
cLIPBOARD
'
,
undefined
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
()
=>
'
foo
'
,
1
,
0
,
true
),
'
foo
'
,
undefined
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
()
=>
'
foo
'
,
1
,
0
,
true
),
'
cLIPBOARD
'
,
undefined
);
});
test
(
'
Add variable to insert value from clipboard to a snippet #40153
'
,
function
()
{
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
'
line1
'
,
1
,
2
,
true
),
'
CLIPBOARD
'
,
'
line1
'
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
'
line1
\n
line2
\n
line3
'
,
1
,
2
,
true
),
'
CLIPBOARD
'
,
'
line1
\n
line2
\n
line3
'
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
()
=>
'
line1
'
,
1
,
2
,
true
),
'
CLIPBOARD
'
,
'
line1
'
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
()
=>
'
line1
\n
line2
\n
line3
'
,
1
,
2
,
true
),
'
CLIPBOARD
'
,
'
line1
\n
line2
\n
line3
'
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
'
line1
\n
line2
'
,
1
,
2
,
true
),
'
CLIPBOARD
'
,
'
line2
'
);
resolver
=
new
ClipboardBasedVariableResolver
(
'
line1
\n
line2
'
,
0
,
2
,
true
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
'
line1
\n
line2
'
,
0
,
2
,
true
),
'
CLIPBOARD
'
,
'
line1
'
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
()
=>
'
line1
\n
line2
'
,
1
,
2
,
true
),
'
CLIPBOARD
'
,
'
line2
'
);
resolver
=
new
ClipboardBasedVariableResolver
(
()
=>
'
line1
\n
line2
'
,
0
,
2
,
true
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
()
=>
'
line1
\n
line2
'
,
0
,
2
,
true
),
'
CLIPBOARD
'
,
'
line1
'
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
'
line1
\n
line2
'
,
0
,
2
,
false
),
'
CLIPBOARD
'
,
'
line1
\n
line2
'
);
assertVariableResolve
(
new
ClipboardBasedVariableResolver
(
()
=>
'
line1
\n
line2
'
,
0
,
2
,
false
),
'
CLIPBOARD
'
,
'
line1
\n
line2
'
);
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录