Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d51a2466
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,发现更多精彩内容 >>
提交
d51a2466
编写于
4月 05, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#31039 Reuse the settings editor in the active group
上级
4e2035d4
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
38 addition
and
17 deletion
+38
-17
src/vs/workbench/services/preferences/browser/preferencesService.ts
...kbench/services/preferences/browser/preferencesService.ts
+38
-17
未找到文件。
src/vs/workbench/services/preferences/browser/preferencesService.ts
浏览文件 @
d51a2466
...
...
@@ -172,13 +172,14 @@ export class PreferencesService extends Disposable implements IPreferencesServic
}
openSettings
():
TPromise
<
IEditor
>
{
const
resource
=
this
.
lastOpenedSettingsInput
?
this
.
lastOpenedSettingsInput
.
master
.
getResource
()
:
this
.
userSettingsResource
;
const
editorInput
=
this
.
getActiveSettingsEditorInput
()
||
this
.
lastOpenedSettingsInput
;
const
resource
=
editorInput
?
editorInput
.
master
.
getResource
()
:
this
.
userSettingsResource
;
const
target
=
this
.
getConfigurationTargetFromSettingsResource
(
resource
);
return
this
.
doOpen
Settings
(
target
,
resource
);
return
this
.
openOrSwitch
Settings
(
target
,
resource
);
}
openGlobalSettings
(
options
?:
IEditorOptions
,
position
?:
EditorPosition
):
TPromise
<
IEditor
>
{
return
this
.
doOpen
Settings
(
ConfigurationTarget
.
USER
,
this
.
userSettingsResource
,
options
,
position
);
return
this
.
openOrSwitch
Settings
(
ConfigurationTarget
.
USER
,
this
.
userSettingsResource
,
options
,
position
);
}
openWorkspaceSettings
(
options
?:
IEditorOptions
,
position
?:
EditorPosition
):
TPromise
<
IEditor
>
{
...
...
@@ -186,29 +187,19 @@ export class PreferencesService extends Disposable implements IPreferencesServic
this
.
notificationService
.
info
(
nls
.
localize
(
'
openFolderFirst
'
,
"
Open a folder first to create workspace settings
"
));
return
TPromise
.
as
(
null
);
}
return
this
.
doOpen
Settings
(
ConfigurationTarget
.
WORKSPACE
,
this
.
workspaceSettingsResource
,
options
,
position
);
return
this
.
openOrSwitch
Settings
(
ConfigurationTarget
.
WORKSPACE
,
this
.
workspaceSettingsResource
,
options
,
position
);
}
openFolderSettings
(
folder
:
URI
,
options
?:
IEditorOptions
,
position
?:
EditorPosition
):
TPromise
<
IEditor
>
{
return
this
.
doOpen
Settings
(
ConfigurationTarget
.
WORKSPACE_FOLDER
,
this
.
getEditableSettingsURI
(
ConfigurationTarget
.
WORKSPACE_FOLDER
,
folder
),
options
,
position
);
return
this
.
openOrSwitch
Settings
(
ConfigurationTarget
.
WORKSPACE_FOLDER
,
this
.
getEditableSettingsURI
(
ConfigurationTarget
.
WORKSPACE_FOLDER
,
folder
),
options
,
position
);
}
switchSettings
(
target
:
ConfigurationTarget
,
resource
:
URI
):
TPromise
<
void
>
{
const
activeEditor
=
this
.
editorService
.
getActiveEditor
();
if
(
activeEditor
&&
activeEditor
.
input
instanceof
PreferencesEditorInput
)
{
return
this
.
getOrCreateEditableSettingsEditorInput
(
target
,
this
.
getEditableSettingsURI
(
target
,
resource
))
.
then
(
toInput
=>
{
const
replaceWith
=
new
PreferencesEditorInput
(
this
.
getPreferencesEditorInputName
(
target
,
resource
),
toInput
.
getDescription
(),
this
.
instantiationService
.
createInstance
(
DefaultPreferencesEditorInput
,
this
.
getDefaultSettingsResource
(
target
)),
toInput
);
return
this
.
editorService
.
replaceEditors
([{
toReplace
:
activeEditor
.
input
,
replaceWith
}],
activeEditor
.
position
).
then
(()
=>
{
this
.
lastOpenedSettingsInput
=
replaceWith
;
});
});
return
this
.
doSwitchSettings
(
target
,
resource
,
activeEditor
.
input
,
activeEditor
.
position
).
then
(()
=>
null
);
}
else
{
this
.
doOpenSettings
(
target
,
resource
);
return
undefined
;
return
this
.
doOpenSettings
(
target
,
resource
).
then
(()
=>
null
);
}
}
...
...
@@ -249,6 +240,16 @@ export class PreferencesService extends Disposable implements IPreferencesServic
});
}
private
openOrSwitchSettings
(
configurationTarget
:
ConfigurationTarget
,
resource
:
URI
,
options
?:
IEditorOptions
,
position
?:
EditorPosition
):
TPromise
<
IEditor
>
{
const
activeGroup
=
this
.
editorGroupService
.
getStacksModel
().
activeGroup
;
const
positionToReplace
=
position
!==
void
0
?
position
:
activeGroup
?
this
.
editorGroupService
.
getStacksModel
().
positionOfGroup
(
activeGroup
)
:
EditorPosition
.
ONE
;
const
editorInput
=
this
.
getActiveSettingsEditorInput
(
positionToReplace
);
if
(
editorInput
&&
editorInput
.
master
.
getResource
().
fsPath
!==
resource
.
fsPath
)
{
return
this
.
doSwitchSettings
(
configurationTarget
,
resource
,
editorInput
,
positionToReplace
);
}
return
this
.
doOpenSettings
(
configurationTarget
,
resource
,
options
,
position
);
}
private
doOpenSettings
(
configurationTarget
:
ConfigurationTarget
,
resource
:
URI
,
options
?:
IEditorOptions
,
position
?:
EditorPosition
):
TPromise
<
IEditor
>
{
const
openDefaultSettings
=
!!
this
.
configurationService
.
getValue
(
DEFAULT_SETTINGS_EDITOR_SETTING
);
return
this
.
getOrCreateEditableSettingsEditorInput
(
configurationTarget
,
resource
)
...
...
@@ -269,6 +270,26 @@ export class PreferencesService extends Disposable implements IPreferencesServic
});
}
private
doSwitchSettings
(
target
:
ConfigurationTarget
,
resource
:
URI
,
input
:
PreferencesEditorInput
,
position
?:
EditorPosition
):
TPromise
<
IEditor
>
{
return
this
.
getOrCreateEditableSettingsEditorInput
(
target
,
this
.
getEditableSettingsURI
(
target
,
resource
))
.
then
(
toInput
=>
{
const
replaceWith
=
new
PreferencesEditorInput
(
this
.
getPreferencesEditorInputName
(
target
,
resource
),
toInput
.
getDescription
(),
this
.
instantiationService
.
createInstance
(
DefaultPreferencesEditorInput
,
this
.
getDefaultSettingsResource
(
target
)),
toInput
);
return
this
.
editorService
.
replaceEditors
([{
toReplace
:
input
,
replaceWith
}],
position
).
then
(
editors
=>
{
this
.
lastOpenedSettingsInput
=
replaceWith
;
return
editors
[
0
];
});
});
}
private
getActiveSettingsEditorInput
(
position
?:
EditorPosition
):
PreferencesEditorInput
{
const
stacksModel
=
this
.
editorGroupService
.
getStacksModel
();
const
group
=
position
!==
void
0
?
stacksModel
.
groupAt
(
position
)
:
stacksModel
.
activeGroup
;
return
group
&&
<
PreferencesEditorInput
>
group
.
getEditors
().
filter
(
e
=>
e
instanceof
PreferencesEditorInput
)[
0
];
}
private
getConfigurationTargetFromSettingsResource
(
resource
:
URI
):
ConfigurationTarget
{
if
(
this
.
userSettingsResource
.
toString
()
===
resource
.
toString
())
{
return
ConfigurationTarget
.
USER
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录