Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
6cd184e2
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,发现更多精彩内容 >>
提交
6cd184e2
编写于
3月 03, 2020
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
no composite code editor knowledge in EditorService (but still in CodeEditorService)
上级
93ad98cf
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
2 addition
and
19 deletion
+2
-19
src/vs/workbench/services/editor/browser/editorService.ts
src/vs/workbench/services/editor/browser/editorService.ts
+2
-19
未找到文件。
src/vs/workbench/services/editor/browser/editorService.ts
浏览文件 @
6cd184e2
...
...
@@ -5,7 +5,7 @@
import
{
IInstantiationService
,
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IResourceEditorInput
,
ITextEditorOptions
,
IEditorOptions
,
EditorActivation
}
from
'
vs/platform/editor/common/editor
'
;
import
{
SideBySideEditor
,
IEditorInput
,
IEditorPane
,
GroupIdentifier
,
IFileEditorInput
,
IUntitledTextResourceEditorInput
,
IResourceDiffEditorInput
,
IEditorInputFactoryRegistry
,
Extensions
as
EditorExtensions
,
EditorInput
,
SideBySideEditorInput
,
IEditorInputWithOptions
,
isEditorInputWithOptions
,
EditorOptions
,
TextEditorOptions
,
IEditorIdentifier
,
IEditorCloseEvent
,
ITextEditorPane
,
ITextDiffEditorPane
,
IRevertOptions
,
SaveReason
,
EditorsOrder
,
isTextEditorPane
,
IWorkbenchEditorConfiguration
,
toResource
,
IVisibleEditorPane
,
ICompositeCodeEditor
}
from
'
vs/workbench/common/editor
'
;
import
{
SideBySideEditor
,
IEditorInput
,
IEditorPane
,
GroupIdentifier
,
IFileEditorInput
,
IUntitledTextResourceEditorInput
,
IResourceDiffEditorInput
,
IEditorInputFactoryRegistry
,
Extensions
as
EditorExtensions
,
EditorInput
,
SideBySideEditorInput
,
IEditorInputWithOptions
,
isEditorInputWithOptions
,
EditorOptions
,
TextEditorOptions
,
IEditorIdentifier
,
IEditorCloseEvent
,
ITextEditorPane
,
ITextDiffEditorPane
,
IRevertOptions
,
SaveReason
,
EditorsOrder
,
isTextEditorPane
,
IWorkbenchEditorConfiguration
,
toResource
,
IVisibleEditorPane
}
from
'
vs/workbench/common/editor
'
;
import
{
ResourceEditorInput
}
from
'
vs/workbench/common/editor/resourceEditorInput
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
ResourceMap
}
from
'
vs/base/common/map
'
;
...
...
@@ -19,7 +19,7 @@ import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
import
{
IEditorGroupsService
,
IEditorGroup
,
GroupsOrder
,
IEditorReplacement
,
GroupChangeKind
,
preferredSideBySideGroupDirection
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
import
{
IResourceEditor
,
SIDE_GROUP
,
IResourceEditorReplacement
,
IOpenEditorOverrideHandler
,
IEditorService
,
SIDE_GROUP_TYPE
,
ACTIVE_GROUP_TYPE
,
ISaveEditorsOptions
,
ISaveAllEditorsOptions
,
IRevertAllEditorsOptions
,
IBaseSaveRevertAllEditorOptions
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
Disposable
,
IDisposable
,
dispose
,
toDisposable
,
DisposableStore
,
MutableDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
Disposable
,
IDisposable
,
dispose
,
toDisposable
,
DisposableStore
}
from
'
vs/base/common/lifecycle
'
;
import
{
coalesce
,
distinct
}
from
'
vs/base/common/arrays
'
;
import
{
isCodeEditor
,
isDiffEditor
,
ICodeEditor
,
IDiffEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
IEditorGroupView
,
IEditorOpeningEvent
,
EditorServiceImpl
}
from
'
vs/workbench/browser/parts/editor/editor
'
;
...
...
@@ -61,8 +61,6 @@ export class EditorService extends Disposable implements EditorServiceImpl {
//#endregion
private
readonly
activeEditorListener
=
this
.
_register
(
new
MutableDisposable
());
constructor
(
@
IEditorGroupsService
private
readonly
editorGroupService
:
IEditorGroupsService
,
@
IUntitledTextEditorService
private
readonly
untitledTextEditorService
:
IUntitledTextEditorService
,
...
...
@@ -133,13 +131,6 @@ export class EditorService extends Disposable implements EditorServiceImpl {
private
doHandleActiveEditorChangeEvent
():
void
{
// check for CompositeCodeEditor and forward its events
this
.
activeEditorListener
.
clear
();
const
control
=
this
.
activeEditorPane
?.
getControl
();
if
(
ICompositeCodeEditor
.
is
(
control
))
{
this
.
activeEditorListener
.
value
=
control
.
onDidChangeActiveEditor
(()
=>
this
.
_onDidActiveEditorChange
.
fire
());
}
// Remember as last active
const
activeGroup
=
this
.
editorGroupService
.
activeGroup
;
this
.
lastActiveEditor
=
withNullAsUndefined
(
activeGroup
.
activeEditor
);
...
...
@@ -409,9 +400,6 @@ export class EditorService extends Disposable implements EditorServiceImpl {
if
(
isCodeEditor
(
activeControl
)
||
isDiffEditor
(
activeControl
))
{
return
activeControl
;
}
if
(
ICompositeCodeEditor
.
is
(
activeControl
)
&&
isCodeEditor
(
activeControl
.
activeCodeEditor
))
{
return
activeControl
.
activeCodeEditor
;
}
}
return
undefined
;
...
...
@@ -777,11 +765,6 @@ export class EditorService extends Disposable implements EditorServiceImpl {
return
activeTextEditorControl
.
invokeWithinContext
(
fn
);
}
const
control
=
this
.
activeEditorPane
?.
getControl
();
if
(
ICompositeCodeEditor
.
is
(
control
)
&&
isCodeEditor
(
control
.
activeCodeEditor
))
{
return
control
.
activeCodeEditor
.
invokeWithinContext
(
fn
);
}
const
activeGroup
=
this
.
editorGroupService
.
activeGroup
;
if
(
activeGroup
)
{
return
activeGroup
.
invokeWithinContext
(
fn
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录