Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f0bfe7ce
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,发现更多精彩内容 >>
提交
f0bfe7ce
编写于
10月 02, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
always restore grid, even on error (for #59752)
上级
219b9461
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
27 addition
and
6 deletion
+27
-6
src/vs/workbench/browser/parts/editor/editorPart.ts
src/vs/workbench/browser/parts/editor/editorPart.ts
+27
-6
未找到文件。
src/vs/workbench/browser/parts/editor/editorPart.ts
浏览文件 @
f0bfe7ce
...
@@ -33,6 +33,7 @@ import { localize } from 'vs/nls';
...
@@ -33,6 +33,7 @@ import { localize } from 'vs/nls';
import
{
Color
}
from
'
vs/base/common/color
'
;
import
{
Color
}
from
'
vs/base/common/color
'
;
import
{
CenteredViewLayout
}
from
'
vs/base/browser/ui/centered/centeredViewLayout
'
;
import
{
CenteredViewLayout
}
from
'
vs/base/browser/ui/centered/centeredViewLayout
'
;
import
{
IView
,
orthogonal
}
from
'
vs/base/browser/ui/grid/gridview
'
;
import
{
IView
,
orthogonal
}
from
'
vs/base/browser/ui/grid/gridview
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
interface
IEditorPartUIState
{
interface
IEditorPartUIState
{
serializedGrid
:
ISerializedGrid
;
serializedGrid
:
ISerializedGrid
;
...
@@ -821,18 +822,38 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
...
@@ -821,18 +822,38 @@ export class EditorPart extends Part implements EditorGroupsServiceImpl, IEditor
private
doCreateGridControlWithPreviousState
():
void
{
private
doCreateGridControlWithPreviousState
():
void
{
const
uiState
=
this
.
memento
[
EditorPart
.
EDITOR_PART_UI_STATE_STORAGE_KEY
]
as
IEditorPartUIState
;
const
uiState
=
this
.
memento
[
EditorPart
.
EDITOR_PART_UI_STATE_STORAGE_KEY
]
as
IEditorPartUIState
;
if
(
uiState
&&
uiState
.
serializedGrid
)
{
if
(
uiState
&&
uiState
.
serializedGrid
)
{
try
{
// MRU
// MRU
this
.
mostRecentActiveGroups
=
uiState
.
mostRecentActiveGroups
;
this
.
mostRecentActiveGroups
=
uiState
.
mostRecentActiveGroups
;
// Grid Widget
// Grid Widget
this
.
doCreateGridControlWithState
(
uiState
.
serializedGrid
,
uiState
.
activeGroup
);
this
.
doCreateGridControlWithState
(
uiState
.
serializedGrid
,
uiState
.
activeGroup
);
// Ensure last active group has focus
// Ensure last active group has focus
this
.
_activeGroup
.
focus
();
this
.
_activeGroup
.
focus
();
}
catch
(
error
)
{
this
.
handleGridRestoreError
(
error
);
}
}
}
}
}
private
handleGridRestoreError
(
error
:
Error
):
void
{
// Log error
onUnexpectedError
(
error
);
// Clear any state we have from the failing restore
if
(
this
.
gridWidget
)
{
this
.
doSetGridWidget
();
}
this
.
groupViews
.
forEach
(
group
=>
group
.
dispose
());
this
.
groupViews
.
clear
();
this
.
_activeGroup
=
void
0
;
this
.
mostRecentActiveGroups
=
[];
}
private
doCreateGridControlWithState
(
serializedGrid
:
ISerializedGrid
,
activeGroupId
:
GroupIdentifier
,
editorGroupViewsToReuse
?:
IEditorGroupView
[]):
void
{
private
doCreateGridControlWithState
(
serializedGrid
:
ISerializedGrid
,
activeGroupId
:
GroupIdentifier
,
editorGroupViewsToReuse
?:
IEditorGroupView
[]):
void
{
// Determine group views to reuse if any
// Determine group views to reuse if any
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录