Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
7c272edb
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,发现更多精彩内容 >>
提交
7c272edb
编写于
1月 26, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Settings search - clear settings.json Problems when settings editor is closed
上级
f6b128d8
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
2 deletion
+13
-2
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
.../workbench/parts/preferences/browser/preferencesEditor.ts
+13
-2
未找到文件。
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
浏览文件 @
7c272edb
...
@@ -222,6 +222,7 @@ export class PreferencesEditor extends BaseEditor {
...
@@ -222,6 +222,7 @@ export class PreferencesEditor extends BaseEditor {
public
clearInput
():
void
{
public
clearInput
():
void
{
this
.
defaultSettingsEditorContextKey
.
set
(
false
);
this
.
defaultSettingsEditorContextKey
.
set
(
false
);
this
.
sideBySidePreferencesWidget
.
clearInput
();
this
.
sideBySidePreferencesWidget
.
clearInput
();
this
.
preferencesRenderers
.
onHidden
();
super
.
clearInput
();
super
.
clearInput
();
}
}
...
@@ -426,6 +427,11 @@ class PreferencesRenderersController extends Disposable {
...
@@ -426,6 +427,11 @@ class PreferencesRenderersController extends Disposable {
await
this
.
remoteSearchPreferences
(
this
.
_lastQuery
,
true
);
await
this
.
remoteSearchPreferences
(
this
.
_lastQuery
,
true
);
}
}
onHidden
():
void
{
this
.
_prefsModelsForSearch
.
forEach
(
model
=>
model
.
dispose
());
this
.
_prefsModelsForSearch
=
new
Map
<
string
,
ISettingsEditorModel
>
();
}
remoteSearchPreferences
(
query
:
string
,
updateCurrentResults
?:
boolean
):
TPromise
<
void
>
{
remoteSearchPreferences
(
query
:
string
,
updateCurrentResults
?:
boolean
):
TPromise
<
void
>
{
if
(
this
.
_remoteFilterInProgress
&&
this
.
_remoteFilterInProgress
.
cancel
)
{
if
(
this
.
_remoteFilterInProgress
&&
this
.
_remoteFilterInProgress
.
cancel
)
{
// Resolved/rejected promises have no .cancel()
// Resolved/rejected promises have no .cancel()
...
@@ -466,7 +472,7 @@ class PreferencesRenderersController extends Disposable {
...
@@ -466,7 +472,7 @@ class PreferencesRenderersController extends Disposable {
}
}
filterPs
.
push
(
this
.
_filterOrSearchPreferences
(
query
,
this
.
editablePreferencesRenderer
,
searchProvider
,
groupId
,
groupLabel
,
groupOrder
),
filterPs
.
push
(
this
.
_filterOrSearchPreferences
(
query
,
this
.
editablePreferencesRenderer
,
searchProvider
,
groupId
,
groupLabel
,
groupOrder
),
this
.
updateSettingsTargetCoun
ts
(
query
,
searchProvider
,
groupId
,
groupLabel
,
groupOrder
));
this
.
searchAllSettingsTarge
ts
(
query
,
searchProvider
,
groupId
,
groupLabel
,
groupOrder
));
return
TPromise
.
join
(
filterPs
).
then
(
results
=>
{
return
TPromise
.
join
(
filterPs
).
then
(
results
=>
{
const
[
defaultFilterResult
,
editableFilterResult
]
=
results
;
const
[
defaultFilterResult
,
editableFilterResult
]
=
results
;
...
@@ -481,7 +487,12 @@ class PreferencesRenderersController extends Disposable {
...
@@ -481,7 +487,12 @@ class PreferencesRenderersController extends Disposable {
});
});
}
}
private
updateSettingsTargetCounts
(
query
:
string
,
searchProvider
:
ISearchProvider
,
groupId
:
string
,
groupLabel
:
string
,
groupOrder
:
number
):
TPromise
<
void
>
{
private
searchAllSettingsTargets
(
query
:
string
,
searchProvider
:
ISearchProvider
,
groupId
:
string
,
groupLabel
:
string
,
groupOrder
:
number
):
TPromise
<
void
>
{
if
(
!
query
)
{
// Don't open the other settings targets when query is empty
return
TPromise
.
wrap
(
null
);
}
const
searchPs
=
[
const
searchPs
=
[
this
.
searchSettingsTarget
(
searchProvider
,
ConfigurationTarget
.
WORKSPACE
,
groupId
,
groupLabel
,
groupOrder
),
this
.
searchSettingsTarget
(
searchProvider
,
ConfigurationTarget
.
WORKSPACE
,
groupId
,
groupLabel
,
groupOrder
),
this
.
searchSettingsTarget
(
searchProvider
,
ConfigurationTarget
.
USER
,
groupId
,
groupLabel
,
groupOrder
)
this
.
searchSettingsTarget
(
searchProvider
,
ConfigurationTarget
.
USER
,
groupId
,
groupLabel
,
groupOrder
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录