Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a23e82d3
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,发现更多精彩内容 >>
提交
a23e82d3
编写于
9月 12, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
code cleanup
上级
ebf96cde
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
16 deletion
+11
-16
src/vs/workbench/common/editor/diffEditorInput.ts
src/vs/workbench/common/editor/diffEditorInput.ts
+11
-16
未找到文件。
src/vs/workbench/common/editor/diffEditorInput.ts
浏览文件 @
a23e82d3
...
...
@@ -81,14 +81,6 @@ export class DiffEditorInput extends BaseDiffEditorInput {
return
this
.
description
;
}
public
setOriginalInput
(
input
:
EditorInput
):
void
{
this
.
originalInput
=
input
;
}
public
setModifiedInput
(
input
:
EditorInput
):
void
{
this
.
modifiedInput
=
input
;
}
public
resolve
(
refresh
?:
boolean
):
TPromise
<
EditorModel
>
{
let
modelPromise
:
TPromise
<
EditorModel
>
;
...
...
@@ -119,7 +111,7 @@ export class DiffEditorInput extends BaseDiffEditorInput {
public
getPreferredEditorId
(
candidates
:
string
[]):
string
{
// Find the right diff editor for the given isBinary/isText state
le
t
useBinaryEditor
=
this
.
forceOpenAsBinary
||
this
.
isBinary
(
this
.
originalInput
)
||
this
.
isBinary
(
this
.
modifiedInput
);
cons
t
useBinaryEditor
=
this
.
forceOpenAsBinary
||
this
.
isBinary
(
this
.
originalInput
)
||
this
.
isBinary
(
this
.
modifiedInput
);
return
!
useBinaryEditor
?
'
workbench.editors.textDiffEditor
'
:
'
workbench.editors.binaryResourceDiffEditor
'
;
}
...
...
@@ -128,7 +120,7 @@ export class DiffEditorInput extends BaseDiffEditorInput {
let
mime
:
string
;
// Find mime by checking for IFileEditorInput implementors
le
t
fileInput
=
<
IFileEditorInput
>
(
<
any
>
input
);
cons
t
fileInput
=
<
IFileEditorInput
>
(
<
any
>
input
);
if
(
types
.
isFunction
(
fileInput
.
getMime
))
{
mime
=
fileInput
.
getMime
();
}
...
...
@@ -143,8 +135,8 @@ export class DiffEditorInput extends BaseDiffEditorInput {
this
.
originalInput
.
resolve
(
refresh
),
this
.
modifiedInput
.
resolve
(
refresh
)
]).
then
((
models
)
=>
{
le
t
originalEditorModel
=
models
[
0
];
le
t
modifiedEditorModel
=
models
[
1
];
cons
t
originalEditorModel
=
models
[
0
];
cons
t
modifiedEditorModel
=
models
[
1
];
// If both are text models, return textdiffeditor model
if
(
modifiedEditorModel
instanceof
BaseTextEditorModel
&&
originalEditorModel
instanceof
BaseTextEditorModel
)
{
...
...
@@ -170,7 +162,7 @@ export class DiffEditorInput extends BaseDiffEditorInput {
return
false
;
}
le
t
otherDiffInput
=
<
DiffEditorInput
>
otherInput
;
cons
t
otherDiffInput
=
<
DiffEditorInput
>
otherInput
;
return
this
.
originalInput
.
matches
(
otherDiffInput
.
originalInput
)
&&
this
.
modifiedInput
.
matches
(
otherDiffInput
.
modifiedInput
);
}
...
...
@@ -180,19 +172,22 @@ export class DiffEditorInput extends BaseDiffEditorInput {
public
dispose
():
void
{
this
.
_toUnbind
=
dispose
(
this
.
_toUnbind
);
// Dispose Model
// Free the diff editor model but do not propagate the dispose() call to the two inputs
// We never created the two inputs (original and modified) so we can not dispose
// them without sideeffects.
if
(
this
.
cachedModel
)
{
this
.
cachedModel
.
dispose
();
this
.
cachedModel
=
null
;
}
super
.
dispose
();
}
}
export
function
toDiffLabel
(
res1
:
URI
,
res2
:
URI
,
context
:
IWorkspaceProvider
):
string
{
le
t
leftName
=
getPathLabel
(
res1
.
fsPath
,
context
);
le
t
rightName
=
getPathLabel
(
res2
.
fsPath
,
context
);
cons
t
leftName
=
getPathLabel
(
res1
.
fsPath
,
context
);
cons
t
rightName
=
getPathLabel
(
res2
.
fsPath
,
context
);
return
nls
.
localize
(
'
compareLabels
'
,
"
{0} ↔ {1}
"
,
leftName
,
rightName
);
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录