Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
383d1054
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,发现更多精彩内容 >>
提交
383d1054
编写于
3月 21, 2017
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Send request to search proc ASAP, and send local results ASAP
上级
177700c0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
14 deletion
+6
-14
src/vs/workbench/parts/search/common/searchModel.ts
src/vs/workbench/parts/search/common/searchModel.ts
+0
-1
src/vs/workbench/services/search/node/searchService.ts
src/vs/workbench/services/search/node/searchService.ts
+6
-13
未找到文件。
src/vs/workbench/parts/search/common/searchModel.ts
浏览文件 @
383d1054
...
...
@@ -552,7 +552,6 @@ export class SearchModel extends Disposable {
this
.
_searchResult
.
query
=
this
.
_searchQuery
.
contentPattern
;
this
.
_replacePattern
=
new
ReplacePattern
(
this
.
_replaceString
,
this
.
_searchQuery
.
contentPattern
);
const
onDone
=
fromPromise
(
this
.
currentRequest
);
const
onDoneStopwatch
=
stopwatch
(
onDone
);
const
start
=
Date
.
now
();
...
...
src/vs/workbench/services/search/node/searchService.ts
浏览文件 @
383d1054
...
...
@@ -63,23 +63,18 @@ export class SearchService implements ISearchService {
let
rawSearchQuery
:
PPromise
<
void
,
ISearchProgressItem
>
;
return
new
PPromise
<
ISearchComplete
,
ISearchProgressItem
>
((
onComplete
,
onError
,
onProgress
)
=>
{
const
searchP
=
this
.
diskSearch
.
search
(
query
);
// Get local results from dirty/untitled
let
localResultsFlushed
=
false
;
let
localResults
=
this
.
getLocalResults
(
query
);
const
localResults
=
this
.
getLocalResults
(
query
);
let
flushLocalResultsOnce
=
function
()
{
if
(
!
localResultsFlushed
)
{
localResultsFlushed
=
true
;
localResults
.
values
().
filter
((
res
)
=>
!!
res
).
forEach
(
onProgress
);
}
};
// Allow caller to register progress callback
process
.
nextTick
(()
=>
localResults
.
values
().
filter
((
res
)
=>
!!
res
).
forEach
(
onProgress
));
// Delegate to parent for real file results
rawSearchQuery
=
this
.
diskSearch
.
search
(
query
).
then
(
rawSearchQuery
=
searchP
.
then
(
// on Complete
(
complete
)
=>
{
flushLocalResultsOnce
();
onComplete
({
limitHit
:
complete
.
limitHit
,
results
:
complete
.
results
.
filter
((
match
)
=>
!
localResults
.
has
(
match
.
resource
)),
// dont override local results
...
...
@@ -89,13 +84,11 @@ export class SearchService implements ISearchService {
// on Error
(
error
)
=>
{
flushLocalResultsOnce
();
onError
(
error
);
},
// on Progress
(
progress
)
=>
{
flushLocalResultsOnce
();
// Match
if
(
progress
.
resource
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录