Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8a02843a
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,发现更多精彩内容 >>
提交
8a02843a
编写于
1月 13, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
implement closeEditors properly when passing in editors
上级
4df995c2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
49 addition
and
12 deletion
+49
-12
src/vs/workbench/browser/parts/editor/editorPart.ts
src/vs/workbench/browser/parts/editor/editorPart.ts
+49
-12
未找到文件。
src/vs/workbench/browser/parts/editor/editorPart.ts
浏览文件 @
8a02843a
...
...
@@ -697,10 +697,19 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
return
;
}
groups
.
forEach
(
group
=>
this
.
doClose
Editors
(
group
));
groups
.
forEach
(
group
=>
this
.
doClose
AllEditorsInGroup
(
group
));
});
}
private
doCloseAllEditorsInGroup
(
group
:
EditorGroup
):
void
{
// Update stacks model: remove all non active editors first to prevent opening the next editor in group
group
.
closeEditors
(
group
.
activeEditor
);
// Now close active editor in group which will close the group
this
.
doCloseActiveEditor
(
group
);
}
public
closeEditors
(
position
:
Position
,
filter
:
{
except
?:
EditorInput
,
direction
?:
Direction
,
unmodifiedOnly
?:
boolean
}):
TPromise
<
void
>
;
public
closeEditors
(
position
:
Position
,
editors
:
EditorInput
[]):
TPromise
<
void
>
;
public
closeEditors
(
position
:
Position
,
filterOrEditors
?:
{
except
?:
EditorInput
,
direction
?:
Direction
,
unmodifiedOnly
?:
boolean
}
|
EditorInput
[]):
TPromise
<
void
>
{
...
...
@@ -740,11 +749,44 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
return
;
}
this
.
doCloseEditors
(
group
,
filter
);
// Close without filter
if
(
Array
.
isArray
(
filterOrEditors
))
{
return
this
.
doCloseEditors
(
group
,
editorsToClose
);
}
// Close with filter
return
this
.
doCloseEditorsWithFilter
(
group
,
filter
);
});
}
private
doCloseEditors
(
group
:
EditorGroup
,
filter
:
{
except
?:
EditorInput
,
direction
?:
Direction
,
unmodifiedOnly
?:
boolean
}
=
Object
.
create
(
null
)):
void
{
private
doCloseEditors
(
group
:
EditorGroup
,
editors
:
EditorInput
[]):
void
{
// Close all editors in group
if
(
editors
.
length
===
group
.
count
)
{
this
.
doCloseAllEditorsInGroup
(
group
);
}
// Close specific editors in group
else
{
// Editors to close are not active, so we can just close them
if
(
!
editors
.
some
(
editor
=>
group
.
activeEditor
.
matches
(
editor
)))
{
editors
.
forEach
(
editor
=>
this
.
doCloseInactiveEditor
(
group
,
editor
));
}
// Active editor is also a candidate to close, thus we make the first
// non-candidate editor active and then close the other ones
else
{
const
firstEditorToKeep
=
group
.
getEditors
(
true
).
filter
(
editorInGroup
=>
!
editors
.
some
(
editor
=>
editor
.
matches
(
editorInGroup
)))[
0
];
this
.
openEditor
(
firstEditorToKeep
,
null
,
this
.
stacks
.
positionOfGroup
(
group
)).
done
(()
=>
{
editors
.
forEach
(
editor
=>
this
.
doCloseInactiveEditor
(
group
,
editor
));
},
errors
.
onUnexpectedError
);
}
}
}
private
doCloseEditorsWithFilter
(
group
:
EditorGroup
,
filter
:
{
except
?:
EditorInput
,
direction
?:
Direction
,
unmodifiedOnly
?:
boolean
}):
void
{
// Close all editors if there is no editor to except and
// we either are not only closing unmodified editors or
...
...
@@ -760,12 +802,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
// Close all editors in group
if
(
closeAllEditors
)
{
// Update stacks model: remove all non active editors first to prevent opening the next editor in group
group
.
closeEditors
(
group
.
activeEditor
);
// Now close active editor in group which will close the group
this
.
doCloseActiveEditor
(
group
);
this
.
doCloseAllEditorsInGroup
(
group
);
}
// Close unmodified editors in group
...
...
@@ -779,10 +816,10 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
// Active editor is also a candidate to close, thus we make the first dirty editor
// active and then close the other ones
else
{
const
firstDirtyEditor
=
group
.
getEditors
().
filter
(
editor
=>
editor
.
isDirty
())[
0
];
const
firstDirtyEditor
=
group
.
getEditors
(
true
).
filter
(
editor
=>
editor
.
isDirty
())[
0
];
this
.
openEditor
(
firstDirtyEditor
,
null
,
this
.
stacks
.
positionOfGroup
(
group
)).
done
(()
=>
{
this
.
doCloseEditors
(
group
,
filter
);
this
.
doCloseEditors
WithFilter
(
group
,
filter
);
},
errors
.
onUnexpectedError
);
}
}
...
...
@@ -803,7 +840,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
// being the expected one, otherwise we end up in an endless loop trying to open the
// editor
if
(
filter
.
except
.
matches
(
group
.
activeEditor
))
{
this
.
doCloseEditors
(
group
,
filter
);
this
.
doCloseEditors
WithFilter
(
group
,
filter
);
}
},
errors
.
onUnexpectedError
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录