Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
41b0d32a
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,发现更多精彩内容 >>
提交
41b0d32a
编写于
5月 25, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #74295
上级
4b334035
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
32 addition
and
34 deletion
+32
-34
src/vs/workbench/browser/parts/editor/editorGroupView.ts
src/vs/workbench/browser/parts/editor/editorGroupView.ts
+32
-34
未找到文件。
src/vs/workbench/browser/parts/editor/editorGroupView.ts
浏览文件 @
41b0d32a
...
...
@@ -824,34 +824,36 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
return
this
.
doShowEditor
(
editor
,
!!
openEditorOptions
.
active
,
options
);
}
private
doShowEditor
(
editor
:
EditorInput
,
active
:
boolean
,
options
?:
EditorOptions
):
Promise
<
IEditor
|
null
>
{
private
async
doShowEditor
(
editor
:
EditorInput
,
active
:
boolean
,
options
?:
EditorOptions
):
Promise
<
IEditor
|
null
>
{
// Show in editor control if the active editor changed
let
openEditorPromise
:
Promise
<
IEditor
|
null
>
;
const
openEditorPromise
=
this
.
editorControl
.
openEditor
(
editor
,
options
);
// Show in title control after editor control because some actions depend on it
this
.
titleAreaControl
.
openEditor
(
editor
);
// Return opened editor to caller (can be NULL)
let
openedEditor
:
IEditor
|
null
=
null
;
if
(
active
)
{
openEditorPromise
=
this
.
editorControl
.
openEditor
(
editor
,
options
).
then
(
result
=>
{
try
{
const
result
=
await
openEditorPromise
;
// Editor change event
if
(
result
.
editorChanged
)
{
this
.
_onDidGroupChange
.
fire
({
kind
:
GroupChangeKind
.
EDITOR_ACTIVE
,
editor
});
}
return
result
.
control
;
}
,
error
=>
{
openedEditor
=
result
.
control
;
}
catch
(
error
)
{
// Handle errors but do not bubble them up
this
.
doHandleOpenEditorError
(
error
,
editor
,
options
);
return
null
;
// error: return NULL as result to signal this
});
}
}
else
{
open
EditorPromise
=
Promise
.
resolve
(
null
)
;
// inactive: return NULL as result to signal this
open
edEditor
=
null
;
// inactive: return NULL as result to signal this
}
// Show in title control after editor control because some actions depend on it
this
.
titleAreaControl
.
openEditor
(
editor
);
return
openEditorPromise
;
return
openedEditor
;
}
private
doHandleOpenEditorError
(
error
:
Error
,
editor
:
EditorInput
,
options
?:
EditorOptions
):
void
{
...
...
@@ -895,29 +897,25 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
// Do not modify original array
editors
=
editors
.
slice
(
0
);
let
result
:
IEditor
|
null
;
// Use the first editor as active editor
const
{
editor
,
options
}
=
editors
.
shift
()
!
;
return
this
.
openEditor
(
editor
,
options
).
then
(
activeEditor
=>
{
result
=
activeEditor
;
// this can be NULL if the opening failed
const
startingIndex
=
this
.
getIndexOfEditor
(
editor
)
+
1
;
// Open the other ones inactive
return
Promise
.
all
(
editors
.
map
(({
editor
,
options
},
index
)
=>
{
const
adjustedEditorOptions
=
options
||
new
EditorOptions
();
adjustedEditorOptions
.
inactive
=
true
;
adjustedEditorOptions
.
pinned
=
true
;
adjustedEditorOptions
.
index
=
startingIndex
+
index
;
return
this
.
openEditor
(
editor
,
adjustedEditorOptions
).
then
(
activeEditor
=>
{
if
(
!
result
)
{
result
=
activeEditor
;
// only take if the first editor opening failed
}
});
})).
then
(()
=>
result
);
});
let
firstOpenedEditor
=
await
this
.
openEditor
(
editor
,
options
);
// Open the other ones inactive
const
startingIndex
=
this
.
getIndexOfEditor
(
editor
)
+
1
;
await
Promise
.
all
(
editors
.
map
(
async
({
editor
,
options
},
index
)
=>
{
const
adjustedEditorOptions
=
options
||
new
EditorOptions
();
adjustedEditorOptions
.
inactive
=
true
;
adjustedEditorOptions
.
pinned
=
true
;
adjustedEditorOptions
.
index
=
startingIndex
+
index
;
const
openedEditor
=
await
this
.
openEditor
(
editor
,
adjustedEditorOptions
);
if
(
!
firstOpenedEditor
)
{
firstOpenedEditor
=
openedEditor
;
// only take if the first editor opening failed
}
}));
return
firstOpenedEditor
;
}
//#endregion
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录