Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
dfb7a5eb
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,发现更多精彩内容 >>
提交
dfb7a5eb
编写于
4月 06, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #93902
上级
1df0f7bd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
64 addition
and
1 deletion
+64
-1
src/vs/platform/userDataSync/common/snippetsSync.ts
src/vs/platform/userDataSync/common/snippetsSync.ts
+2
-1
src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
...vs/platform/userDataSync/test/common/snippetsSync.test.ts
+62
-0
未找到文件。
src/vs/platform/userDataSync/common/snippetsSync.ts
浏览文件 @
dfb7a5eb
...
...
@@ -416,7 +416,8 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
}
for
(
const
entry
of
stat
.
children
||
[])
{
const
resource
=
entry
.
resource
;
if
(
extname
(
resource
)
===
'
.json
'
)
{
const
extension
=
extname
(
resource
);
if
(
extension
===
'
.json
'
||
extension
===
'
.code-snippet
'
)
{
const
key
=
relativePath
(
this
.
snippetsFolder
,
resource
)
!
;
const
content
=
await
this
.
fileService
.
readFile
(
resource
);
snippets
[
key
]
=
content
;
...
...
src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
浏览文件 @
dfb7a5eb
...
...
@@ -127,6 +127,25 @@ const htmlSnippet3 = `{
}
}`
;
const
globalSnippet
=
`{
// Place your global snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
// $1, $2 for tab stops, $0 for the final cursor position, and {1: label}, { 2: another } for placeholders.
// Placeholders with the same ids are connected.
// Example:
// "Print to console": {
// "scope": "javascript,typescript",
// "prefix": "log",
// "body": [
// "console.log('$1');",
// "$2"
// ],
// "description": "Log output to console"
// }
}`
;
suite
(
'
SnippetsSync
'
,
()
=>
{
const
disposableStore
=
new
DisposableStore
();
...
...
@@ -577,6 +596,49 @@ suite('SnippetsSync', () => {
assert
.
equal
(
actual2
,
tsSnippet1
);
});
test
(
'
sync global and language snippet
'
,
async
()
=>
{
await
updateSnippet
(
'
global.code-snippet
'
,
globalSnippet
,
client2
);
await
updateSnippet
(
'
html.json
'
,
htmlSnippet1
,
client2
);
await
client2
.
sync
();
await
testObject
.
sync
();
assert
.
equal
(
testObject
.
status
,
SyncStatus
.
Idle
);
assert
.
deepEqual
(
testObject
.
conflicts
,
[]);
const
actual1
=
await
readSnippet
(
'
html.json
'
,
testClient
);
assert
.
equal
(
actual1
,
htmlSnippet1
);
const
actual2
=
await
readSnippet
(
'
global.code-snippet
'
,
testClient
);
assert
.
equal
(
actual2
,
globalSnippet
);
const
{
content
}
=
await
testClient
.
read
(
testObject
.
resource
);
assert
.
ok
(
content
!==
null
);
const
actual
=
parseSnippets
(
content
!
);
assert
.
deepEqual
(
actual
,
{
'
html.json
'
:
htmlSnippet1
,
'
global.code-snippet
'
:
globalSnippet
});
});
test
(
'
sync should ignore non snippets
'
,
async
()
=>
{
await
updateSnippet
(
'
global.code-snippet
'
,
globalSnippet
,
client2
);
await
updateSnippet
(
'
html.html
'
,
htmlSnippet1
,
client2
);
await
updateSnippet
(
'
typescript.json
'
,
tsSnippet1
,
client2
);
await
client2
.
sync
();
await
testObject
.
sync
();
assert
.
equal
(
testObject
.
status
,
SyncStatus
.
Idle
);
assert
.
deepEqual
(
testObject
.
conflicts
,
[]);
const
actual1
=
await
readSnippet
(
'
typescript.json
'
,
testClient
);
assert
.
equal
(
actual1
,
tsSnippet1
);
const
actual2
=
await
readSnippet
(
'
global.code-snippet
'
,
testClient
);
assert
.
equal
(
actual2
,
globalSnippet
);
const
actual3
=
await
readSnippet
(
'
html.html
'
,
testClient
);
assert
.
equal
(
actual3
,
null
);
const
{
content
}
=
await
testClient
.
read
(
testObject
.
resource
);
assert
.
ok
(
content
!==
null
);
const
actual
=
parseSnippets
(
content
!
);
assert
.
deepEqual
(
actual
,
{
'
typescript.json
'
:
tsSnippet1
,
'
global.code-snippet
'
:
globalSnippet
});
});
function
parseSnippets
(
content
:
string
):
IStringDictionary
<
string
>
{
const
syncData
:
ISyncData
=
JSON
.
parse
(
content
);
return
JSON
.
parse
(
syncData
.
content
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录