Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
bb84ee81
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,发现更多精彩内容 >>
提交
bb84ee81
编写于
7月 14, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Revert "code editor creators should create scoped keybinding services or not""
This reverts commit
eae1a2f1
.
上级
89cce3d7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
5 deletion
+11
-5
src/vs/editor/browser/standalone/standaloneCodeEditor.ts
src/vs/editor/browser/standalone/standaloneCodeEditor.ts
+2
-2
src/vs/editor/browser/widget/diffEditorWidget.ts
src/vs/editor/browser/widget/diffEditorWidget.ts
+7
-1
src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
+1
-1
src/vs/editor/common/commonCodeEditor.ts
src/vs/editor/common/commonCodeEditor.ts
+1
-1
未找到文件。
src/vs/editor/browser/standalone/standaloneCodeEditor.ts
浏览文件 @
bb84ee81
...
...
@@ -79,7 +79,7 @@ export class StandaloneEditor extends CodeEditorWidget implements IStandaloneCod
}
options
=
options
||
{};
super
(
domElement
,
options
,
instantiationService
,
codeEditorService
,
commandService
,
keybindingService
,
telemetryService
);
super
(
domElement
,
options
,
instantiationService
,
codeEditorService
,
commandService
,
keybindingService
.
createScoped
(
domElement
)
,
telemetryService
);
if
(
keybindingService
instanceof
StandaloneKeybindingService
)
{
this
.
_standaloneKeybindingService
=
<
StandaloneKeybindingService
>
keybindingService
;
...
...
@@ -184,7 +184,7 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
(
<
AbstractKeybindingService
><
any
>
keybindingService
).
setInstantiationService
(
instantiationService
);
}
super
(
domElement
,
options
,
editorWorkerService
,
instantiationService
);
super
(
domElement
,
options
,
editorWorkerService
,
keybindingService
,
instantiationService
);
if
(
keybindingService
instanceof
StandaloneKeybindingService
)
{
this
.
_standaloneKeybindingService
=
<
StandaloneKeybindingService
>
keybindingService
;
...
...
src/vs/editor/browser/widget/diffEditorWidget.ts
浏览文件 @
bb84ee81
...
...
@@ -15,6 +15,8 @@ import * as dom from 'vs/base/browser/dom';
import
{
StyleMutator
}
from
'
vs/base/browser/styleMutator
'
;
import
{
ISashEvent
,
IVerticalSashLayoutProvider
,
Sash
}
from
'
vs/base/browser/ui/sash/sash
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
ServiceCollection
}
from
'
vs/platform/instantiation/common/serviceCollection
'
;
import
{
DefaultConfig
}
from
'
vs/editor/common/config/defaultConfig
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
...
...
@@ -201,15 +203,18 @@ export class DiffEditorWidget extends EventEmitter implements editorBrowser.IDif
private
_updateDecorationsRunner
:
RunOnceScheduler
;
private
_editorWorkerService
:
IEditorWorkerService
;
private
_keybindingService
:
IKeybindingService
;
constructor
(
domElement
:
HTMLElement
,
options
:
editorCommon
.
IDiffEditorOptions
,
@
IEditorWorkerService
editorWorkerService
:
IEditorWorkerService
,
@
IKeybindingService
keybindingService
:
IKeybindingService
,
@
IInstantiationService
instantiationService
:
IInstantiationService
)
{
super
();
this
.
_editorWorkerService
=
editorWorkerService
;
this
.
_keybindingService
=
keybindingService
;
this
.
id
=
(
++
DIFF_EDITOR_ID
);
...
...
@@ -350,7 +355,8 @@ export class DiffEditorWidget extends EventEmitter implements editorBrowser.IDif
this
.
_containerDomElement
.
appendChild
(
this
.
_modifiedDomNode
);
}
private
_createLeftHandSideEditor
(
options
:
editorCommon
.
IDiffEditorOptions
,
instantiationService
:
IInstantiationService
):
void
{
private
_createLeftHandSideEditor
(
options
:
editorCommon
.
IDiffEditorOptions
,
instantiationService
:
IInstantiationService
):
void
{
instantiationService
=
instantiationService
.
createChild
(
new
ServiceCollection
([
IKeybindingService
,
this
.
_keybindingService
.
createScoped
(
this
.
_originalDomNode
)]));
this
.
originalEditor
=
instantiationService
.
createInstance
(
CodeEditorWidget
,
this
.
_originalDomNode
,
this
.
_adjustOptionsForLeftHandSide
(
options
,
this
.
_originalIsEditable
));
this
.
_toDispose
.
push
(
this
.
originalEditor
.
addBulkListener2
((
events
)
=>
this
.
_onOriginalEditorEvents
(
events
)));
this
.
_toDispose
.
push
(
this
.
addEmitter2
(
this
.
originalEditor
));
...
...
src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
浏览文件 @
bb84ee81
...
...
@@ -29,7 +29,7 @@ export class EmbeddedCodeEditorWidget extends CodeEditorWidget {
@
IKeybindingService
keybindingService
:
IKeybindingService
,
@
ITelemetryService
telemetryService
:
ITelemetryService
)
{
super
(
domElement
,
parentEditor
.
getRawConfiguration
(),
instantiationService
,
codeEditorService
,
commandService
,
keybindingService
,
telemetryService
);
super
(
domElement
,
parentEditor
.
getRawConfiguration
(),
instantiationService
,
codeEditorService
,
commandService
,
keybindingService
.
createScoped
(
domElement
)
,
telemetryService
);
this
.
_parentEditor
=
parentEditor
;
this
.
_overwriteOptions
=
options
;
...
...
src/vs/editor/common/commonCodeEditor.ts
浏览文件 @
bb84ee81
...
...
@@ -143,7 +143,7 @@ export abstract class CommonCodeEditor extends EventEmitter implements editorCom
this
.
_lifetimeDispose
=
[];
this
.
_commandService
=
commandService
;
this
.
_keybindingService
=
keybindingService
.
createScoped
(
domElement
)
;
this
.
_keybindingService
=
keybindingService
;
this
.
_editorIdContextKey
=
this
.
_keybindingService
.
createKey
(
'
editorId
'
,
this
.
getId
());
this
.
_editorFocusContextKey
=
this
.
_keybindingService
.
createKey
(
editorCommon
.
KEYBINDING_CONTEXT_EDITOR_FOCUS
,
undefined
);
this
.
_editorTabMovesFocusKey
=
this
.
_keybindingService
.
createKey
(
editorCommon
.
KEYBINDING_CONTEXT_EDITOR_TAB_MOVES_FOCUS
,
false
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录