Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
f6870c02
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,发现更多精彩内容 >>
提交
f6870c02
编写于
8月 31, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #32895
上级
e369dd07
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
5 deletion
+9
-5
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
.../workbench/parts/preferences/browser/preferencesEditor.ts
+9
-5
未找到文件。
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
浏览文件 @
f6870c02
...
...
@@ -349,9 +349,12 @@ class PreferencesRenderers extends Disposable {
this
.
_defaultPreferencesRenderer
=
defaultPreferencesRenderer
;
this
.
_disposables
=
dispose
(
this
.
_disposables
);
this
.
_defaultPreferencesRenderer
.
onUpdatePreference
(({
key
,
value
,
source
})
=>
this
.
_updatePreference
(
key
,
value
,
source
,
this
.
_editablePreferencesRenderer
),
this
,
this
.
_disposables
);
this
.
_defaultPreferencesRenderer
.
onFocusPreference
(
preference
=>
this
.
_focusPreference
(
preference
,
this
.
_editablePreferencesRenderer
),
this
,
this
.
_disposables
);
this
.
_defaultPreferencesRenderer
.
onClearFocusPreference
(
preference
=>
this
.
_clearFocus
(
preference
,
this
.
_editablePreferencesRenderer
),
this
,
this
.
_disposables
);
if
(
this
.
_defaultPreferencesRenderer
)
{
this
.
_defaultPreferencesRenderer
.
onUpdatePreference
(({
key
,
value
,
source
})
=>
this
.
_updatePreference
(
key
,
value
,
source
,
this
.
_editablePreferencesRenderer
),
this
,
this
.
_disposables
);
this
.
_defaultPreferencesRenderer
.
onFocusPreference
(
preference
=>
this
.
_focusPreference
(
preference
,
this
.
_editablePreferencesRenderer
),
this
,
this
.
_disposables
);
this
.
_defaultPreferencesRenderer
.
onClearFocusPreference
(
preference
=>
this
.
_clearFocus
(
preference
,
this
.
_editablePreferencesRenderer
),
this
,
this
.
_disposables
);
}
}
}
...
...
@@ -801,6 +804,7 @@ abstract class AbstractSettingsEditorContribution extends Disposable {
preferencesRenderer
.
dispose
();
}
});
this
.
preferencesRendererCreationPromise
=
TPromise
.
as
(
null
);
}
}
...
...
@@ -823,7 +827,7 @@ class DefaultSettingsEditorContribution extends AbstractSettingsEditorContributi
protected
_createPreferencesRenderer
():
TPromise
<
IPreferencesRenderer
<
ISetting
>>
{
return
this
.
preferencesService
.
createPreferencesEditorModel
(
this
.
editor
.
getModel
().
uri
)
.
then
(
editorModel
=>
{
if
(
editorModel
instanceof
DefaultSettingsEditorModel
)
{
if
(
editorModel
instanceof
DefaultSettingsEditorModel
&&
this
.
editor
.
getModel
()
)
{
const
preferencesRenderer
=
this
.
instantiationService
.
createInstance
(
DefaultSettingsRenderer
,
this
.
editor
,
editorModel
);
preferencesRenderer
.
render
();
return
preferencesRenderer
;
...
...
@@ -846,7 +850,7 @@ class SettingsEditorContribution extends AbstractSettingsEditorContribution impl
if
(
this
.
isSettingsModel
())
{
return
TPromise
.
join
<
any
>
([
this
.
preferencesService
.
createPreferencesEditorModel
(
this
.
preferencesService
.
defaultSettingsResource
),
this
.
preferencesService
.
createPreferencesEditorModel
(
this
.
editor
.
getModel
().
uri
)])
.
then
(([
defaultSettingsModel
,
settingsModel
])
=>
{
if
(
settingsModel
instanceof
SettingsEditorModel
)
{
if
(
settingsModel
instanceof
SettingsEditorModel
&&
this
.
editor
.
getModel
()
)
{
switch
(
settingsModel
.
configurationTarget
)
{
case
ConfigurationTarget
.
USER
:
return
this
.
instantiationService
.
createInstance
(
UserSettingsRenderer
,
this
.
editor
,
settingsModel
,
defaultSettingsModel
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录