Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
557df6e2
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,发现更多精彩内容 >>
提交
557df6e2
编写于
9月 17, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Tests for #55790
上级
b0e32cc5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
45 addition
and
14 deletion
+45
-14
src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
...workbench/test/electron-browser/api/extHostSearch.test.ts
+45
-14
未找到文件。
src/vs/workbench/test/electron-browser/api/extHostSearch.test.ts
浏览文件 @
557df6e2
...
...
@@ -688,7 +688,7 @@ suite('ExtHostSearch', () => {
test
(
'
no results
'
,
async
()
=>
{
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
return
TPromise
.
wrap
(
null
);
}
});
...
...
@@ -705,7 +705,7 @@ suite('ExtHostSearch', () => {
];
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
providedResults
.
forEach
(
r
=>
progress
.
report
(
r
));
return
TPromise
.
wrap
(
null
);
}
...
...
@@ -718,7 +718,7 @@ suite('ExtHostSearch', () => {
test
(
'
all provider calls get global include/excludes
'
,
async
()
=>
{
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
assert
.
equal
(
options
.
includes
.
length
,
1
);
assert
.
equal
(
options
.
excludes
.
length
,
1
);
return
TPromise
.
wrap
(
null
);
...
...
@@ -747,7 +747,7 @@ suite('ExtHostSearch', () => {
test
(
'
global/local include/excludes combined
'
,
async
()
=>
{
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
if
(
options
.
folder
.
toString
()
===
rootFolderA
.
toString
())
{
assert
.
deepEqual
(
options
.
includes
.
sort
(),
[
'
*.ts
'
,
'
foo
'
]);
assert
.
deepEqual
(
options
.
excludes
.
sort
(),
[
'
*.js
'
,
'
bar
'
]);
...
...
@@ -788,7 +788,7 @@ suite('ExtHostSearch', () => {
test
(
'
include/excludes resolved correctly
'
,
async
()
=>
{
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
assert
.
deepEqual
(
options
.
includes
.
sort
(),
[
'
*.jsx
'
,
'
*.ts
'
]);
assert
.
deepEqual
(
options
.
excludes
.
sort
(),
[]);
...
...
@@ -825,7 +825,7 @@ suite('ExtHostSearch', () => {
test
(
'
provider fail
'
,
async
()
=>
{
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
throw
new
Error
(
'
Provider fail
'
);
}
});
...
...
@@ -856,7 +856,7 @@ suite('ExtHostSearch', () => {
];
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
providedResults
.
forEach
(
r
=>
progress
.
report
(
r
));
return
TPromise
.
wrap
(
null
);
}
...
...
@@ -900,7 +900,7 @@ suite('ExtHostSearch', () => {
};
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
let
reportedResults
;
if
(
options
.
folder
.
fsPath
===
rootFolderA
.
fsPath
)
{
reportedResults
=
[
...
...
@@ -964,7 +964,7 @@ suite('ExtHostSearch', () => {
];
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
providedResults
.
forEach
(
r
=>
progress
.
report
(
r
));
return
TPromise
.
wrap
(
null
);
}
...
...
@@ -994,7 +994,7 @@ suite('ExtHostSearch', () => {
let
wasCanceled
=
false
;
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
token
.
onCancellationRequested
(()
=>
wasCanceled
=
true
);
providedResults
.
forEach
(
r
=>
progress
.
report
(
r
));
return
TPromise
.
wrap
(
null
);
...
...
@@ -1026,7 +1026,7 @@ suite('ExtHostSearch', () => {
let
wasCanceled
=
false
;
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
token
.
onCancellationRequested
(()
=>
wasCanceled
=
true
);
providedResults
.
forEach
(
r
=>
progress
.
report
(
r
));
return
TPromise
.
wrap
(
null
);
...
...
@@ -1057,7 +1057,7 @@ suite('ExtHostSearch', () => {
let
wasCanceled
=
false
;
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
token
.
onCancellationRequested
(()
=>
wasCanceled
=
true
);
providedResults
.
forEach
(
r
=>
progress
.
report
(
r
));
return
TPromise
.
wrap
(
null
);
...
...
@@ -1080,10 +1080,39 @@ suite('ExtHostSearch', () => {
assert
(
!
wasCanceled
,
'
Expected not to be canceled
'
);
});
test
(
'
provider returns early with limitHit
'
,
async
()
=>
{
const
providedResults
:
vscode
.
TextSearchResult
[]
=
[
makeTextResult
(
rootFolderA
,
'
file1.ts
'
),
makeTextResult
(
rootFolderA
,
'
file2.ts
'
),
makeTextResult
(
rootFolderA
,
'
file3.ts
'
)
];
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
vscode
.
TextSearchComplete
>
{
providedResults
.
forEach
(
r
=>
progress
.
report
(
r
));
return
TPromise
.
wrap
({
limitHit
:
true
});
}
});
const
query
:
ISearchQuery
=
{
type
:
QueryType
.
Text
,
maxResults
:
1000
,
folderQueries
:
[
{
folder
:
rootFolderA
}
]
};
const
{
results
,
stats
}
=
await
runTextSearch
(
getPattern
(
'
foo
'
),
query
);
assert
(
stats
.
limitHit
,
'
Expected to return limitHit
'
);
assertResults
(
results
,
providedResults
);
});
test
(
'
multiroot max results
'
,
async
()
=>
{
let
cancels
=
0
;
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
token
.
onCancellationRequested
(()
=>
cancels
++
);
return
new
TPromise
(
r
=>
process
.
nextTick
(
r
))
.
then
(()
=>
{
...
...
@@ -1092,6 +1121,8 @@ suite('ExtHostSearch', () => {
'
file2.ts
'
,
'
file3.ts
'
,
].
forEach
(
f
=>
progress
.
report
(
makeTextResult
(
options
.
folder
,
f
)));
return
null
;
});
}
});
...
...
@@ -1120,7 +1151,7 @@ suite('ExtHostSearch', () => {
];
await
registerTestTextSearchProvider
({
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
oid
>
{
provideTextSearchResults
(
query
:
vscode
.
TextSearchQuery
,
options
:
vscode
.
TextSearchOptions
,
progress
:
vscode
.
Progress
<
vscode
.
TextSearchResult
>
,
token
:
vscode
.
CancellationToken
):
Thenable
<
v
scode
.
TextSearchComplete
>
{
providedResults
.
forEach
(
r
=>
progress
.
report
(
r
));
return
TPromise
.
wrap
(
null
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录