Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
600f599f
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,发现更多精彩内容 >>
提交
600f599f
编写于
10月 05, 2016
作者:
C
Christof Marti
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Prevent cached promise from being canceled (fixes #11181)
上级
61328fd6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
5 deletion
+15
-5
src/vs/workbench/services/search/node/rawSearchService.ts
src/vs/workbench/services/search/node/rawSearchService.ts
+15
-5
未找到文件。
src/vs/workbench/services/search/node/rawSearchService.ts
浏览文件 @
600f599f
...
...
@@ -95,7 +95,7 @@ export class SearchService implements IRawSearchService {
private
doSortedSearch
(
engine
:
ISearchEngine
<
IRawFileMatch
>
,
config
:
IRawSearch
):
PPromise
<
[
ISerializedSearchComplete
,
IRawFileMatch
[]],
IProgress
>
{
let
searchPromise
:
PPromise
<
void
,
IRawProgressItem
<
IRawFileMatch
>>
;
cons
t
allResultsPromise
=
new
PPromise
<
[
ISerializedSearchComplete
,
IRawFileMatch
[]],
IProgress
>
((
c
,
e
,
p
)
=>
{
le
t
allResultsPromise
=
new
PPromise
<
[
ISerializedSearchComplete
,
IRawFileMatch
[]],
IProgress
>
((
c
,
e
,
p
)
=>
{
let
results
:
IRawFileMatch
[]
=
[];
searchPromise
=
this
.
doSearch
(
engine
,
-
1
)
.
then
(
result
=>
{
...
...
@@ -108,9 +108,7 @@ export class SearchService implements IRawSearchService {
}
});
},
()
=>
{
if
(
!
config
.
cacheKey
)
{
// preserve cached promise
searchPromise
.
cancel
();
}
searchPromise
.
cancel
();
});
let
cache
:
Cache
;
...
...
@@ -120,6 +118,7 @@ export class SearchService implements IRawSearchService {
allResultsPromise
.
then
(
null
,
err
=>
{
delete
cache
.
resultsToSearchCache
[
config
.
filePattern
];
});
allResultsPromise
=
this
.
preventCancellation
(
allResultsPromise
);
}
return
new
PPromise
<
[
ISerializedSearchComplete
,
IRawFileMatch
[]],
IProgress
>
((
c
,
e
,
p
)
=>
{
...
...
@@ -227,7 +226,7 @@ export class SearchService implements IRawSearchService {
continue
;
// since a path character widens the search for potential more matches, require it in previous search too
}
cached
=
cache
.
resultsToSearchCache
[
previousSearch
]
;
cached
=
this
.
preventCancellation
(
cache
.
resultsToSearchCache
[
previousSearch
])
;
break
;
}
}
...
...
@@ -303,6 +302,17 @@ export class SearchService implements IRawSearchService {
delete
this
.
caches
[
cacheKey
];
return
TPromise
.
as
(
undefined
);
}
private
preventCancellation
<
C
,
P
>
(
promise
:
PPromise
<
C
,
P
>
):
PPromise
<
C
,
P
>
{
return
new
PPromise
<
C
,
P
>
((
c
,
e
,
p
)
=>
{
// Allow for piled up cancellations to come through first.
process
.
nextTick
(()
=>
{
promise
.
then
(
c
,
e
,
p
);
});
},
()
=>
{
// Do not propagate.
});
}
}
class
Cache
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录