Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
83f82258
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,发现更多精彩内容 >>
提交
83f82258
编写于
10月 24, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #36830
上级
e00bcc14
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
17 deletion
+5
-17
src/vs/workbench/parts/preferences/browser/preferencesService.ts
...workbench/parts/preferences/browser/preferencesService.ts
+4
-7
src/vs/workbench/parts/preferences/common/preferencesModels.ts
...s/workbench/parts/preferences/common/preferencesModels.ts
+1
-10
未找到文件。
src/vs/workbench/parts/preferences/browser/preferencesService.ts
浏览文件 @
83f82258
...
...
@@ -123,8 +123,10 @@ export class PreferencesService extends Disposable implements IPreferencesServic
}
if
(
this
.
defaultKeybindingsResource
.
toString
()
===
uri
.
toString
())
{
return
this
.
extensionService
.
onReady
()
.
then
(()
=>
this
.
instantiationService
.
createInstance
(
DefaultKeybindingsEditorModel
,
uri
).
model
);
const
defaultKeybindingsEditorModel
=
this
.
instantiationService
.
createInstance
(
DefaultKeybindingsEditorModel
,
uri
);
const
mode
=
this
.
modeService
.
getOrCreateMode
(
'
json
'
);
const
model
=
this
.
_register
(
this
.
modelService
.
createModel
(
defaultKeybindingsEditorModel
.
content
,
mode
,
uri
));
return
TPromise
.
as
(
model
);
}
return
TPromise
.
as
(
null
);
...
...
@@ -135,11 +137,6 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return
this
.
createDefaultSettingsEditorModel
(
uri
);
}
if
(
this
.
defaultKeybindingsResource
.
toString
()
===
uri
.
toString
())
{
const
model
=
this
.
instantiationService
.
createInstance
(
DefaultKeybindingsEditorModel
,
uri
);
return
TPromise
.
wrap
(
model
);
}
if
(
this
.
workspaceConfigSettingsResource
.
toString
()
===
uri
.
toString
())
{
return
this
.
createEditableSettingsEditorModel
(
ConfigurationTarget
.
WORKSPACE
,
uri
);
}
...
...
src/vs/workbench/parts/preferences/common/preferencesModels.ts
浏览文件 @
83f82258
...
...
@@ -23,8 +23,6 @@ import { TPromise } from 'vs/base/common/winjs.base';
import
{
Queue
}
from
'
vs/base/common/async
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
ConfigurationTarget
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
IModeService
}
from
'
vs/editor/common/services/modeService
'
;
export
abstract
class
AbstractSettingsModel
extends
EditorModel
{
...
...
@@ -897,16 +895,9 @@ export function defaultKeybindingsContents(keybindingService: IKeybindingService
export
class
DefaultKeybindingsEditorModel
implements
IKeybindingsEditorModel
<
any
>
{
private
_content
:
string
;
private
_model
:
IModel
;
constructor
(
private
_uri
:
URI
,
@
IKeybindingService
private
keybindingService
:
IKeybindingService
,
@
IModeService
private
modeService
:
IModeService
,
@
IModelService
private
modelService
:
IModelService
)
{
}
public
get
model
():
IModel
{
return
this
.
_model
;
@
IKeybindingService
private
keybindingService
:
IKeybindingService
)
{
}
public
get
uri
():
URI
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录