Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
89fbf8c8
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,发现更多精彩内容 >>
提交
89fbf8c8
编写于
7月 28, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "hidden editor shouldn't listen to events, #9705"
first step in fixing #9892 This reverts commit
3f446e49
.
上级
09a148d5
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
5 addition
and
20 deletion
+5
-20
src/vs/workbench/browser/parts/editor/textEditor.ts
src/vs/workbench/browser/parts/editor/textEditor.ts
+5
-20
未找到文件。
src/vs/workbench/browser/parts/editor/textEditor.ts
浏览文件 @
89fbf8c8
...
@@ -8,7 +8,6 @@
...
@@ -8,7 +8,6 @@
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
Dimension
,
Builder
}
from
'
vs/base/browser/builder
'
;
import
{
Dimension
,
Builder
}
from
'
vs/base/browser/builder
'
;
import
objects
=
require
(
'
vs/base/common/objects
'
);
import
objects
=
require
(
'
vs/base/common/objects
'
);
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
CodeEditorWidget
}
from
'
vs/editor/browser/widget/codeEditorWidget
'
;
import
{
CodeEditorWidget
}
from
'
vs/editor/browser/widget/codeEditorWidget
'
;
import
{
OptionsChangeEvent
,
EventType
as
WorkbenchEventType
}
from
'
vs/workbench/common/events
'
;
import
{
OptionsChangeEvent
,
EventType
as
WorkbenchEventType
}
from
'
vs/workbench/common/events
'
;
import
{
EditorInput
,
EditorOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
EditorInput
,
EditorOptions
}
from
'
vs/workbench/common/editor
'
;
...
@@ -36,7 +35,6 @@ import {Selection} from 'vs/editor/common/core/selection';
...
@@ -36,7 +35,6 @@ import {Selection} from 'vs/editor/common/core/selection';
export
abstract
class
BaseTextEditor
extends
BaseEditor
{
export
abstract
class
BaseTextEditor
extends
BaseEditor
{
private
editorControl
:
IEditor
;
private
editorControl
:
IEditor
;
private
_editorContainer
:
Builder
;
private
_editorContainer
:
Builder
;
private
_disposeOnInputChange
:
IDisposable
[]
=
[];
constructor
(
constructor
(
id
:
string
,
id
:
string
,
...
@@ -52,6 +50,11 @@ export abstract class BaseTextEditor extends BaseEditor {
...
@@ -52,6 +50,11 @@ export abstract class BaseTextEditor extends BaseEditor {
@
IThemeService
private
_themeService
:
IThemeService
@
IThemeService
private
_themeService
:
IThemeService
)
{
)
{
super
(
id
,
telemetryService
);
super
(
id
,
telemetryService
);
this
.
toUnbind
.
push
(
this
.
_eventService
.
addListener2
(
WorkbenchEventType
.
WORKBENCH_OPTIONS_CHANGED
,
(
e
)
=>
this
.
onOptionsChanged
(
e
)));
this
.
toUnbind
.
push
(
this
.
configurationService
.
onDidUpdateConfiguration
(
e
=>
this
.
applyConfiguration
(
e
.
config
)));
this
.
toUnbind
.
push
(
_themeService
.
onDidThemeChange
(
_
=>
this
.
onThemeChanged
()));
}
}
public
get
instantiationService
():
IInstantiationService
{
public
get
instantiationService
():
IInstantiationService
{
...
@@ -70,14 +73,6 @@ export abstract class BaseTextEditor extends BaseEditor {
...
@@ -70,14 +73,6 @@ export abstract class BaseTextEditor extends BaseEditor {
return
this
.
_messageService
;
return
this
.
_messageService
;
}
}
private
hookConfigurationListeners
():
void
{
if
(
this
.
_disposeOnInputChange
.
length
===
0
)
{
this
.
_disposeOnInputChange
.
push
(
this
.
_eventService
.
addListener2
(
WorkbenchEventType
.
WORKBENCH_OPTIONS_CHANGED
,
(
e
)
=>
this
.
onOptionsChanged
(
e
)));
this
.
_disposeOnInputChange
.
push
(
this
.
configurationService
.
onDidUpdateConfiguration
(
e
=>
this
.
applyConfiguration
(
e
.
config
)));
this
.
_disposeOnInputChange
.
push
(
this
.
_themeService
.
onDidThemeChange
(
_
=>
this
.
onThemeChanged
()));
}
}
protected
applyConfiguration
(
configuration
:
IFilesConfiguration
):
void
{
protected
applyConfiguration
(
configuration
:
IFilesConfiguration
):
void
{
// Update Editor with configuration and editor settings
// Update Editor with configuration and editor settings
...
@@ -146,19 +141,11 @@ export abstract class BaseTextEditor extends BaseEditor {
...
@@ -146,19 +141,11 @@ export abstract class BaseTextEditor extends BaseEditor {
}
}
public
setInput
(
input
:
EditorInput
,
options
:
EditorOptions
):
TPromise
<
void
>
{
public
setInput
(
input
:
EditorInput
,
options
:
EditorOptions
):
TPromise
<
void
>
{
this
.
hookConfigurationListeners
();
return
super
.
setInput
(
input
,
options
).
then
(()
=>
{
return
super
.
setInput
(
input
,
options
).
then
(()
=>
{
this
.
editorControl
.
updateOptions
(
this
.
getCodeEditorOptions
());
// support input specific editor options
this
.
editorControl
.
updateOptions
(
this
.
getCodeEditorOptions
());
// support input specific editor options
});
});
}
}
public
clearInput
():
void
{
this
.
_disposeOnInputChange
=
dispose
(
this
.
_disposeOnInputChange
);
return
super
.
clearInput
();
}
public
setEditorVisible
(
visible
:
boolean
,
position
:
Position
=
null
):
void
{
public
setEditorVisible
(
visible
:
boolean
,
position
:
Position
=
null
):
void
{
// Pass on to Editor
// Pass on to Editor
...
@@ -191,8 +178,6 @@ export abstract class BaseTextEditor extends BaseEditor {
...
@@ -191,8 +178,6 @@ export abstract class BaseTextEditor extends BaseEditor {
public
dispose
():
void
{
public
dispose
():
void
{
dispose
(
this
.
_disposeOnInputChange
);
// Destroy Editor Control
// Destroy Editor Control
this
.
editorControl
.
destroy
();
this
.
editorControl
.
destroy
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录