Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d7c48a2f
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,发现更多精彩内容 >>
提交
d7c48a2f
编写于
1月 19, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix default keybindings appearance
上级
672315c0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
15 deletion
+13
-15
src/vs/workbench/parts/preferences/browser/preferencesService.ts
...workbench/parts/preferences/browser/preferencesService.ts
+11
-13
src/vs/workbench/services/editor/browser/editorService.ts
src/vs/workbench/services/editor/browser/editorService.ts
+2
-2
未找到文件。
src/vs/workbench/parts/preferences/browser/preferencesService.ts
浏览文件 @
d7c48a2f
...
...
@@ -163,7 +163,17 @@ 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
.
defaultKeybindingsResource
,
URI
.
file
(
this
.
environmentService
.
appKeybindingsPath
),
emptyContents
).
then
(()
=>
null
);
const
editableKeybindings
=
URI
.
file
(
this
.
environmentService
.
appKeybindingsPath
);
// Create as needed and open in editor
return
this
.
createIfNotExists
(
editableKeybindings
,
emptyContents
).
then
(()
=>
{
return
this
.
editorService
.
openEditors
([
{
input
:
{
resource
:
this
.
defaultKeybindingsResource
,
options
:
{
pinned
:
true
},
label
:
nls
.
localize
(
'
defaultKeybindings
'
,
"
Default Keybindings
"
),
description
:
''
},
position
:
Position
.
ONE
},
{
input
:
{
resource
:
editableKeybindings
,
options
:
{
pinned
:
true
}
},
position
:
Position
.
TWO
},
]).
then
(()
=>
{
this
.
editorGroupService
.
focusGroup
(
Position
.
TWO
);
});
});
}
private
doOpenSettings
(
configurationTarget
:
ConfigurationTarget
,
checkToOpenDefaultSettings
:
boolean
=
true
):
TPromise
<
void
>
{
...
...
@@ -222,18 +232,6 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return
null
;
}
private
openTwoEditors
(
leftHandDefault
:
URI
,
editableResource
:
URI
,
defaultEditableContents
:
string
):
TPromise
<
void
>
{
// Create as needed and open in editor
return
this
.
createIfNotExists
(
editableResource
,
defaultEditableContents
).
then
(()
=>
{
return
this
.
editorService
.
openEditors
([
{
input
:
{
resource
:
leftHandDefault
,
options
:
{
pinned
:
true
}
},
position
:
Position
.
ONE
},
{
input
:
{
resource
:
editableResource
,
options
:
{
pinned
:
true
}
},
position
:
Position
.
TWO
},
]).
then
(()
=>
{
this
.
editorGroupService
.
focusGroup
(
Position
.
TWO
);
});
});
}
private
createIfNotExists
(
resource
:
URI
,
contents
:
string
):
TPromise
<
boolean
>
{
return
this
.
fileService
.
resolveContent
(
resource
,
{
acceptTextOnly
:
true
}).
then
(
null
,
error
=>
{
if
((
<
IFileOperationResult
>
error
).
fileOperationResult
===
FileOperationResult
.
FILE_NOT_FOUND
)
{
...
...
src/vs/workbench/services/editor/browser/editorService.ts
浏览文件 @
d7c48a2f
...
...
@@ -210,7 +210,7 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
if
(
resourceSideBySideInput
.
masterResource
&&
resourceSideBySideInput
.
detailResource
)
{
return
this
.
createInput
({
resource
:
resourceSideBySideInput
.
masterResource
}).
then
(
masterInput
=>
{
return
this
.
createInput
({
resource
:
resourceSideBySideInput
.
detailResource
}).
then
(
detailInput
=>
{
return
new
SideBySideEditorInput
(
resourceSideBySideInput
.
label
||
masterInput
.
getName
(),
resourceSideBySideInput
.
description
||
masterInput
.
getDescription
(),
detailInput
,
masterInput
);
return
new
SideBySideEditorInput
(
resourceSideBySideInput
.
label
||
masterInput
.
getName
(),
typeof
resourceSideBySideInput
.
description
===
'
string
'
?
resourceSideBySideInput
.
description
:
masterInput
.
getDescription
(),
detailInput
,
masterInput
);
});
});
}
...
...
@@ -245,7 +245,7 @@ export class WorkbenchEditorService implements IWorkbenchEditorService {
return
TPromise
.
as
(
this
.
instantiationService
.
createInstance
(
ResourceEditorInput
,
resourceInput
.
label
||
basename
(
resourceInput
.
resource
.
fsPath
),
resourceInput
.
description
||
dirname
(
resourceInput
.
resource
.
fsPath
),
typeof
resourceInput
.
description
===
'
string
'
?
resourceInput
.
description
:
dirname
(
resourceInput
.
resource
.
fsPath
),
resourceInput
.
resource
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录