Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8f1b989c
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,发现更多精彩内容 >>
提交
8f1b989c
编写于
10月 13, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move editor service into common
上级
90ca93fd
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
363 addition
and
377 deletion
+363
-377
src/vs/workbench/browser/parts/editor/editorPart.ts
src/vs/workbench/browser/parts/editor/editorPart.ts
+1
-1
src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+1
-2
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+1
-2
src/vs/workbench/electron-browser/workbench.ts
src/vs/workbench/electron-browser/workbench.ts
+1
-2
src/vs/workbench/parts/files/browser/explorerViewlet.ts
src/vs/workbench/parts/files/browser/explorerViewlet.ts
+1
-2
src/vs/workbench/services/editor/browser/editorService.ts
src/vs/workbench/services/editor/browser/editorService.ts
+0
-365
src/vs/workbench/services/editor/common/editorService.ts
src/vs/workbench/services/editor/common/editorService.ts
+357
-2
src/vs/workbench/services/editor/test/browser/editorService.test.ts
...kbench/services/editor/test/browser/editorService.test.ts
+1
-1
未找到文件。
src/vs/workbench/browser/parts/editor/editorPart.ts
浏览文件 @
8f1b989c
...
@@ -26,7 +26,7 @@ import { EditorGroupsControl, Rochade, IEditorGroupsControl, ProgressState } fro
...
@@ -26,7 +26,7 @@ import { EditorGroupsControl, Rochade, IEditorGroupsControl, ProgressState } fro
import
{
WorkbenchProgressService
}
from
'
vs/workbench/services/progress/browser/progressService
'
;
import
{
WorkbenchProgressService
}
from
'
vs/workbench/services/progress/browser/progressService
'
;
import
{
IEditorGroupService
,
GroupOrientation
,
GroupArrangement
,
IEditorTabOptions
,
IMoveOptions
}
from
'
vs/workbench/services/group/common/groupService
'
;
import
{
IEditorGroupService
,
GroupOrientation
,
GroupArrangement
,
IEditorTabOptions
,
IMoveOptions
}
from
'
vs/workbench/services/group/common/groupService
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IEditorPart
}
from
'
vs/workbench/services/editor/
browser
/editorService
'
;
import
{
IEditorPart
}
from
'
vs/workbench/services/editor/
common
/editorService
'
;
import
{
IPartService
}
from
'
vs/workbench/services/part/common/partService
'
;
import
{
IPartService
}
from
'
vs/workbench/services/part/common/partService
'
;
import
{
Position
,
POSITIONS
,
Direction
,
IEditor
}
from
'
vs/platform/editor/common/editor
'
;
import
{
Position
,
POSITIONS
,
Direction
,
IEditor
}
from
'
vs/platform/editor/common/editor
'
;
import
{
IStorageService
}
from
'
vs/platform/storage/common/storage
'
;
import
{
IStorageService
}
from
'
vs/platform/storage/common/storage
'
;
...
...
src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
浏览文件 @
8f1b989c
...
@@ -20,7 +20,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
...
@@ -20,7 +20,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import
{
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
ResourceLabel
}
from
'
vs/workbench/browser/labels
'
;
import
{
ResourceLabel
}
from
'
vs/workbench/browser/labels
'
;
import
{
ActionBar
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
ActionBar
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkbenchEditorService
,
DelegatingWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IContextMenuService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IContextMenuService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
import
{
IMessageService
}
from
'
vs/platform/message/common/message
'
;
import
{
IMessageService
}
from
'
vs/platform/message/common/message
'
;
...
@@ -37,7 +37,6 @@ import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElemen
...
@@ -37,7 +37,6 @@ import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElemen
import
{
ScrollbarVisibility
}
from
'
vs/base/common/scrollable
'
;
import
{
ScrollbarVisibility
}
from
'
vs/base/common/scrollable
'
;
import
{
extractResources
}
from
'
vs/base/browser/dnd
'
;
import
{
extractResources
}
from
'
vs/base/browser/dnd
'
;
import
{
getOrSet
}
from
'
vs/base/common/map
'
;
import
{
getOrSet
}
from
'
vs/base/common/map
'
;
import
{
DelegatingWorkbenchEditorService
}
from
'
vs/workbench/services/editor/browser/editorService
'
;
import
{
ServiceCollection
}
from
'
vs/platform/instantiation/common/serviceCollection
'
;
import
{
ServiceCollection
}
from
'
vs/platform/instantiation/common/serviceCollection
'
;
import
{
IThemeService
,
registerThemingParticipant
,
ITheme
,
ICssStyleCollector
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
IThemeService
,
registerThemingParticipant
,
ITheme
,
ICssStyleCollector
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
TAB_INACTIVE_BACKGROUND
,
TAB_ACTIVE_BACKGROUND
,
TAB_ACTIVE_FOREGROUND
,
TAB_INACTIVE_FOREGROUND
,
TAB_BORDER
,
EDITOR_DRAG_AND_DROP_BACKGROUND
,
TAB_UNFOCUSED_ACTIVE_FOREGROUND
,
TAB_UNFOCUSED_INACTIVE_FOREGROUND
,
TAB_UNFOCUSED_ACTIVE_BORDER
,
TAB_ACTIVE_BORDER
}
from
'
vs/workbench/common/theme
'
;
import
{
TAB_INACTIVE_BACKGROUND
,
TAB_ACTIVE_BACKGROUND
,
TAB_ACTIVE_FOREGROUND
,
TAB_INACTIVE_FOREGROUND
,
TAB_BORDER
,
EDITOR_DRAG_AND_DROP_BACKGROUND
,
TAB_UNFOCUSED_ACTIVE_FOREGROUND
,
TAB_UNFOCUSED_INACTIVE_FOREGROUND
,
TAB_UNFOCUSED_ACTIVE_BORDER
,
TAB_ACTIVE_BORDER
}
from
'
vs/workbench/common/theme
'
;
...
...
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
浏览文件 @
8f1b989c
...
@@ -22,14 +22,13 @@ import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
...
@@ -22,14 +22,13 @@ import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
import
{
DiffNavigator
}
from
'
vs/editor/browser/widget/diffNavigator
'
;
import
{
DiffNavigator
}
from
'
vs/editor/browser/widget/diffNavigator
'
;
import
{
DiffEditorWidget
}
from
'
vs/editor/browser/widget/diffEditorWidget
'
;
import
{
DiffEditorWidget
}
from
'
vs/editor/browser/widget/diffEditorWidget
'
;
import
{
TextDiffEditorModel
}
from
'
vs/workbench/common/editor/textDiffEditorModel
'
;
import
{
TextDiffEditorModel
}
from
'
vs/workbench/common/editor/textDiffEditorModel
'
;
import
{
DelegatingWorkbenchEditorService
}
from
'
vs/workbench/services/editor/browser/editorService
'
;
import
{
FileOperationError
,
FileOperationResult
}
from
'
vs/platform/files/common/files
'
;
import
{
FileOperationError
,
FileOperationResult
}
from
'
vs/platform/files/common/files
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
IStorageService
}
from
'
vs/platform/storage/common/storage
'
;
import
{
IStorageService
}
from
'
vs/platform/storage/common/storage
'
;
import
{
ITextResourceConfigurationService
}
from
'
vs/editor/common/services/resourceConfiguration
'
;
import
{
ITextResourceConfigurationService
}
from
'
vs/editor/common/services/resourceConfiguration
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ServiceCollection
}
from
'
vs/platform/instantiation/common/serviceCollection
'
;
import
{
ServiceCollection
}
from
'
vs/platform/instantiation/common/serviceCollection
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkbenchEditorService
,
DelegatingWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
import
{
IModeService
}
from
'
vs/editor/common/services/modeService
'
;
import
{
IModeService
}
from
'
vs/editor/common/services/modeService
'
;
...
...
src/vs/workbench/electron-browser/workbench.ts
浏览文件 @
8f1b989c
...
@@ -39,7 +39,6 @@ import { IActionBarRegistry, Extensions as ActionBarExtensions } from 'vs/workbe
...
@@ -39,7 +39,6 @@ import { IActionBarRegistry, Extensions as ActionBarExtensions } from 'vs/workbe
import
{
PanelRegistry
,
Extensions
as
PanelExtensions
}
from
'
vs/workbench/browser/panel
'
;
import
{
PanelRegistry
,
Extensions
as
PanelExtensions
}
from
'
vs/workbench/browser/panel
'
;
import
{
QuickOpenController
}
from
'
vs/workbench/browser/parts/quickopen/quickOpenController
'
;
import
{
QuickOpenController
}
from
'
vs/workbench/browser/parts/quickopen/quickOpenController
'
;
import
{
getServices
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
getServices
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
WorkbenchEditorService
}
from
'
vs/workbench/services/editor/browser/editorService
'
;
import
{
Position
,
Parts
,
IPartService
,
ILayoutOptions
}
from
'
vs/workbench/services/part/common/partService
'
;
import
{
Position
,
Parts
,
IPartService
,
ILayoutOptions
}
from
'
vs/workbench/services/part/common/partService
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
...
@@ -66,7 +65,7 @@ import { ConfigurationResolverService } from 'vs/workbench/services/configuratio
...
@@ -66,7 +65,7 @@ import { ConfigurationResolverService } from 'vs/workbench/services/configuratio
import
{
IPanelService
}
from
'
vs/workbench/services/panel/common/panelService
'
;
import
{
IPanelService
}
from
'
vs/workbench/services/panel/common/panelService
'
;
import
{
ITitleService
}
from
'
vs/workbench/services/title/common/titleService
'
;
import
{
ITitleService
}
from
'
vs/workbench/services/title/common/titleService
'
;
import
{
WorkbenchMessageService
}
from
'
vs/workbench/services/message/browser/messageService
'
;
import
{
WorkbenchMessageService
}
from
'
vs/workbench/services/message/browser/messageService
'
;
import
{
IWorkbenchEditorService
,
IResourceInputType
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkbenchEditorService
,
IResourceInputType
,
WorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IQuickOpenService
}
from
'
vs/platform/quickOpen/common/quickOpen
'
;
import
{
IQuickOpenService
}
from
'
vs/platform/quickOpen/common/quickOpen
'
;
import
{
IClipboardService
}
from
'
vs/platform/clipboard/common/clipboardService
'
;
import
{
IClipboardService
}
from
'
vs/platform/clipboard/common/clipboardService
'
;
import
{
ClipboardService
}
from
'
vs/platform/clipboard/electron-browser/clipboardService
'
;
import
{
ClipboardService
}
from
'
vs/platform/clipboard/electron-browser/clipboardService
'
;
...
...
src/vs/workbench/parts/files/browser/explorerViewlet.ts
浏览文件 @
8f1b989c
...
@@ -24,11 +24,10 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
...
@@ -24,11 +24,10 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import
{
IExtensionService
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
IExtensionService
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
DelegatingWorkbenchEditorService
}
from
'
vs/workbench/services/editor/browser/editorService
'
;
import
{
ServiceCollection
}
from
'
vs/platform/instantiation/common/serviceCollection
'
;
import
{
ServiceCollection
}
from
'
vs/platform/instantiation/common/serviceCollection
'
;
import
{
EditorInput
,
EditorOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
EditorInput
,
EditorOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkbenchEditorService
,
DelegatingWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
import
{
IContextKeyService
,
IContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IContextKeyService
,
IContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
...
...
src/vs/workbench/services/editor/browser/editorService.ts
已删除
100644 → 0
浏览文件 @
90ca93fd
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
network
=
require
(
'
vs/base/common/network
'
);
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
basename
,
dirname
}
from
'
vs/base/common/paths
'
;
import
{
EditorInput
,
EditorOptions
,
TextEditorOptions
,
Extensions
as
EditorExtensions
,
SideBySideEditorInput
,
IFileEditorInput
,
IFileInputFactory
,
IEditorInputFactoryRegistry
}
from
'
vs/workbench/common/editor
'
;
import
{
ResourceEditorInput
}
from
'
vs/workbench/common/editor/resourceEditorInput
'
;
import
{
IUntitledEditorService
,
UNTITLED_SCHEMA
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
import
{
IWorkbenchEditorService
,
IResourceInputType
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IEditorInput
,
IEditorOptions
,
ITextEditorOptions
,
Position
,
Direction
,
IEditor
,
IResourceInput
,
IResourceDiffInput
,
IResourceSideBySideInput
,
IUntitledResourceInput
}
from
'
vs/platform/editor/common/editor
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
DiffEditorInput
}
from
'
vs/workbench/common/editor/diffEditorInput
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
nls
=
require
(
'
vs/nls
'
);
import
{
getPathLabel
}
from
'
vs/base/common/labels
'
;
import
{
ResourceMap
}
from
'
vs/base/common/map
'
;
import
{
once
}
from
'
vs/base/common/event
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
export
interface
IEditorPart
{
openEditor
(
input
?:
IEditorInput
,
options
?:
IEditorOptions
|
ITextEditorOptions
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
openEditor
(
input
?:
IEditorInput
,
options
?:
IEditorOptions
|
ITextEditorOptions
,
position
?:
Position
):
TPromise
<
IEditor
>
;
openEditors
(
editors
:
{
input
:
IEditorInput
,
position
:
Position
,
options
?:
IEditorOptions
|
ITextEditorOptions
}[]):
TPromise
<
IEditor
[]
>
;
replaceEditors
(
editors
:
{
toReplace
:
IEditorInput
,
replaceWith
:
IEditorInput
,
options
?:
IEditorOptions
|
ITextEditorOptions
}[],
position
?:
Position
):
TPromise
<
IEditor
[]
>
;
closeEditor
(
position
:
Position
,
input
:
IEditorInput
):
TPromise
<
void
>
;
closeEditors
(
position
:
Position
,
filter
?:
{
except
?:
IEditorInput
,
direction
?:
Direction
,
unmodifiedOnly
?:
boolean
}):
TPromise
<
void
>
;
closeAllEditors
(
except
?:
Position
):
TPromise
<
void
>
;
getActiveEditor
():
IEditor
;
getVisibleEditors
():
IEditor
[];
getActiveEditorInput
():
IEditorInput
;
}
type
ICachedEditorInput
=
ResourceEditorInput
|
IFileEditorInput
;
export
class
WorkbenchEditorService
implements
IWorkbenchEditorService
{
public
_serviceBrand
:
any
;
private
static
CACHE
:
ResourceMap
<
ICachedEditorInput
>
=
new
ResourceMap
<
ICachedEditorInput
>
();
private
editorPart
:
IEditorPart
|
IWorkbenchEditorService
;
private
fileInputFactory
:
IFileInputFactory
;
constructor
(
editorPart
:
IEditorPart
|
IWorkbenchEditorService
,
@
IUntitledEditorService
private
untitledEditorService
:
IUntitledEditorService
,
@
IWorkspaceContextService
private
workspaceContextService
:
IWorkspaceContextService
,
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
IEnvironmentService
private
environmentService
:
IEnvironmentService
,
@
IFileService
private
fileService
:
IFileService
)
{
this
.
editorPart
=
editorPart
;
this
.
fileInputFactory
=
Registry
.
as
<
IEditorInputFactoryRegistry
>
(
EditorExtensions
.
EditorInputFactories
).
getFileInputFactory
();
}
public
getActiveEditor
():
IEditor
{
return
this
.
editorPart
.
getActiveEditor
();
}
public
getActiveEditorInput
():
IEditorInput
{
return
this
.
editorPart
.
getActiveEditorInput
();
}
public
getVisibleEditors
():
IEditor
[]
{
return
this
.
editorPart
.
getVisibleEditors
();
}
public
isVisible
(
input
:
IEditorInput
,
includeSideBySide
:
boolean
):
boolean
{
if
(
!
input
)
{
return
false
;
}
return
this
.
getVisibleEditors
().
some
(
editor
=>
{
if
(
!
editor
.
input
)
{
return
false
;
}
if
(
input
.
matches
(
editor
.
input
))
{
return
true
;
}
if
(
includeSideBySide
&&
editor
.
input
instanceof
SideBySideEditorInput
)
{
const
sideBySideInput
=
<
SideBySideEditorInput
>
editor
.
input
;
return
input
.
matches
(
sideBySideInput
.
master
)
||
input
.
matches
(
sideBySideInput
.
details
);
}
return
false
;
});
}
public
openEditor
(
input
:
IEditorInput
,
options
?:
IEditorOptions
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
public
openEditor
(
input
:
IEditorInput
,
options
?:
IEditorOptions
,
position
?:
Position
):
TPromise
<
IEditor
>
;
public
openEditor
(
input
:
IResourceInputType
,
position
?:
Position
):
TPromise
<
IEditor
>
;
public
openEditor
(
input
:
IResourceInputType
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
public
openEditor
(
input
:
any
,
arg2
?:
any
,
arg3
?:
any
):
TPromise
<
IEditor
>
{
if
(
!
input
)
{
return
TPromise
.
as
<
IEditor
>
(
null
);
}
// Workbench Input Support
if
(
input
instanceof
EditorInput
)
{
return
this
.
doOpenEditor
(
input
,
this
.
toOptions
(
arg2
),
arg3
);
}
// Support opening foreign resources (such as a http link that points outside of the workbench)
const
resourceInput
=
<
IResourceInput
>
input
;
if
(
resourceInput
.
resource
instanceof
URI
)
{
const
schema
=
resourceInput
.
resource
.
scheme
;
if
(
schema
===
network
.
Schemas
.
http
||
schema
===
network
.
Schemas
.
https
)
{
window
.
open
(
resourceInput
.
resource
.
toString
(
true
));
return
TPromise
.
as
<
IEditor
>
(
null
);
}
}
// Untyped Text Editor Support (required for code that uses this service below workbench level)
const
textInput
=
<
IResourceInputType
>
input
;
const
typedInput
=
this
.
createInput
(
textInput
);
if
(
typedInput
)
{
return
this
.
doOpenEditor
(
typedInput
,
TextEditorOptions
.
from
(
textInput
),
arg2
);
}
return
TPromise
.
as
<
IEditor
>
(
null
);
}
private
toOptions
(
options
?:
IEditorOptions
|
EditorOptions
):
EditorOptions
{
if
(
!
options
||
options
instanceof
EditorOptions
)
{
return
options
as
EditorOptions
;
}
const
textOptions
:
ITextEditorOptions
=
options
;
if
(
!!
textOptions
.
selection
)
{
return
TextEditorOptions
.
create
(
options
);
}
return
EditorOptions
.
create
(
options
);
}
/**
* Allow subclasses to implement their own behavior for opening editor (see below).
*/
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
position
?:
Position
):
TPromise
<
IEditor
>
;
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
arg3
?:
any
):
TPromise
<
IEditor
>
{
return
this
.
editorPart
.
openEditor
(
input
,
options
,
arg3
);
}
public
openEditors
(
editors
:
{
input
:
IResourceInputType
,
position
:
Position
}[]):
TPromise
<
IEditor
[]
>
;
public
openEditors
(
editors
:
{
input
:
IEditorInput
,
position
:
Position
,
options
?:
IEditorOptions
}[]):
TPromise
<
IEditor
[]
>
;
public
openEditors
(
editors
:
any
[]):
TPromise
<
IEditor
[]
>
{
const
inputs
=
editors
.
map
(
editor
=>
this
.
createInput
(
editor
.
input
));
const
typedInputs
:
{
input
:
IEditorInput
,
position
:
Position
,
options
?:
EditorOptions
}[]
=
inputs
.
map
((
input
,
index
)
=>
{
const
options
=
editors
[
index
].
input
instanceof
EditorInput
?
this
.
toOptions
(
editors
[
index
].
options
)
:
TextEditorOptions
.
from
(
editors
[
index
].
input
);
return
{
input
,
options
,
position
:
editors
[
index
].
position
};
});
return
this
.
editorPart
.
openEditors
(
typedInputs
);
}
public
replaceEditors
(
editors
:
{
toReplace
:
IResourceInputType
,
replaceWith
:
IResourceInputType
}[],
position
?:
Position
):
TPromise
<
IEditor
[]
>
;
public
replaceEditors
(
editors
:
{
toReplace
:
IEditorInput
,
replaceWith
:
IEditorInput
,
options
?:
IEditorOptions
}[],
position
?:
Position
):
TPromise
<
IEditor
[]
>
;
public
replaceEditors
(
editors
:
any
[],
position
?:
Position
):
TPromise
<
IEditor
[]
>
{
const
toReplaceInputs
=
editors
.
map
(
editor
=>
this
.
createInput
(
editor
.
toReplace
));
const
replaceWithInputs
=
editors
.
map
(
editor
=>
this
.
createInput
(
editor
.
replaceWith
));
const
typedReplacements
:
{
toReplace
:
IEditorInput
,
replaceWith
:
IEditorInput
,
options
?:
EditorOptions
}[]
=
editors
.
map
((
editor
,
index
)
=>
{
const
options
=
editor
.
toReplace
instanceof
EditorInput
?
this
.
toOptions
(
editor
.
options
)
:
TextEditorOptions
.
from
(
editor
.
replaceWith
);
return
{
toReplace
:
toReplaceInputs
[
index
],
replaceWith
:
replaceWithInputs
[
index
],
options
};
});
return
this
.
editorPart
.
replaceEditors
(
typedReplacements
,
position
);
}
public
closeEditor
(
position
:
Position
,
input
:
IEditorInput
):
TPromise
<
void
>
{
return
this
.
doCloseEditor
(
position
,
input
);
}
protected
doCloseEditor
(
position
:
Position
,
input
:
IEditorInput
):
TPromise
<
void
>
{
return
this
.
editorPart
.
closeEditor
(
position
,
input
);
}
public
closeEditors
(
position
:
Position
,
filter
?:
{
except
?:
IEditorInput
,
direction
?:
Direction
,
unmodifiedOnly
?:
boolean
}):
TPromise
<
void
>
{
return
this
.
editorPart
.
closeEditors
(
position
,
filter
);
}
public
closeAllEditors
(
except
?:
Position
):
TPromise
<
void
>
{
return
this
.
editorPart
.
closeAllEditors
(
except
);
}
public
createInput
(
input
:
IEditorInput
):
EditorInput
;
public
createInput
(
input
:
IResourceInputType
):
EditorInput
;
public
createInput
(
input
:
any
):
IEditorInput
{
// Workbench Input Support
if
(
input
instanceof
EditorInput
)
{
return
input
;
}
// Side by Side Support
const
resourceSideBySideInput
=
<
IResourceSideBySideInput
>
input
;
if
(
resourceSideBySideInput
.
masterResource
&&
resourceSideBySideInput
.
detailResource
)
{
const
masterInput
=
this
.
createInput
({
resource
:
resourceSideBySideInput
.
masterResource
});
const
detailInput
=
this
.
createInput
({
resource
:
resourceSideBySideInput
.
detailResource
});
return
new
SideBySideEditorInput
(
resourceSideBySideInput
.
label
||
masterInput
.
getName
(),
typeof
resourceSideBySideInput
.
description
===
'
string
'
?
resourceSideBySideInput
.
description
:
masterInput
.
getDescription
(),
detailInput
,
masterInput
);
}
// Diff Editor Support
const
resourceDiffInput
=
<
IResourceDiffInput
>
input
;
if
(
resourceDiffInput
.
leftResource
&&
resourceDiffInput
.
rightResource
)
{
const
leftInput
=
this
.
createInput
({
resource
:
resourceDiffInput
.
leftResource
});
const
rightInput
=
this
.
createInput
({
resource
:
resourceDiffInput
.
rightResource
});
const
label
=
resourceDiffInput
.
label
||
this
.
toDiffLabel
(
resourceDiffInput
.
leftResource
,
resourceDiffInput
.
rightResource
,
this
.
workspaceContextService
,
this
.
environmentService
);
return
new
DiffEditorInput
(
label
,
resourceDiffInput
.
description
,
leftInput
,
rightInput
);
}
// Untitled file support
const
untitledInput
=
<
IUntitledResourceInput
>
input
;
if
(
!
untitledInput
.
resource
||
typeof
untitledInput
.
filePath
===
'
string
'
||
(
untitledInput
.
resource
instanceof
URI
&&
untitledInput
.
resource
.
scheme
===
UNTITLED_SCHEMA
))
{
return
this
.
untitledEditorService
.
createOrGet
(
untitledInput
.
filePath
?
URI
.
file
(
untitledInput
.
filePath
)
:
untitledInput
.
resource
,
untitledInput
.
language
,
untitledInput
.
contents
,
untitledInput
.
encoding
);
}
const
resourceInput
=
<
IResourceInput
>
input
;
// Files support
if
(
resourceInput
.
resource
instanceof
URI
&&
resourceInput
.
resource
.
scheme
===
network
.
Schemas
.
file
)
{
return
this
.
createOrGet
(
resourceInput
.
resource
,
this
.
instantiationService
,
resourceInput
.
label
,
resourceInput
.
description
,
resourceInput
.
encoding
);
}
// Any other resource
else
if
(
resourceInput
.
resource
instanceof
URI
)
{
const
label
=
resourceInput
.
label
||
basename
(
resourceInput
.
resource
.
fsPath
);
let
description
:
string
;
if
(
typeof
resourceInput
.
description
===
'
string
'
)
{
description
=
resourceInput
.
description
;
}
else
if
(
resourceInput
.
resource
.
scheme
===
network
.
Schemas
.
file
)
{
description
=
dirname
(
resourceInput
.
resource
.
fsPath
);
}
return
this
.
createOrGet
(
resourceInput
.
resource
,
this
.
instantiationService
,
label
,
description
);
}
return
null
;
}
private
createOrGet
(
resource
:
URI
,
instantiationService
:
IInstantiationService
,
label
:
string
,
description
:
string
,
encoding
?:
string
):
ICachedEditorInput
{
if
(
WorkbenchEditorService
.
CACHE
.
has
(
resource
))
{
const
input
=
WorkbenchEditorService
.
CACHE
.
get
(
resource
);
if
(
input
instanceof
ResourceEditorInput
)
{
input
.
setName
(
label
);
input
.
setDescription
(
description
);
}
else
{
input
.
setPreferredEncoding
(
encoding
);
}
return
input
;
}
let
input
:
ICachedEditorInput
;
if
(
resource
.
scheme
===
network
.
Schemas
.
file
||
this
.
fileService
.
canHandleResource
&&
this
.
fileService
.
canHandleResource
(
resource
))
{
input
=
this
.
fileInputFactory
.
createFileInput
(
resource
,
encoding
,
instantiationService
);
}
else
{
input
=
instantiationService
.
createInstance
(
ResourceEditorInput
,
label
,
description
,
resource
);
}
WorkbenchEditorService
.
CACHE
.
set
(
resource
,
input
);
once
(
input
.
onDispose
)(()
=>
{
WorkbenchEditorService
.
CACHE
.
delete
(
resource
);
});
return
input
;
}
private
toDiffLabel
(
res1
:
URI
,
res2
:
URI
,
context
:
IWorkspaceContextService
,
environment
:
IEnvironmentService
):
string
{
const
leftName
=
getPathLabel
(
res1
.
fsPath
,
context
,
environment
);
const
rightName
=
getPathLabel
(
res2
.
fsPath
,
context
,
environment
);
return
nls
.
localize
(
'
compareLabels
'
,
"
{0} ↔ {1}
"
,
leftName
,
rightName
);
}
}
export
interface
IEditorOpenHandler
{
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
position
?:
Position
):
TPromise
<
IEditor
>
;
}
export
interface
IEditorCloseHandler
{
(
position
:
Position
,
input
:
IEditorInput
):
TPromise
<
void
>
;
}
/**
* Subclass of workbench editor service that delegates all calls to the provided editor service. Subclasses can choose to override the behavior
* of openEditor() and closeEditor() by providing a handler.
*
* This gives clients a chance to override the behavior of openEditor() and closeEditor().
*/
export
class
DelegatingWorkbenchEditorService
extends
WorkbenchEditorService
{
private
editorOpenHandler
:
IEditorOpenHandler
;
private
editorCloseHandler
:
IEditorCloseHandler
;
constructor
(
@
IUntitledEditorService
untitledEditorService
:
IUntitledEditorService
,
@
IInstantiationService
instantiationService
:
IInstantiationService
,
@
IWorkspaceContextService
workspaceContextService
:
IWorkspaceContextService
,
@
IWorkbenchEditorService
editorService
:
IWorkbenchEditorService
,
@
IEnvironmentService
environmentService
:
IEnvironmentService
,
@
IFileService
fileService
:
IFileService
)
{
super
(
editorService
,
untitledEditorService
,
workspaceContextService
,
instantiationService
,
environmentService
,
fileService
);
}
public
setEditorOpenHandler
(
handler
:
IEditorOpenHandler
):
void
{
this
.
editorOpenHandler
=
handler
;
}
public
setEditorCloseHandler
(
handler
:
IEditorCloseHandler
):
void
{
this
.
editorCloseHandler
=
handler
;
}
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
position
?:
Position
):
TPromise
<
IEditor
>
;
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
arg3
?:
any
):
TPromise
<
IEditor
>
{
const
handleOpen
=
this
.
editorOpenHandler
?
this
.
editorOpenHandler
(
input
,
options
,
arg3
)
:
TPromise
.
as
(
void
0
);
return
handleOpen
.
then
(
editor
=>
{
if
(
editor
)
{
return
TPromise
.
as
<
IEditor
>
(
editor
);
}
return
super
.
doOpenEditor
(
input
,
options
,
arg3
);
});
}
protected
doCloseEditor
(
position
:
Position
,
input
:
IEditorInput
):
TPromise
<
void
>
{
const
handleClose
=
this
.
editorCloseHandler
?
this
.
editorCloseHandler
(
position
,
input
)
:
TPromise
.
as
(
void
0
);
return
handleClose
.
then
(()
=>
{
return
super
.
doCloseEditor
(
position
,
input
);
});
}
}
src/vs/workbench/services/editor/common/editorService.ts
浏览文件 @
8f1b989c
...
@@ -6,8 +6,23 @@
...
@@ -6,8 +6,23 @@
'
use strict
'
;
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
createDecorator
,
ServiceIdentifier
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
createDecorator
,
ServiceIdentifier
,
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IEditorService
,
IEditor
,
IEditorInput
,
IEditorOptions
,
ITextEditorOptions
,
Position
,
Direction
,
IResourceInput
,
IResourceDiffInput
,
IResourceSideBySideInput
,
IUntitledResourceInput
}
from
'
vs/platform/editor/common/editor
'
;
import
{
IEditorService
,
IEditor
,
IEditorInput
,
IEditorOptions
,
ITextEditorOptions
,
Position
,
Direction
,
IResourceInput
,
IResourceDiffInput
,
IResourceSideBySideInput
,
IUntitledResourceInput
}
from
'
vs/platform/editor/common/editor
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
network
=
require
(
'
vs/base/common/network
'
);
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
basename
,
dirname
}
from
'
vs/base/common/paths
'
;
import
{
EditorInput
,
EditorOptions
,
TextEditorOptions
,
Extensions
as
EditorExtensions
,
SideBySideEditorInput
,
IFileEditorInput
,
IFileInputFactory
,
IEditorInputFactoryRegistry
}
from
'
vs/workbench/common/editor
'
;
import
{
ResourceEditorInput
}
from
'
vs/workbench/common/editor/resourceEditorInput
'
;
import
{
IUntitledEditorService
,
UNTITLED_SCHEMA
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
import
{
DiffEditorInput
}
from
'
vs/workbench/common/editor/diffEditorInput
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
nls
=
require
(
'
vs/nls
'
);
import
{
getPathLabel
}
from
'
vs/base/common/labels
'
;
import
{
ResourceMap
}
from
'
vs/base/common/map
'
;
import
{
once
}
from
'
vs/base/common/event
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
export
const
IWorkbenchEditorService
=
createDecorator
<
IWorkbenchEditorService
>
(
'
editorService
'
);
export
const
IWorkbenchEditorService
=
createDecorator
<
IWorkbenchEditorService
>
(
'
editorService
'
);
...
@@ -91,4 +106,344 @@ export interface IWorkbenchEditorService extends IEditorService {
...
@@ -91,4 +106,344 @@ export interface IWorkbenchEditorService extends IEditorService {
* Allows to resolve an untyped input to a workbench typed instanceof editor input
* Allows to resolve an untyped input to a workbench typed instanceof editor input
*/
*/
createInput
(
input
:
IResourceInputType
):
IEditorInput
;
createInput
(
input
:
IResourceInputType
):
IEditorInput
;
}
}
\ No newline at end of file
export
interface
IEditorPart
{
openEditor
(
input
?:
IEditorInput
,
options
?:
IEditorOptions
|
ITextEditorOptions
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
openEditor
(
input
?:
IEditorInput
,
options
?:
IEditorOptions
|
ITextEditorOptions
,
position
?:
Position
):
TPromise
<
IEditor
>
;
openEditors
(
editors
:
{
input
:
IEditorInput
,
position
:
Position
,
options
?:
IEditorOptions
|
ITextEditorOptions
}[]):
TPromise
<
IEditor
[]
>
;
replaceEditors
(
editors
:
{
toReplace
:
IEditorInput
,
replaceWith
:
IEditorInput
,
options
?:
IEditorOptions
|
ITextEditorOptions
}[],
position
?:
Position
):
TPromise
<
IEditor
[]
>
;
closeEditor
(
position
:
Position
,
input
:
IEditorInput
):
TPromise
<
void
>
;
closeEditors
(
position
:
Position
,
filter
?:
{
except
?:
IEditorInput
,
direction
?:
Direction
,
unmodifiedOnly
?:
boolean
}):
TPromise
<
void
>
;
closeAllEditors
(
except
?:
Position
):
TPromise
<
void
>
;
getActiveEditor
():
IEditor
;
getVisibleEditors
():
IEditor
[];
getActiveEditorInput
():
IEditorInput
;
}
type
ICachedEditorInput
=
ResourceEditorInput
|
IFileEditorInput
;
export
class
WorkbenchEditorService
implements
IWorkbenchEditorService
{
public
_serviceBrand
:
any
;
private
static
CACHE
:
ResourceMap
<
ICachedEditorInput
>
=
new
ResourceMap
<
ICachedEditorInput
>
();
private
editorPart
:
IEditorPart
|
IWorkbenchEditorService
;
private
fileInputFactory
:
IFileInputFactory
;
constructor
(
editorPart
:
IEditorPart
|
IWorkbenchEditorService
,
@
IUntitledEditorService
private
untitledEditorService
:
IUntitledEditorService
,
@
IWorkspaceContextService
private
workspaceContextService
:
IWorkspaceContextService
,
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
IEnvironmentService
private
environmentService
:
IEnvironmentService
,
@
IFileService
private
fileService
:
IFileService
)
{
this
.
editorPart
=
editorPart
;
this
.
fileInputFactory
=
Registry
.
as
<
IEditorInputFactoryRegistry
>
(
EditorExtensions
.
EditorInputFactories
).
getFileInputFactory
();
}
public
getActiveEditor
():
IEditor
{
return
this
.
editorPart
.
getActiveEditor
();
}
public
getActiveEditorInput
():
IEditorInput
{
return
this
.
editorPart
.
getActiveEditorInput
();
}
public
getVisibleEditors
():
IEditor
[]
{
return
this
.
editorPart
.
getVisibleEditors
();
}
public
isVisible
(
input
:
IEditorInput
,
includeSideBySide
:
boolean
):
boolean
{
if
(
!
input
)
{
return
false
;
}
return
this
.
getVisibleEditors
().
some
(
editor
=>
{
if
(
!
editor
.
input
)
{
return
false
;
}
if
(
input
.
matches
(
editor
.
input
))
{
return
true
;
}
if
(
includeSideBySide
&&
editor
.
input
instanceof
SideBySideEditorInput
)
{
const
sideBySideInput
=
<
SideBySideEditorInput
>
editor
.
input
;
return
input
.
matches
(
sideBySideInput
.
master
)
||
input
.
matches
(
sideBySideInput
.
details
);
}
return
false
;
});
}
public
openEditor
(
input
:
IEditorInput
,
options
?:
IEditorOptions
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
public
openEditor
(
input
:
IEditorInput
,
options
?:
IEditorOptions
,
position
?:
Position
):
TPromise
<
IEditor
>
;
public
openEditor
(
input
:
IResourceInputType
,
position
?:
Position
):
TPromise
<
IEditor
>
;
public
openEditor
(
input
:
IResourceInputType
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
public
openEditor
(
input
:
any
,
arg2
?:
any
,
arg3
?:
any
):
TPromise
<
IEditor
>
{
if
(
!
input
)
{
return
TPromise
.
as
<
IEditor
>
(
null
);
}
// Workbench Input Support
if
(
input
instanceof
EditorInput
)
{
return
this
.
doOpenEditor
(
input
,
this
.
toOptions
(
arg2
),
arg3
);
}
// Support opening foreign resources (such as a http link that points outside of the workbench)
const
resourceInput
=
<
IResourceInput
>
input
;
if
(
resourceInput
.
resource
instanceof
URI
)
{
const
schema
=
resourceInput
.
resource
.
scheme
;
if
(
schema
===
network
.
Schemas
.
http
||
schema
===
network
.
Schemas
.
https
)
{
window
.
open
(
resourceInput
.
resource
.
toString
(
true
));
return
TPromise
.
as
<
IEditor
>
(
null
);
}
}
// Untyped Text Editor Support (required for code that uses this service below workbench level)
const
textInput
=
<
IResourceInputType
>
input
;
const
typedInput
=
this
.
createInput
(
textInput
);
if
(
typedInput
)
{
return
this
.
doOpenEditor
(
typedInput
,
TextEditorOptions
.
from
(
textInput
),
arg2
);
}
return
TPromise
.
as
<
IEditor
>
(
null
);
}
private
toOptions
(
options
?:
IEditorOptions
|
EditorOptions
):
EditorOptions
{
if
(
!
options
||
options
instanceof
EditorOptions
)
{
return
options
as
EditorOptions
;
}
const
textOptions
:
ITextEditorOptions
=
options
;
if
(
!!
textOptions
.
selection
)
{
return
TextEditorOptions
.
create
(
options
);
}
return
EditorOptions
.
create
(
options
);
}
/**
* Allow subclasses to implement their own behavior for opening editor (see below).
*/
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
position
?:
Position
):
TPromise
<
IEditor
>
;
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
arg3
?:
any
):
TPromise
<
IEditor
>
{
return
this
.
editorPart
.
openEditor
(
input
,
options
,
arg3
);
}
public
openEditors
(
editors
:
{
input
:
IResourceInputType
,
position
:
Position
}[]):
TPromise
<
IEditor
[]
>
;
public
openEditors
(
editors
:
{
input
:
IEditorInput
,
position
:
Position
,
options
?:
IEditorOptions
}[]):
TPromise
<
IEditor
[]
>
;
public
openEditors
(
editors
:
any
[]):
TPromise
<
IEditor
[]
>
{
const
inputs
=
editors
.
map
(
editor
=>
this
.
createInput
(
editor
.
input
));
const
typedInputs
:
{
input
:
IEditorInput
,
position
:
Position
,
options
?:
EditorOptions
}[]
=
inputs
.
map
((
input
,
index
)
=>
{
const
options
=
editors
[
index
].
input
instanceof
EditorInput
?
this
.
toOptions
(
editors
[
index
].
options
)
:
TextEditorOptions
.
from
(
editors
[
index
].
input
);
return
{
input
,
options
,
position
:
editors
[
index
].
position
};
});
return
this
.
editorPart
.
openEditors
(
typedInputs
);
}
public
replaceEditors
(
editors
:
{
toReplace
:
IResourceInputType
,
replaceWith
:
IResourceInputType
}[],
position
?:
Position
):
TPromise
<
IEditor
[]
>
;
public
replaceEditors
(
editors
:
{
toReplace
:
IEditorInput
,
replaceWith
:
IEditorInput
,
options
?:
IEditorOptions
}[],
position
?:
Position
):
TPromise
<
IEditor
[]
>
;
public
replaceEditors
(
editors
:
any
[],
position
?:
Position
):
TPromise
<
IEditor
[]
>
{
const
toReplaceInputs
=
editors
.
map
(
editor
=>
this
.
createInput
(
editor
.
toReplace
));
const
replaceWithInputs
=
editors
.
map
(
editor
=>
this
.
createInput
(
editor
.
replaceWith
));
const
typedReplacements
:
{
toReplace
:
IEditorInput
,
replaceWith
:
IEditorInput
,
options
?:
EditorOptions
}[]
=
editors
.
map
((
editor
,
index
)
=>
{
const
options
=
editor
.
toReplace
instanceof
EditorInput
?
this
.
toOptions
(
editor
.
options
)
:
TextEditorOptions
.
from
(
editor
.
replaceWith
);
return
{
toReplace
:
toReplaceInputs
[
index
],
replaceWith
:
replaceWithInputs
[
index
],
options
};
});
return
this
.
editorPart
.
replaceEditors
(
typedReplacements
,
position
);
}
public
closeEditor
(
position
:
Position
,
input
:
IEditorInput
):
TPromise
<
void
>
{
return
this
.
doCloseEditor
(
position
,
input
);
}
protected
doCloseEditor
(
position
:
Position
,
input
:
IEditorInput
):
TPromise
<
void
>
{
return
this
.
editorPart
.
closeEditor
(
position
,
input
);
}
public
closeEditors
(
position
:
Position
,
filter
?:
{
except
?:
IEditorInput
,
direction
?:
Direction
,
unmodifiedOnly
?:
boolean
}):
TPromise
<
void
>
{
return
this
.
editorPart
.
closeEditors
(
position
,
filter
);
}
public
closeAllEditors
(
except
?:
Position
):
TPromise
<
void
>
{
return
this
.
editorPart
.
closeAllEditors
(
except
);
}
public
createInput
(
input
:
IEditorInput
):
EditorInput
;
public
createInput
(
input
:
IResourceInputType
):
EditorInput
;
public
createInput
(
input
:
any
):
IEditorInput
{
// Workbench Input Support
if
(
input
instanceof
EditorInput
)
{
return
input
;
}
// Side by Side Support
const
resourceSideBySideInput
=
<
IResourceSideBySideInput
>
input
;
if
(
resourceSideBySideInput
.
masterResource
&&
resourceSideBySideInput
.
detailResource
)
{
const
masterInput
=
this
.
createInput
({
resource
:
resourceSideBySideInput
.
masterResource
});
const
detailInput
=
this
.
createInput
({
resource
:
resourceSideBySideInput
.
detailResource
});
return
new
SideBySideEditorInput
(
resourceSideBySideInput
.
label
||
masterInput
.
getName
(),
typeof
resourceSideBySideInput
.
description
===
'
string
'
?
resourceSideBySideInput
.
description
:
masterInput
.
getDescription
(),
detailInput
,
masterInput
);
}
// Diff Editor Support
const
resourceDiffInput
=
<
IResourceDiffInput
>
input
;
if
(
resourceDiffInput
.
leftResource
&&
resourceDiffInput
.
rightResource
)
{
const
leftInput
=
this
.
createInput
({
resource
:
resourceDiffInput
.
leftResource
});
const
rightInput
=
this
.
createInput
({
resource
:
resourceDiffInput
.
rightResource
});
const
label
=
resourceDiffInput
.
label
||
this
.
toDiffLabel
(
resourceDiffInput
.
leftResource
,
resourceDiffInput
.
rightResource
,
this
.
workspaceContextService
,
this
.
environmentService
);
return
new
DiffEditorInput
(
label
,
resourceDiffInput
.
description
,
leftInput
,
rightInput
);
}
// Untitled file support
const
untitledInput
=
<
IUntitledResourceInput
>
input
;
if
(
!
untitledInput
.
resource
||
typeof
untitledInput
.
filePath
===
'
string
'
||
(
untitledInput
.
resource
instanceof
URI
&&
untitledInput
.
resource
.
scheme
===
UNTITLED_SCHEMA
))
{
return
this
.
untitledEditorService
.
createOrGet
(
untitledInput
.
filePath
?
URI
.
file
(
untitledInput
.
filePath
)
:
untitledInput
.
resource
,
untitledInput
.
language
,
untitledInput
.
contents
,
untitledInput
.
encoding
);
}
const
resourceInput
=
<
IResourceInput
>
input
;
// Files support
if
(
resourceInput
.
resource
instanceof
URI
&&
resourceInput
.
resource
.
scheme
===
network
.
Schemas
.
file
)
{
return
this
.
createOrGet
(
resourceInput
.
resource
,
this
.
instantiationService
,
resourceInput
.
label
,
resourceInput
.
description
,
resourceInput
.
encoding
);
}
// Any other resource
else
if
(
resourceInput
.
resource
instanceof
URI
)
{
const
label
=
resourceInput
.
label
||
basename
(
resourceInput
.
resource
.
fsPath
);
let
description
:
string
;
if
(
typeof
resourceInput
.
description
===
'
string
'
)
{
description
=
resourceInput
.
description
;
}
else
if
(
resourceInput
.
resource
.
scheme
===
network
.
Schemas
.
file
)
{
description
=
dirname
(
resourceInput
.
resource
.
fsPath
);
}
return
this
.
createOrGet
(
resourceInput
.
resource
,
this
.
instantiationService
,
label
,
description
);
}
return
null
;
}
private
createOrGet
(
resource
:
URI
,
instantiationService
:
IInstantiationService
,
label
:
string
,
description
:
string
,
encoding
?:
string
):
ICachedEditorInput
{
if
(
WorkbenchEditorService
.
CACHE
.
has
(
resource
))
{
const
input
=
WorkbenchEditorService
.
CACHE
.
get
(
resource
);
if
(
input
instanceof
ResourceEditorInput
)
{
input
.
setName
(
label
);
input
.
setDescription
(
description
);
}
else
{
input
.
setPreferredEncoding
(
encoding
);
}
return
input
;
}
let
input
:
ICachedEditorInput
;
if
(
resource
.
scheme
===
network
.
Schemas
.
file
||
this
.
fileService
.
canHandleResource
&&
this
.
fileService
.
canHandleResource
(
resource
))
{
input
=
this
.
fileInputFactory
.
createFileInput
(
resource
,
encoding
,
instantiationService
);
}
else
{
input
=
instantiationService
.
createInstance
(
ResourceEditorInput
,
label
,
description
,
resource
);
}
WorkbenchEditorService
.
CACHE
.
set
(
resource
,
input
);
once
(
input
.
onDispose
)(()
=>
{
WorkbenchEditorService
.
CACHE
.
delete
(
resource
);
});
return
input
;
}
private
toDiffLabel
(
res1
:
URI
,
res2
:
URI
,
context
:
IWorkspaceContextService
,
environment
:
IEnvironmentService
):
string
{
const
leftName
=
getPathLabel
(
res1
.
fsPath
,
context
,
environment
);
const
rightName
=
getPathLabel
(
res2
.
fsPath
,
context
,
environment
);
return
nls
.
localize
(
'
compareLabels
'
,
"
{0} ↔ {1}
"
,
leftName
,
rightName
);
}
}
export
interface
IEditorOpenHandler
{
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
position
?:
Position
):
TPromise
<
IEditor
>
;
}
export
interface
IEditorCloseHandler
{
(
position
:
Position
,
input
:
IEditorInput
):
TPromise
<
void
>
;
}
/**
* Subclass of workbench editor service that delegates all calls to the provided editor service. Subclasses can choose to override the behavior
* of openEditor() and closeEditor() by providing a handler.
*
* This gives clients a chance to override the behavior of openEditor() and closeEditor().
*/
export
class
DelegatingWorkbenchEditorService
extends
WorkbenchEditorService
{
private
editorOpenHandler
:
IEditorOpenHandler
;
private
editorCloseHandler
:
IEditorCloseHandler
;
constructor
(
@
IUntitledEditorService
untitledEditorService
:
IUntitledEditorService
,
@
IInstantiationService
instantiationService
:
IInstantiationService
,
@
IWorkspaceContextService
workspaceContextService
:
IWorkspaceContextService
,
@
IWorkbenchEditorService
editorService
:
IWorkbenchEditorService
,
@
IEnvironmentService
environmentService
:
IEnvironmentService
,
@
IFileService
fileService
:
IFileService
)
{
super
(
editorService
,
untitledEditorService
,
workspaceContextService
,
instantiationService
,
environmentService
,
fileService
);
}
public
setEditorOpenHandler
(
handler
:
IEditorOpenHandler
):
void
{
this
.
editorOpenHandler
=
handler
;
}
public
setEditorCloseHandler
(
handler
:
IEditorCloseHandler
):
void
{
this
.
editorCloseHandler
=
handler
;
}
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
sideBySide
?:
boolean
):
TPromise
<
IEditor
>
;
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
position
?:
Position
):
TPromise
<
IEditor
>
;
protected
doOpenEditor
(
input
:
IEditorInput
,
options
?:
EditorOptions
,
arg3
?:
any
):
TPromise
<
IEditor
>
{
const
handleOpen
=
this
.
editorOpenHandler
?
this
.
editorOpenHandler
(
input
,
options
,
arg3
)
:
TPromise
.
as
(
void
0
);
return
handleOpen
.
then
(
editor
=>
{
if
(
editor
)
{
return
TPromise
.
as
<
IEditor
>
(
editor
);
}
return
super
.
doOpenEditor
(
input
,
options
,
arg3
);
});
}
protected
doCloseEditor
(
position
:
Position
,
input
:
IEditorInput
):
TPromise
<
void
>
{
const
handleClose
=
this
.
editorCloseHandler
?
this
.
editorCloseHandler
(
position
,
input
)
:
TPromise
.
as
(
void
0
);
return
handleClose
.
then
(()
=>
{
return
super
.
doCloseEditor
(
position
,
input
);
});
}
}
src/vs/workbench/services/editor/test/browser/editorService.test.ts
浏览文件 @
8f1b989c
...
@@ -14,7 +14,7 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
...
@@ -14,7 +14,7 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
import
{
EditorInput
,
EditorOptions
,
TextEditorOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
EditorInput
,
EditorOptions
,
TextEditorOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
FileEditorInput
}
from
'
vs/workbench/parts/files/common/editors/fileEditorInput
'
;
import
{
FileEditorInput
}
from
'
vs/workbench/parts/files/common/editors/fileEditorInput
'
;
import
{
workbenchInstantiationService
}
from
'
vs/workbench/test/workbenchTestServices
'
;
import
{
workbenchInstantiationService
}
from
'
vs/workbench/test/workbenchTestServices
'
;
import
{
DelegatingWorkbenchEditorService
,
WorkbenchEditorService
,
IEditorPart
}
from
'
vs/workbench/services/editor/
browser
/editorService
'
;
import
{
DelegatingWorkbenchEditorService
,
WorkbenchEditorService
,
IEditorPart
}
from
'
vs/workbench/services/editor/
common
/editorService
'
;
import
{
UntitledEditorInput
}
from
'
vs/workbench/common/editor/untitledEditorInput
'
;
import
{
UntitledEditorInput
}
from
'
vs/workbench/common/editor/untitledEditorInput
'
;
import
{
ResourceEditorInput
}
from
'
vs/workbench/common/editor/resourceEditorInput
'
;
import
{
ResourceEditorInput
}
from
'
vs/workbench/common/editor/resourceEditorInput
'
;
import
{
TestThemeService
}
from
'
vs/platform/theme/test/common/testThemeService
'
;
import
{
TestThemeService
}
from
'
vs/platform/theme/test/common/testThemeService
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录