Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8692734a
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,发现更多精彩内容 >>
提交
8692734a
编写于
12月 02, 2016
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#16394 Polishing
上级
c157937b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
13 deletion
+20
-13
src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+15
-12
src/vs/workbench/common/editor.ts
src/vs/workbench/common/editor.ts
+1
-1
src/vs/workbench/common/editor/diffEditorInput.ts
src/vs/workbench/common/editor/diffEditorInput.ts
+4
-0
未找到文件。
src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
浏览文件 @
8692734a
...
...
@@ -41,7 +41,7 @@ export class SideBySideEditor extends BaseEditor {
super
(
SideBySideEditor
.
ID
,
telemetryService
);
}
public
createEditor
(
parent
:
Builder
)
{
public
createEditor
(
parent
:
Builder
)
:
void
{
const
parentElement
=
parent
.
getHTMLElement
();
DOM
.
addClass
(
parentElement
,
'
side-by-side-editor
'
);
this
.
createSash
(
parentElement
);
...
...
@@ -63,24 +63,27 @@ export class SideBySideEditor extends BaseEditor {
super
.
setEditorVisible
(
visible
,
position
);
}
public
clearInput
()
{
public
clearInput
()
:
void
{
this
.
disposeEditors
();
super
.
clearInput
();
}
public
focus
()
{
public
focus
()
:
void
{
if
(
this
.
masterEditor
)
{
this
.
masterEditor
.
focus
();
}
}
public
layout
(
dimension
:
Dimension
)
{
public
layout
(
dimension
:
Dimension
)
:
void
{
this
.
dimension
=
dimension
;
this
.
sash
.
setDimenesion
(
this
.
dimension
);
}
public
getControl
():
IEditorControl
{
return
this
.
masterEditor
.
getControl
();
if
(
this
.
masterEditor
)
{
return
this
.
masterEditor
.
getControl
();
}
return
null
;
}
private
updateInput
(
oldInput
:
SideBySideEditorInput
,
newInput
:
SideBySideEditorInput
,
options
:
EditorOptions
):
TPromise
<
void
>
{
...
...
@@ -111,19 +114,19 @@ export class SideBySideEditor extends BaseEditor {
return
this
.
instantiationService
.
createInstance
(
<
EditorDescriptor
>
descriptor
)
.
then
((
editor
:
BaseEditor
)
=>
{
editor
.
create
(
new
Builder
(
container
));
editor
.
setInput
(
editorInput
,
options
);
return
editor
;
return
editor
.
setInput
(
editorInput
,
options
).
then
(()
=>
editor
);
});
}
private
onEditorsCreated
(
details
:
BaseEditor
,
master
:
BaseEditor
)
{
private
onEditorsCreated
(
details
:
BaseEditor
,
master
:
BaseEditor
)
:
void
{
this
.
detailsEditor
=
details
;
this
.
masterEditor
=
master
;
this
.
set
Visible
(
this
.
isVisible
()
);
this
.
set
EditorVisible
(
this
.
isVisible
(),
this
.
position
);
this
.
dolayout
(
this
.
sash
.
getVerticalSashLeft
());
this
.
focus
();
}
private
createEditorContainers
()
{
private
createEditorContainers
()
:
void
{
const
parentElement
=
this
.
getContainer
().
getHTMLElement
();
this
.
detailsEditorContainer
=
DOM
.
append
(
parentElement
,
DOM
.
$
(
'
.details-editor-container
'
));
this
.
detailsEditorContainer
.
style
.
position
=
'
absolute
'
;
...
...
@@ -136,7 +139,7 @@ export class SideBySideEditor extends BaseEditor {
this
.
_register
(
this
.
sash
.
onPositionChange
(
position
=>
this
.
dolayout
(
position
)));
}
private
dolayout
(
splitPoint
:
number
)
{
private
dolayout
(
splitPoint
:
number
)
:
void
{
if
(
!
this
.
detailsEditor
||
!
this
.
masterEditor
)
{
return
;
}
...
...
@@ -155,7 +158,7 @@ export class SideBySideEditor extends BaseEditor {
this
.
masterEditor
.
layout
(
new
Dimension
(
masterEditorWidth
,
this
.
dimension
.
height
));
}
private
disposeEditors
()
{
private
disposeEditors
()
:
void
{
const
parentContainer
=
this
.
getContainer
().
getHTMLElement
();
if
(
this
.
detailsEditor
)
{
this
.
detailsEditor
.
dispose
();
...
...
src/vs/workbench/common/editor.ts
浏览文件 @
8692734a
...
...
@@ -365,7 +365,7 @@ export class SideBySideEditorInput extends EditorInput {
private
_toUnbind
:
IDisposable
[];
constructor
(
private
name
:
string
,
private
description
:
string
,
private
_details
:
EditorInput
,
private
_master
:
EditorInput
,
protected
forceOpenAsBinary
?:
boolean
)
{
constructor
(
private
name
:
string
,
private
description
:
string
,
private
_details
:
EditorInput
,
private
_master
:
EditorInput
)
{
super
();
this
.
_toUnbind
=
[];
this
.
registerListeners
();
...
...
src/vs/workbench/common/editor/diffEditorInput.ts
浏览文件 @
8692734a
...
...
@@ -23,6 +23,10 @@ export class DiffEditorInput extends SideBySideEditorInput {
private
cachedModel
:
DiffEditorModel
;
constructor
(
name
:
string
,
description
:
string
,
original
:
EditorInput
,
modified
:
EditorInput
,
private
forceOpenAsBinary
?:
boolean
)
{
super
(
name
,
description
,
original
,
modified
);
}
public
getTypeId
():
string
{
return
DiffEditorInput
.
ID
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录