Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0332c701
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,发现更多精彩内容 >>
提交
0332c701
编写于
5月 29, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #50632
上级
5fad13aa
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
26 addition
and
11 deletion
+26
-11
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
...vs/workbench/parts/preferences/browser/settingsEditor2.ts
+26
-11
未找到文件。
src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
浏览文件 @
0332c701
...
...
@@ -56,6 +56,7 @@ export class SettingsEditor2 extends BaseEditor {
private
delayedFilterLogging
:
Delayer
<
void
>
;
private
localSearchDelayer
:
Delayer
<
void
>
;
private
remoteSearchThrottle
:
ThrottledDelayer
<
void
>
;
private
searchInProgress
:
TPromise
<
void
>
;
private
pendingSettingModifiedReport
:
{
key
:
string
,
value
:
any
};
...
...
@@ -424,14 +425,18 @@ export class SettingsEditor2 extends BaseEditor {
private
triggerSearch
(
query
:
string
):
TPromise
<
void
>
{
if
(
query
)
{
return
TPromise
.
join
([
return
this
.
searchInProgress
=
TPromise
.
join
([
this
.
localSearchDelayer
.
trigger
(()
=>
this
.
localFilterPreferences
(
query
)),
this
.
remoteSearchThrottle
.
trigger
(()
=>
this
.
remoteSearchPreferences
(
query
),
500
)
])
as
TPromise
;
]).
then
(()
=>
{
this
.
searchInProgress
=
null
;
});
}
else
{
// When clearing the input, update immediately to clear it
this
.
localSearchDelayer
.
cancel
();
this
.
remoteSearchThrottle
.
cancel
();
if
(
this
.
searchInProgress
&&
this
.
searchInProgress
.
cancel
)
{
this
.
searchInProgress
.
cancel
();
}
this
.
searchResultModel
=
null
;
this
.
settingsTree
.
setInput
(
this
.
defaultSettingsEditorModel
);
...
...
@@ -495,15 +500,25 @@ export class SettingsEditor2 extends BaseEditor {
private
filterOrSearchPreferences
(
query
:
string
,
type
:
SearchResultIdx
,
searchProvider
:
ISearchProvider
):
TPromise
<
void
>
{
const
filterPs
:
TPromise
<
ISearchResult
>
[]
=
[
this
.
_filterOrSearchPreferencesModel
(
query
,
this
.
defaultSettingsEditorModel
,
searchProvider
)];
return
TPromise
.
join
(
filterPs
).
then
(
results
=>
{
const
[
result
]
=
results
;
if
(
!
this
.
searchResultModel
)
{
this
.
searchResultModel
=
new
SearchResultModel
();
this
.
settingsTree
.
setInput
(
this
.
searchResultModel
);
}
let
isCanceled
=
false
;
return
new
TPromise
(
resolve
=>
{
return
TPromise
.
join
(
filterPs
).
then
(
results
=>
{
if
(
isCanceled
)
{
// Handle cancellation like this because cancellation is lost inside the search provider due to async/await
return
null
;
}
const
[
result
]
=
results
;
if
(
!
this
.
searchResultModel
)
{
this
.
searchResultModel
=
new
SearchResultModel
();
this
.
settingsTree
.
setInput
(
this
.
searchResultModel
);
}
this
.
searchResultModel
.
setResult
(
type
,
result
);
return
this
.
refreshTreeAndMaintainFocus
();
this
.
searchResultModel
.
setResult
(
type
,
result
);
resolve
(
this
.
refreshTreeAndMaintainFocus
());
});
},
()
=>
{
isCanceled
=
true
;
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录