Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0004cabf
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,体验更适合开发者的 AI 搜索 >>
提交
0004cabf
编写于
10月 02, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #107850
上级
5052a7bc
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
1 deletion
+18
-1
src/vs/workbench/services/history/browser/history.ts
src/vs/workbench/services/history/browser/history.ts
+18
-1
未找到文件。
src/vs/workbench/services/history/browser/history.ts
浏览文件 @
0004cabf
...
...
@@ -615,8 +615,13 @@ export class HistoryService extends Disposable implements IHistoryService {
private
static
readonly
MAX_RECENTLY_CLOSED_EDITORS
=
20
;
private
recentlyClosedEditors
:
IRecentlyClosedEditor
[]
=
[];
private
ignoreEditorCloseEvent
=
false
;
private
onEditorClosed
(
event
:
IEditorCloseEvent
):
void
{
if
(
this
.
ignoreEditorCloseEvent
)
{
return
;
// blocked
}
const
{
editor
,
replaced
}
=
event
;
if
(
replaced
)
{
return
;
// ignore if editor was replaced
...
...
@@ -695,7 +700,17 @@ export class HistoryService extends Disposable implements IHistoryService {
const
restoredEditor
=
this
.
editorInputFactory
.
getEditorInputFactory
(
lastClosedEditor
.
serialized
.
typeId
)?.
deserialize
(
this
.
instantiationService
,
lastClosedEditor
.
serialized
.
value
);
let
editorPane
:
IEditorPane
|
undefined
=
undefined
;
if
(
restoredEditor
&&
!
this
.
editorGroupService
.
activeGroup
.
isOpened
(
restoredEditor
))
{
editorPane
=
await
this
.
editorService
.
openEditor
(
restoredEditor
,
options
);
// Fix for https://github.com/microsoft/vscode/issues/107850
// If opening an editor fails, it is possible that we get
// another editor-close event as a result. But we really do
// want to ignore that in our list of recently closed editors
// to prevent endless loops.
this
.
ignoreEditorCloseEvent
=
true
;
try
{
editorPane
=
await
this
.
editorService
.
openEditor
(
restoredEditor
,
options
);
}
finally
{
this
.
ignoreEditorCloseEvent
=
false
;
}
}
// If no editor was opened, try with the next one
...
...
@@ -705,6 +720,8 @@ export class HistoryService extends Disposable implements IHistoryService {
// but make sure to remove this one from the list to prevent
// endless loops.
remove
(
this
.
recentlyClosedEditors
,
lastClosedEditor
);
// Try with next one
this
.
reopenLastClosedEditor
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录