Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
28cf60f2
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,发现更多精彩内容 >>
提交
28cf60f2
编写于
10月 26, 2016
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
output: first create the scoped instantation service and only then construct the editor using it
fixes #13463 fixes #12263
上级
10730bf0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
4 deletion
+14
-4
src/vs/workbench/browser/parts/editor/textEditor.ts
src/vs/workbench/browser/parts/editor/textEditor.ts
+2
-1
src/vs/workbench/parts/output/browser/outputPanel.ts
src/vs/workbench/parts/output/browser/outputPanel.ts
+12
-3
未找到文件。
src/vs/workbench/browser/parts/editor/textEditor.ts
浏览文件 @
28cf60f2
...
...
@@ -139,7 +139,8 @@ export abstract class BaseTextEditor extends BaseEditor {
* provide their own editor control that should be used (e.g. a DiffEditor).
*/
public
createEditorControl
(
parent
:
Builder
):
IEditor
{
return
this
.
_instantiationService
.
createInstance
(
CodeEditor
,
parent
.
getHTMLElement
(),
this
.
getCodeEditorOptions
());
// Use a getter for the instantiation service since some subclasses might use scoped instantiation services
return
this
.
instantiationService
.
createInstance
(
CodeEditor
,
parent
.
getHTMLElement
(),
this
.
getCodeEditorOptions
());
}
public
setInput
(
input
:
EditorInput
,
options
:
EditorOptions
):
TPromise
<
void
>
{
...
...
src/vs/workbench/parts/output/browser/outputPanel.ts
浏览文件 @
28cf60f2
...
...
@@ -16,6 +16,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import
{
IEventService
}
from
'
vs/platform/event/common/event
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IMessageService
}
from
'
vs/platform/message/common/message
'
;
import
{
ServiceCollection
}
from
'
vs/platform/instantiation/common/serviceCollection
'
;
import
{
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
EditorInput
,
EditorOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
StringEditor
}
from
'
vs/workbench/browser/parts/editor/stringEditor
'
;
...
...
@@ -31,6 +32,7 @@ export class OutputPanel extends StringEditor {
private
toDispose
:
lifecycle
.
IDisposable
[];
private
actions
:
IAction
[];
private
scopedInstantiationService
:
IInstantiationService
;
constructor
(
@
ITelemetryService
telemetryService
:
ITelemetryService
,
...
...
@@ -48,6 +50,7 @@ export class OutputPanel extends StringEditor {
)
{
super
(
telemetryService
,
instantiationService
,
contextService
,
storageService
,
messageService
,
configurationService
,
eventService
,
editorService
,
themeService
,
untitledEditorService
);
this
.
scopedInstantiationService
=
instantiationService
;
this
.
toDispose
=
[];
}
...
...
@@ -100,14 +103,20 @@ export class OutputPanel extends StringEditor {
}
public
createEditor
(
parent
:
Builder
):
void
{
super
.
createEditor
(
parent
);
const
scopedContextKeyService
=
this
.
contextKeyService
.
createScoped
(
this
.
getContainer
()
.
getHTMLElement
());
// First create the scoped instantation service and only then construct the editor using the scoped service
const
scopedContextKeyService
=
this
.
contextKeyService
.
createScoped
(
parent
.
getHTMLElement
());
this
.
toDispose
.
push
(
scopedContextKeyService
);
CONTEXT_IN_OUTPUT
.
bindTo
(
scopedContextKeyService
).
set
(
true
);
this
.
scopedInstantiationService
=
this
.
instantiationService
.
createChild
(
new
ServiceCollection
([
IContextKeyService
,
scopedContextKeyService
]));
super
.
createEditor
(
parent
);
CONTEXT_IN_OUTPUT
.
bindTo
(
scopedContextKeyService
).
set
(
true
);
this
.
setInput
(
OutputEditorInput
.
getInstance
(
this
.
instantiationService
,
this
.
outputService
.
getActiveChannel
()),
null
);
}
public
get
instantiationService
():
IInstantiationService
{
return
this
.
scopedInstantiationService
;
}
public
dispose
():
void
{
this
.
toDispose
=
lifecycle
.
dispose
(
this
.
toDispose
);
super
.
dispose
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录