Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a951efaf
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,发现更多精彩内容 >>
提交
a951efaf
编写于
10月 01, 2018
作者:
S
Stepan Usatyuk
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix settings state being persisted when it's closed while invisible
上级
bf0b659f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
15 deletion
+9
-15
src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts
...nch/parts/preferences/electron-browser/settingsEditor2.ts
+9
-15
未找到文件。
src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts
浏览文件 @
a951efaf
...
...
@@ -47,7 +47,7 @@ import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW
import
{
IPreferencesService
,
ISearchResult
,
ISettingsEditorModel
,
ISettingsEditorOptions
,
SettingsEditorOptions
,
SettingValueType
}
from
'
vs/workbench/services/preferences/common/preferences
'
;
import
{
SettingsEditor2Input
}
from
'
vs/workbench/services/preferences/common/preferencesEditorInput
'
;
import
{
Settings2EditorModel
}
from
'
vs/workbench/services/preferences/common/preferencesModels
'
;
import
{
IEditorGroupsService
,
IEditorGroup
}
from
'
vs/workbench/services/group/common/editorGroupsService
'
;
import
{
IEditorGroupsService
}
from
'
vs/workbench/services/group/common/editorGroupsService
'
;
const
$
=
DOM
.
$
;
...
...
@@ -188,13 +188,6 @@ export class SettingsEditor2 extends BaseEditor {
this
.
updateStyles
();
}
public
setEditorVisible
(
visible
:
boolean
,
group
:
IEditorGroup
):
void
{
if
(
!
visible
)
{
this
.
editorMemento
.
clearState
(
this
.
input
,
this
.
group
);
}
super
.
setEditorVisible
(
visible
,
group
);
}
setInput
(
input
:
SettingsEditor2Input
,
options
:
SettingsEditorOptions
,
token
:
CancellationToken
):
Thenable
<
void
>
{
this
.
inSettingsEditorContextKey
.
set
(
true
);
return
super
.
setInput
(
input
,
options
,
token
)
...
...
@@ -248,6 +241,7 @@ export class SettingsEditor2 extends BaseEditor {
clearInput
():
void
{
this
.
inSettingsEditorContextKey
.
set
(
false
);
this
.
editorMemento
.
clearState
(
this
.
input
,
this
.
group
);
super
.
clearInput
();
}
...
...
@@ -857,12 +851,6 @@ export class SettingsEditor2 extends BaseEditor {
resolvedSettingsRoot
.
children
.
push
(
resolveExtensionsSettings
(
dividedGroups
.
extension
||
[]));
// Make sure that all extensions' settings are included in search results
const
cachedState
=
this
.
editorMemento
.
loadState
(
this
.
group
,
this
.
input
);
if
(
cachedState
&&
cachedState
.
searchQuery
)
{
this
.
triggerSearch
(
cachedState
.
searchQuery
);
}
if
(
this
.
searchResultModel
)
{
this
.
searchResultModel
.
updateChildren
();
}
...
...
@@ -870,7 +858,13 @@ export class SettingsEditor2 extends BaseEditor {
if
(
this
.
settingsTreeModel
)
{
this
.
settingsTreeModel
.
update
(
resolvedSettingsRoot
);
return
this
.
renderTree
(
undefined
,
forceRefresh
);
// Make sure that all extensions' settings are included in search results
const
cachedState
=
this
.
editorMemento
.
loadState
(
this
.
group
,
this
.
input
);
if
(
cachedState
&&
cachedState
.
searchQuery
)
{
this
.
triggerSearch
(
cachedState
.
searchQuery
);
}
else
{
return
this
.
renderTree
(
undefined
,
forceRefresh
);
}
}
else
{
this
.
settingsTreeModel
=
this
.
instantiationService
.
createInstance
(
SettingsTreeModel
,
this
.
viewState
);
this
.
settingsTreeModel
.
update
(
resolvedSettingsRoot
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录