Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
78e24f95
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,发现更多精彩内容 >>
提交
78e24f95
编写于
11月 17, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
snippets - handle escaped closed curly, better compacting
上级
7c21c613
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
40 addition
and
15 deletion
+40
-15
src/vs/editor/contrib/snippet/common/snippetParser.ts
src/vs/editor/contrib/snippet/common/snippetParser.ts
+23
-15
src/vs/editor/contrib/snippet/test/common/snippetParser.test.ts
.../editor/contrib/snippet/test/common/snippetParser.test.ts
+17
-0
未找到文件。
src/vs/editor/contrib/snippet/common/snippetParser.ts
浏览文件 @
78e24f95
...
...
@@ -186,24 +186,32 @@ export class SnippetParser {
// * fill in default for empty placeHolders
// * compact sibling Text markers
const
placeholders
:
{
[
name
:
string
]:
Marker
[]
}
=
Object
.
create
(
null
);
for
(
let
i
=
0
;
i
<
marker
.
length
;
i
++
)
{
let
thisMarker
=
marker
[
i
];
if
(
thisMarker
instanceof
Placeholder
)
{
if
(
placeholders
[
thisMarker
.
name
]
===
undefined
)
{
placeholders
[
thisMarker
.
name
]
=
thisMarker
.
value
;
}
else
if
(
thisMarker
.
value
.
length
===
0
)
{
thisMarker
.
value
=
placeholders
[
thisMarker
.
name
].
slice
(
0
);
}
function
compact
(
marker
:
Marker
[],
placeholders
:
{
[
name
:
string
]:
Marker
[]
})
{
for
(
let
i
=
0
;
i
<
marker
.
length
;
i
++
)
{
const
thisMarker
=
marker
[
i
];
if
(
thisMarker
instanceof
Placeholder
)
{
if
(
placeholders
[
thisMarker
.
name
]
===
undefined
)
{
placeholders
[
thisMarker
.
name
]
=
thisMarker
.
value
;
}
else
if
(
thisMarker
.
value
.
length
===
0
)
{
thisMarker
.
value
=
placeholders
[
thisMarker
.
name
].
slice
(
0
);
}
}
else
if
(
i
>
0
&&
thisMarker
instanceof
Text
&&
marker
[
i
-
1
]
instanceof
Text
)
{
(
<
Text
>
marker
[
i
-
1
]).
string
+=
(
<
Text
>
marker
[
i
]).
string
;
marker
.
splice
(
i
,
1
);
i
--
;
if
(
thisMarker
.
value
.
length
>
0
)
{
compact
(
thisMarker
.
value
,
placeholders
);
}
}
else
if
(
i
>
0
&&
thisMarker
instanceof
Text
&&
marker
[
i
-
1
]
instanceof
Text
)
{
(
<
Text
>
marker
[
i
-
1
]).
string
+=
(
<
Text
>
marker
[
i
]).
string
;
marker
.
splice
(
i
,
1
);
i
--
;
}
}
}
compact
(
marker
,
Object
.
create
(
null
));
return
marker
;
}
...
...
@@ -347,7 +355,7 @@ export class SnippetParser {
if
(
// Internal style
(
this
.
_enableInternal
&&
(
this
.
_accept
(
TokenType
.
CurlyOpen
)
||
this
.
_accept
(
TokenType
.
CurlyClose
)
||
this
.
_accept
(
TokenType
.
Backslash
)))
// TextMate style
||
(
this
.
_enableTextMate
&&
this
.
_accept
(
TokenType
.
Dollar
))
||
(
this
.
_enableTextMate
&&
(
this
.
_accept
(
TokenType
.
Dollar
)
||
this
.
_accept
(
TokenType
.
CurlyClose
)
))
)
{
// just consume them
}
...
...
src/vs/editor/contrib/snippet/test/common/snippetParser.test.ts
浏览文件 @
78e24f95
...
...
@@ -127,6 +127,23 @@ suite('SnippetParser', () => {
assertEscape
(
'
far{{id:bern {{basel}}}}boo
'
,
'
farbern baselboo
'
);
assertEscape
(
'
far{{id:bern {{id:basel}}}}boo
'
,
'
farbern baselboo
'
);
assertEscape
(
'
far{{id:bern {{id2:basel}}}}boo
'
,
'
farbern baselboo
'
);
});
test
(
'
Parser, TM escaping
'
,
()
=>
{
assertEscapeAndMarker
(
'
foo${1:bar}}
'
,
'
foobar}
'
,
Text
,
Placeholder
,
Text
);
assertEscapeAndMarker
(
'
foo${1:bar}${2:foo}}
'
,
'
foobarfoo}
'
,
Text
,
Placeholder
,
Placeholder
,
Text
);
assertEscapeAndMarker
(
'
foo${1:bar
\\
}${2:foo}}
'
,
'
foobar}foo
'
,
Text
,
Placeholder
);
let
[,
placeholder
]
=
new
SnippetParser
(
true
,
false
).
parse
(
'
foo${1:bar
\\
}${2:foo}}
'
);
let
{
value
}
=
(
<
Placeholder
>
placeholder
);
assert
.
equal
((
<
Placeholder
>
placeholder
).
name
,
'
1
'
);
assert
.
ok
(
value
[
0
]
instanceof
Text
);
assert
.
equal
(
value
[
0
].
toString
(),
'
bar}
'
);
assert
.
ok
(
value
[
1
]
instanceof
Placeholder
);
assert
.
equal
(
value
[
1
].
toString
(),
'
foo
'
);
});
test
(
'
Parser, placeholder
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录