Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b84f7469
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,发现更多精彩内容 >>
提交
b84f7469
编写于
12月 19, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
prefer command over fileditorinput dependency
上级
bcf70f76
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
4 addition
and
6 deletion
+4
-6
src/vs/workbench/parts/files/browser/fileActions.ts
src/vs/workbench/parts/files/browser/fileActions.ts
+4
-6
未找到文件。
src/vs/workbench/parts/files/browser/fileActions.ts
浏览文件 @
b84f7469
...
...
@@ -26,9 +26,8 @@ import { VIEWLET_ID } from 'vs/workbench/parts/files/common/files';
import
labels
=
require
(
'
vs/base/common/labels
'
);
import
{
ITextFileService
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
IFileService
,
IFileStat
}
from
'
vs/platform/files/common/files
'
;
import
{
DiffEditorInput
,
toDiffLabel
}
from
'
vs/workbench/common/editor/diffEditorInput
'
;
import
{
toDiffLabel
}
from
'
vs/workbench/common/editor/diffEditorInput
'
;
import
{
asFileEditorInput
,
getUntitledOrFileResource
,
IEditorIdentifier
,
EditorInput
}
from
'
vs/workbench/common/editor
'
;
import
{
FileEditorInput
}
from
'
vs/workbench/parts/files/common/editors/fileEditorInput
'
;
import
{
FileStat
,
NewStatPlaceholder
}
from
'
vs/workbench/parts/files/common/explorerViewModel
'
;
import
{
ExplorerView
}
from
'
vs/workbench/parts/files/browser/views/explorerView
'
;
import
{
ExplorerViewlet
}
from
'
vs/workbench/parts/files/browser/explorerViewlet
'
;
...
...
@@ -48,6 +47,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
import
{
Keybinding
,
KeyMod
,
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
getCodeEditor
}
from
'
vs/editor/common/services/codeEditorService
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
export
interface
IEditableData
{
action
:
IAction
;
...
...
@@ -1216,6 +1216,7 @@ export class CompareResourcesAction extends Action {
tree
:
ITree
,
@
IWorkspaceContextService
private
contextService
:
IWorkspaceContextService
,
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
ICommandService
private
commandService
:
ICommandService
,
@
IWorkbenchEditorService
private
editorService
:
IWorkbenchEditorService
)
{
super
(
'
workbench.files.action.compareFiles
'
,
CompareResourcesAction
.
computeLabel
());
...
...
@@ -1270,10 +1271,7 @@ export class CompareResourcesAction extends Action {
this
.
tree
.
clearHighlight
();
}
const
leftInput
=
this
.
instantiationService
.
createInstance
(
FileEditorInput
,
globalResourceToCompare
,
void
0
);
const
rightInput
=
this
.
instantiationService
.
createInstance
(
FileEditorInput
,
this
.
resource
,
void
0
);
return
this
.
editorService
.
openEditor
(
new
DiffEditorInput
(
toDiffLabel
(
globalResourceToCompare
,
this
.
resource
,
this
.
contextService
),
null
,
leftInput
,
rightInput
));
return
this
.
commandService
.
executeCommand
(
'
_workbench.diff
'
,
[
globalResourceToCompare
,
this
.
resource
,
toDiffLabel
(
globalResourceToCompare
,
this
.
resource
,
this
.
contextService
)]);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录