Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
f473dc47
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f473dc47
编写于
11月 25, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix missing file search 'rg' log
上级
2f0315fb
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
22 addition
and
3 deletion
+22
-3
src/vs/workbench/services/search/node/searchService.ts
src/vs/workbench/services/search/node/searchService.ts
+22
-3
未找到文件。
src/vs/workbench/services/search/node/searchService.ts
浏览文件 @
f473dc47
...
...
@@ -20,6 +20,7 @@ import { Client, IIPCOptions } from 'vs/base/parts/ipc/node/ipc.cp';
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IDebugParams
,
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
deserializeSearchError
,
FileMatch
,
ICachedSearchStats
,
IFileMatch
,
IFileQuery
,
IFileSearchStats
,
IFolderQuery
,
IProgress
,
ISearchComplete
,
ISearchConfiguration
,
ISearchEngineStats
,
ISearchProgressItem
,
ISearchQuery
,
ISearchResultProvider
,
ISearchService
,
ITextQuery
,
pathIncludedInQuery
,
QueryType
,
SearchError
,
SearchErrorCode
,
SearchProviderType
}
from
'
vs/platform/search/common/search
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
...
...
@@ -39,6 +40,7 @@ export class SearchService extends Disposable implements ISearchService {
private
readonly
fileIndexProviders
=
new
Map
<
string
,
ISearchResultProvider
>
();
constructor
(
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
IModelService
private
modelService
:
IModelService
,
@
IUntitledEditorService
private
untitledEditorService
:
IUntitledEditorService
,
@
IEditorService
private
editorService
:
IEditorService
,
...
...
@@ -49,7 +51,7 @@ export class SearchService extends Disposable implements ISearchService {
@
IExtensionService
private
extensionService
:
IExtensionService
)
{
super
();
this
.
diskSearch
=
new
DiskSearch
(
!
environmentService
.
isBuilt
||
environmentService
.
verbose
,
/*timeout=*/
undefined
,
environmentService
.
debugSearch
);
this
.
diskSearch
=
this
.
instantiationService
.
createInstance
(
DiskSearch
,
!
environmentService
.
isBuilt
||
environmentService
.
verbose
,
/*timeout=*/
undefined
,
environmentService
.
debugSearch
);
}
public
registerSearchResultProvider
(
scheme
:
string
,
type
:
SearchProviderType
,
provider
:
ISearchResultProvider
):
IDisposable
{
...
...
@@ -448,9 +450,16 @@ export class SearchService extends Disposable implements ISearchService {
}
export
class
DiskSearch
implements
ISearchResultProvider
{
public
_serviceBrand
:
any
;
private
raw
:
IRawSearchService
;
constructor
(
verboseLogging
:
boolean
,
timeout
:
number
=
60
*
60
*
1000
,
searchDebug
?:
IDebugParams
)
{
constructor
(
verboseLogging
:
boolean
,
timeout
:
number
=
60
*
60
*
1000
,
searchDebug
:
IDebugParams
|
undefined
,
@
ILogService
private
readonly
logService
:
ILogService
)
{
const
opts
:
IIPCOptions
=
{
serverName
:
'
Search
'
,
timeout
:
timeout
,
...
...
@@ -511,10 +520,20 @@ export class DiskSearch implements ISearchResultProvider {
let
event
:
Event
<
ISerializedSearchProgressItem
|
ISerializedSearchComplete
>
;
event
=
this
.
raw
.
fileSearch
(
query
);
return
DiskSearch
.
collectResultsFromEvent
(
event
,
null
,
token
);
const
onProgress
=
(
p
:
ISearchProgressItem
)
=>
{
if
(
p
.
message
)
{
// Should only be for logs
this
.
logService
.
debug
(
'
SearchService#search
'
,
p
.
message
);
}
};
return
DiskSearch
.
collectResultsFromEvent
(
event
,
onProgress
,
token
);
});
}
/**
* Public for test
*/
public
static
collectResultsFromEvent
(
event
:
Event
<
ISerializedSearchProgressItem
|
ISerializedSearchComplete
>
,
onProgress
?:
(
p
:
ISearchProgressItem
)
=>
void
,
token
?:
CancellationToken
):
Promise
<
ISearchComplete
>
{
let
result
:
IFileMatch
[]
=
[];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录