Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2e77e6c9
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,发现更多精彩内容 >>
提交
2e77e6c9
编写于
12月 02, 2016
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not use new preferences editor for default keybindings
上级
60fc1aa4
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
6 deletion
+10
-6
src/vs/workbench/parts/preferences/browser/preferencesService.ts
...workbench/parts/preferences/browser/preferencesService.ts
+10
-6
未找到文件。
src/vs/workbench/parts/preferences/browser/preferencesService.ts
浏览文件 @
2e77e6c9
...
...
@@ -11,7 +11,8 @@ import { LinkedMap as Map } from 'vs/base/common/map';
import
*
as
labels
from
'
vs/base/common/labels
'
;
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
parseTree
,
findNodeAtLocation
}
from
'
vs/base/common/json
'
;
import
{
asFileEditorInput
}
from
'
vs/workbench/common/editor
'
;
import
{
asFileEditorInput
,
EditorInput
}
from
'
vs/workbench/common/editor
'
;
import
{
StringEditorInput
}
from
'
vs/workbench/common/editor/stringEditorInput
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IWorkspaceConfigurationService
,
WORKSPACE_CONFIG_DEFAULT_PATH
}
from
'
vs/workbench/services/configuration/common/configuration
'
;
...
...
@@ -28,10 +29,9 @@ import { IConfigurationEditingService, ConfigurationTarget, IConfigurationValue
import
{
IPreferencesService
,
IPreferencesEditorModel
}
from
'
vs/workbench/parts/preferences/common/preferences
'
;
import
{
SettingsEditorModel
,
DefaultSettingsEditorModel
,
DefaultKeybindingsEditorModel
}
from
'
vs/workbench/parts/preferences/common/preferencesModels
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
PreferencesEditorInput
}
from
'
vs/workbench/parts/preferences/browser/preferencesEditor
'
;
import
{
Default
PreferencesEditorInput
}
from
'
vs/workbench/parts/preferences/browser/preferencesEditor
'
;
import
{
ITextModelResolverService
}
from
'
vs/editor/common/services/resolverService
'
;
const
SETTINGS_INFO_IGNORE_KEY
=
'
settings.workspace.info.ignore
'
;
interface
IWorkbenchSettingsConfiguration
{
...
...
@@ -136,7 +136,11 @@ export class PreferencesService extends Disposable implements IPreferencesServic
openGlobalKeybindingSettings
():
TPromise
<
void
>
{
const
emptyContents
=
'
//
'
+
nls
.
localize
(
'
emptyKeybindingsHeader
'
,
"
Place your key bindings in this file to overwrite the defaults
"
)
+
'
\n
[
\n
]
'
;
return
this
.
openTwoEditors
(
this
.
instantiationService
.
createInstance
(
PreferencesEditorInput
,
PreferencesService
.
DEFAULT_KEY_BINDINGS_URI
,
false
),
URI
.
file
(
this
.
environmentService
.
appKeybindingsPath
),
emptyContents
).
then
(()
=>
null
);
return
this
.
createDefaultPreferencesEditorModel
(
PreferencesService
.
DEFAULT_KEY_BINDINGS_URI
)
.
then
(
editorModel
=>
{
const
defaultKeybindingsInput
=
this
.
instantiationService
.
createInstance
(
StringEditorInput
,
nls
.
localize
(
'
keybindingsEditorName
'
,
"
Default Keyboard Shortcuts
"
),
''
,
editorModel
.
content
,
'
json
'
,
true
);
this
.
openTwoEditors
(
defaultKeybindingsInput
,
URI
.
file
(
this
.
environmentService
.
appKeybindingsPath
),
emptyContents
);
});
}
private
openEditableSettings
(
configurationTarget
:
ConfigurationTarget
,
showVisibleEditor
:
boolean
=
false
):
TPromise
<
IEditor
>
{
...
...
@@ -237,12 +241,12 @@ export class PreferencesService extends Disposable implements IPreferencesServic
if
(
openDefaultSettings
)
{
const
emptySettingsContents
=
this
.
getEmptyEditableSettingsContent
(
configurationTarget
);
const
settingsResource
=
this
.
getEditableSettingsURI
(
configurationTarget
);
return
this
.
openTwoEditors
(
this
.
instantiationService
.
createInstance
(
PreferencesEditorInput
,
PreferencesService
.
DEFAULT_SETTINGS_URI
,
true
),
settingsResource
,
emptySettingsContents
).
then
(()
=>
null
);
return
this
.
openTwoEditors
(
this
.
instantiationService
.
createInstance
(
Default
PreferencesEditorInput
,
PreferencesService
.
DEFAULT_SETTINGS_URI
,
true
),
settingsResource
,
emptySettingsContents
).
then
(()
=>
null
);
}
return
this
.
openEditableSettings
(
configurationTarget
).
then
(()
=>
null
);
}
private
openTwoEditors
(
leftHandDefaultInput
:
Preferences
EditorInput
,
editableResource
:
URI
,
defaultEditableContents
:
string
):
TPromise
<
IEditor
[]
>
{
private
openTwoEditors
(
leftHandDefaultInput
:
EditorInput
,
editableResource
:
URI
,
defaultEditableContents
:
string
):
TPromise
<
IEditor
[]
>
{
// Create as needed and open in editor
return
this
.
createIfNotExists
(
editableResource
,
defaultEditableContents
).
then
(()
=>
{
return
this
.
editorService
.
createInput
({
resource
:
editableResource
}).
then
(
typedRightHandEditableInput
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录