Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
99f215d4
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,发现更多精彩内容 >>
提交
99f215d4
编写于
7月 14, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
'revealIfOpened' flag should start at active editor (fixes #9265)
上级
dccdd587
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
22 addition
and
14 deletion
+22
-14
src/vs/workbench/browser/parts/editor/editorPart.ts
src/vs/workbench/browser/parts/editor/editorPart.ts
+22
-14
未找到文件。
src/vs/workbench/browser/parts/editor/editorPart.ts
浏览文件 @
99f215d4
...
...
@@ -305,7 +305,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
return
editor
;
},
(
e
:
any
)
=>
this
.
messageService
.
show
(
Severity
.
Error
,
types
.
isString
(
e
)
?
new
Error
(
e
)
:
e
));
},
e
=>
this
.
messageService
.
show
(
Severity
.
Error
,
types
.
isString
(
e
)
?
new
Error
(
e
)
:
e
));
}
private
doCreateEditor
(
group
:
EditorGroup
,
descriptor
:
IEditorDescriptor
,
monitor
:
ProgressMonitor
):
TPromise
<
BaseEditor
>
{
...
...
@@ -418,7 +418,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
// Fullfill promise with Editor that is being used
return
editor
;
},
(
e
:
any
)
=>
this
.
doHandleSetInputError
(
e
,
group
,
editor
,
input
,
options
,
monitor
));
},
e
=>
this
.
doHandleSetInputError
(
e
,
group
,
editor
,
input
,
options
,
monitor
));
}
private
doHandleSetInputError
(
e
:
Error
|
IMessageWithAction
,
group
:
EditorGroup
,
editor
:
BaseEditor
,
input
:
EditorInput
,
options
:
EditorOptions
,
monitor
:
ProgressMonitor
):
void
{
...
...
@@ -681,7 +681,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
}
public
getVisibleEditors
():
BaseEditor
[]
{
return
this
.
visibleEditors
?
this
.
visibleEditors
.
filter
(
(
editor
)
=>
!!
editor
)
:
[];
return
this
.
visibleEditors
?
this
.
visibleEditors
.
filter
(
editor
=>
!!
editor
)
:
[];
}
public
moveGroup
(
from
:
EditorGroup
,
to
:
EditorGroup
):
void
;
...
...
@@ -1107,7 +1107,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
this
.
sideBySideControl
.
dispose
();
// Pass to active editors
this
.
visibleEditors
.
forEach
(
(
editor
)
=>
{
this
.
visibleEditors
.
forEach
(
editor
=>
{
if
(
editor
)
{
editor
.
dispose
();
}
...
...
@@ -1116,7 +1116,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
// Pass to instantiated editors
for
(
var
i
=
0
;
i
<
this
.
instantiatedEditors
.
length
;
i
++
)
{
for
(
var
j
=
0
;
j
<
this
.
instantiatedEditors
[
i
].
length
;
j
++
)
{
if
(
this
.
visibleEditors
.
some
(
(
editor
)
=>
editor
===
this
.
instantiatedEditors
[
i
][
j
]))
{
if
(
this
.
visibleEditors
.
some
(
editor
=>
editor
===
this
.
instantiatedEditors
[
i
][
j
]))
{
continue
;
}
...
...
@@ -1148,18 +1148,26 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
// Respect option to reveal an editor if it is already opened
if
(
options
&&
options
.
revealIfOpened
)
{
if
(
typeof
arg1
===
'
number
'
)
{
const
desiredGroup
=
this
.
stacks
.
groupAt
(
arg1
);
if
(
desiredGroup
&&
desiredGroup
.
contains
(
input
))
{
return
arg1
;
// First check over active and visible editors from left to right
const
editorsToCheck
:
BaseEditor
[]
=
[];
if
(
activeEditor
)
{
editorsToCheck
.
push
(
activeEditor
);
}
visibleEditors
.
forEach
(
e
=>
{
if
(
e
!==
activeEditor
)
{
editorsToCheck
.
push
(
e
);
}});
for
(
let
i
=
0
;
i
<
editorsToCheck
.
length
;
i
++
)
{
const
editorToCheck
=
editorsToCheck
[
i
];
if
(
input
.
matches
(
editorToCheck
.
input
))
{
return
editorToCheck
.
position
;
}
}
const
groups
=
this
.
stacks
.
groups
;
for
(
let
i
=
0
;
i
<
groups
.
length
;
i
++
)
{
const
group
=
groups
[
i
];
if
(
group
.
contains
(
input
))
{
return
this
.
stacks
.
positionOfGroup
(
group
);
// Then check over active and visible groups from left to right
const
groupsToCheck
:
EditorGroup
[]
=
[];
if
(
this
.
stacks
.
activeGroup
)
{
groupsToCheck
.
push
(
this
.
stacks
.
activeGroup
);
}
this
.
stacks
.
groups
.
forEach
(
g
=>
{
if
(
g
!==
this
.
stacks
.
activeGroup
)
{
groupsToCheck
.
push
(
g
);
}});
for
(
let
i
=
0
;
i
<
groupsToCheck
.
length
;
i
++
)
{
const
groupToCheck
=
groupsToCheck
[
i
];
if
(
groupToCheck
.
contains
(
input
))
{
return
this
.
stacks
.
positionOfGroup
(
groupToCheck
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录