Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b8919d5c
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,发现更多精彩内容 >>
提交
b8919d5c
编写于
5月 11, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
grid - show errors after being restored (for #46765)
上级
3af29657
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
5 addition
and
3 deletion
+5
-3
src/vs/workbench/browser/parts/editor2/nextEditorGroupView.ts
...vs/workbench/browser/parts/editor2/nextEditorGroupView.ts
+5
-3
未找到文件。
src/vs/workbench/browser/parts/editor2/nextEditorGroupView.ts
浏览文件 @
b8919d5c
...
...
@@ -27,7 +27,6 @@ import { ProgressService } from 'vs/workbench/services/progress/browser/progress
import
{
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
localize
}
from
'
vs/nls
'
;
import
{
isPromiseCanceledError
,
isErrorWithActions
,
IErrorWithActions
}
from
'
vs/base/common/errors
'
;
import
{
IPartService
}
from
'
vs/workbench/services/part/common/partService
'
;
import
{
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
Severity
,
INotificationService
,
INotificationActions
}
from
'
vs/platform/notification/common/notification
'
;
import
{
toErrorMessage
}
from
'
vs/base/common/errorMessage
'
;
...
...
@@ -92,7 +91,9 @@ export class NextEditorGroupView extends Themable implements INextEditorGroupVie
private
active
:
boolean
;
private
dimension
:
Dimension
;
private
_whenRestored
:
Thenable
<
void
>
;
private
isRestored
:
boolean
;
private
scopedInstantiationService
:
IInstantiationService
;
...
...
@@ -113,7 +114,6 @@ export class NextEditorGroupView extends Themable implements INextEditorGroupVie
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
IContextKeyService
private
contextKeyService
:
IContextKeyService
,
@
IThemeService
themeService
:
IThemeService
,
@
IPartService
private
partService
:
IPartService
,
@
INotificationService
private
notificationService
:
INotificationService
,
@
ITelemetryService
private
telemetryService
:
ITelemetryService
,
@
IUntitledEditorService
private
untitledEditorService
:
IUntitledEditorService
,
...
...
@@ -134,7 +134,9 @@ export class NextEditorGroupView extends Themable implements INextEditorGroupVie
this
.
disposedEditorsWorker
=
this
.
_register
(
new
RunOnceWorker
(
editors
=>
this
.
handleDisposedEditors
(
editors
),
0
));
this
.
create
();
this
.
_whenRestored
=
this
.
restoreEditors
(
from
);
this
.
_whenRestored
.
then
(()
=>
this
.
isRestored
=
true
);
this
.
registerListeners
();
}
...
...
@@ -643,7 +645,7 @@ export class NextEditorGroupView extends Themable implements INextEditorGroupVie
// Report error only if this was not us restoring previous error state or
// we are told to ignore errors that occur from opening an editor
if
(
this
.
partService
.
isCreated
()
&&
!
isPromiseCanceledError
(
error
)
&&
!
this
.
ignoreOpenEditorErrors
)
{
if
(
this
.
isRestored
&&
!
isPromiseCanceledError
(
error
)
&&
!
this
.
ignoreOpenEditorErrors
)
{
const
actions
:
INotificationActions
=
{
primary
:
[]
};
if
(
isErrorWithActions
(
error
))
{
actions
.
primary
=
(
error
as
IErrorWithActions
).
actions
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录