Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ac5d1a09
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,发现更多精彩内容 >>
提交
ac5d1a09
编写于
5月 08, 2020
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Validate that search folders exist for all providers, not just the disk provider
Fix #94170
上级
0a3df930
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
48 addition
and
57 deletion
+48
-57
src/vs/workbench/services/search/common/searchService.ts
src/vs/workbench/services/search/common/searchService.ts
+31
-29
src/vs/workbench/services/search/node/searchService.ts
src/vs/workbench/services/search/node/searchService.ts
+17
-28
未找到文件。
src/vs/workbench/services/search/common/searchService.ts
浏览文件 @
ac5d1a09
...
...
@@ -116,41 +116,43 @@ export class SearchService extends Disposable implements ISearchService {
schemesInQuery
.
forEach
(
scheme
=>
providerActivations
.
push
(
this
.
extensionService
.
activateByEvent
(
`onSearch:
${
scheme
}
`
)));
providerActivations
.
push
(
this
.
extensionService
.
activateByEvent
(
'
onSearch:file
'
));
const
providerPromise
=
Promise
.
all
(
providerActivations
)
.
then
(()
=>
this
.
extensionService
.
whenInstalledExtensionsRegistered
())
.
then
(()
=>
{
// Cancel faster if search was canceled while waiting for extensions
if
(
token
&&
token
.
isCancellationRequested
)
{
return
Promise
.
reject
(
canceled
());
}
const
providerPromise
=
(
async
()
=>
{
await
Promise
.
all
(
providerActivations
);
this
.
extensionService
.
whenInstalledExtensionsRegistered
();
const
progressCallback
=
(
item
:
ISearchProgressItem
)
=>
{
if
(
token
&&
token
.
isCancellationRequested
)
{
return
;
}
// Cancel faster if search was canceled while waiting for extensions
if
(
token
&&
token
.
isCancellationRequested
)
{
return
Promise
.
reject
(
canceled
())
;
}
if
(
onProgress
)
{
onProgress
(
item
);
}
}
;
const
progressCallback
=
(
item
:
ISearchProgressItem
)
=>
{
if
(
token
&&
token
.
isCancellationRequested
)
{
return
;
}
return
this
.
searchWithProviders
(
query
,
progressCallback
,
token
);
})
.
then
(
completes
=>
{
completes
=
arrays
.
coalesce
(
completes
);
if
(
!
completes
.
length
)
{
return
{
limitHit
:
false
,
results
:
[]
};
if
(
onProgress
)
{
onProgress
(
item
);
}
};
const
exists
=
await
Promise
.
all
(
query
.
folderQueries
.
map
(
query
=>
this
.
fileService
.
exists
(
query
.
folder
)));
query
.
folderQueries
=
query
.
folderQueries
.
filter
((
_
,
i
)
=>
exists
[
i
]);
return
<
ISearchComplete
>
{
limitHit
:
completes
[
0
]
&&
completes
[
0
].
limitHit
,
stats
:
completes
[
0
].
stats
,
results
:
arrays
.
flatten
(
completes
.
map
((
c
:
ISearchComplete
)
=>
c
.
results
))
let
completes
=
await
this
.
searchWithProviders
(
query
,
progressCallback
,
token
);
completes
=
arrays
.
coalesce
(
completes
);
if
(
!
completes
.
length
)
{
return
{
limitHit
:
false
,
results
:
[]
};
});
}
return
<
ISearchComplete
>
{
limitHit
:
completes
[
0
]
&&
completes
[
0
].
limitHit
,
stats
:
completes
[
0
].
stats
,
results
:
arrays
.
flatten
(
completes
.
map
((
c
:
ISearchComplete
)
=>
c
.
results
))
};
})();
return
new
Promise
((
resolve
,
reject
)
=>
{
if
(
token
)
{
...
...
src/vs/workbench/services/search/node/searchService.ts
浏览文件 @
ac5d1a09
...
...
@@ -51,7 +51,6 @@ export class DiskSearch implements ISearchResultProvider {
searchDebug
:
IDebugParams
|
undefined
,
@
ILogService
private
readonly
logService
:
ILogService
,
@
IConfigurationService
private
readonly
configService
:
IConfigurationService
,
@
IFileService
private
readonly
fileService
:
IFileService
)
{
const
timeout
=
this
.
configService
.
getValue
<
ISearchConfiguration
>
().
search
.
maintainFileSearchCache
?
Number
.
MAX_VALUE
:
...
...
@@ -91,41 +90,31 @@ export class DiskSearch implements ISearchResultProvider {
}
textSearch
(
query
:
ITextQuery
,
onProgress
?:
(
p
:
ISearchProgressItem
)
=>
void
,
token
?:
CancellationToken
):
Promise
<
ISearchComplete
>
{
const
folderQueries
=
query
.
folderQueries
||
[];
return
Promise
.
all
(
folderQueries
.
map
(
q
=>
this
.
fileService
.
exists
(
q
.
folder
)))
.
then
(
exists
=>
{
if
(
token
&&
token
.
isCancellationRequested
)
{
throw
canceled
();
}
if
(
token
&&
token
.
isCancellationRequested
)
{
throw
canceled
();
}
query
.
folderQueries
=
folderQueries
.
filter
((
q
,
index
)
=>
exists
[
index
]);
const
event
:
Event
<
ISerializedSearchProgressItem
|
ISerializedSearchComplete
>
=
this
.
raw
.
textSearch
(
query
);
const
event
:
Event
<
ISerializedSearchProgressItem
|
ISerializedSearchComplete
>
=
this
.
raw
.
textSearch
(
query
);
return
DiskSearch
.
collectResultsFromEvent
(
event
,
onProgress
,
token
);
});
return
DiskSearch
.
collectResultsFromEvent
(
event
,
onProgress
,
token
);
}
fileSearch
(
query
:
IFileQuery
,
token
?:
CancellationToken
):
Promise
<
ISearchComplete
>
{
const
folderQueries
=
query
.
folderQueries
||
[];
return
Promise
.
all
(
folderQueries
.
map
(
q
=>
this
.
fileService
.
exists
(
q
.
folder
)))
.
then
(
exists
=>
{
if
(
token
&&
token
.
isCancellationRequested
)
{
throw
canceled
();
}
if
(
token
&&
token
.
isCancellationRequested
)
{
throw
canceled
();
}
query
.
folderQueries
=
folderQueries
.
filter
((
q
,
index
)
=>
exists
[
index
]);
let
event
:
Event
<
ISerializedSearchProgressItem
|
ISerializedSearchComplete
>
;
event
=
this
.
raw
.
fileSearch
(
query
);
let
event
:
Event
<
ISerializedSearchProgressItem
|
ISerializedSearchComplete
>
;
event
=
this
.
raw
.
fileSearch
(
query
);
const
onProgress
=
(
p
:
ISearchProgressItem
)
=>
{
if
(
!
isFileMatch
(
p
))
{
// Should only be for logs
this
.
logService
.
debug
(
'
SearchService#search
'
,
p
.
message
);
}
};
const
onProgress
=
(
p
:
ISearchProgressItem
)
=>
{
if
(
!
isFileMatch
(
p
))
{
// Should only be for logs
this
.
logService
.
debug
(
'
SearchService#search
'
,
p
.
message
);
}
};
return
DiskSearch
.
collectResultsFromEvent
(
event
,
onProgress
,
token
);
});
return
DiskSearch
.
collectResultsFromEvent
(
event
,
onProgress
,
token
);
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录