Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3eafb202
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 搜索 >>
提交
3eafb202
编写于
8月 31, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
close all extensions when going away from viewlet
fixes #10202
上级
08100c8b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
14 deletion
+28
-14
src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
...ench/parts/extensions/electron-browser/extensionEditor.ts
+1
-12
src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
...ch/parts/extensions/electron-browser/extensionsViewlet.ts
+27
-2
未找到文件。
src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
浏览文件 @
3eafb202
...
...
@@ -14,14 +14,13 @@ import * as arrays from 'vs/base/common/arrays';
import
Event
,
{
Emitter
,
once
,
fromEventEmitter
,
filterEvent
,
mapEvent
}
from
'
vs/base/common/event
'
;
import
Cache
from
'
vs/base/common/cache
'
;
import
{
Action
}
from
'
vs/base/common/actions
'
;
import
{
isPromiseCanceledError
,
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
{
isPromiseCanceledError
}
from
'
vs/base/common/errors
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
{
IDisposable
,
empty
,
dispose
,
toDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
Builder
}
from
'
vs/base/browser/builder
'
;
import
{
domEvent
}
from
'
vs/base/browser/event
'
;
import
{
append
,
$
,
addClass
,
removeClass
,
finalHandler
,
join
}
from
'
vs/base/browser/dom
'
;
import
{
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
IViewlet
}
from
'
vs/workbench/common/viewlet
'
;
import
{
IViewletService
}
from
'
vs/workbench/services/viewlet/common/viewletService
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
...
...
@@ -149,8 +148,6 @@ export class ExtensionEditor extends BaseEditor {
this
.
disposables
=
[];
this
.
extensionReadme
=
null
;
this
.
extensionManifest
=
null
;
this
.
disposables
.
push
(
viewletService
.
onDidViewletOpen
(
this
.
onViewletOpen
,
this
,
this
.
disposables
));
}
createEditor
(
parent
:
Builder
):
void
{
...
...
@@ -549,14 +546,6 @@ export class ExtensionEditor extends BaseEditor {
this
.
layoutParticipants
.
forEach
(
p
=>
p
.
layout
());
}
private
onViewletOpen
(
viewlet
:
IViewlet
):
void
{
if
(
!
viewlet
||
viewlet
.
getId
()
===
VIEWLET_ID
)
{
return
;
}
this
.
editorService
.
closeEditor
(
this
.
position
,
this
.
input
).
done
(
null
,
onUnexpectedError
);
}
private
onError
(
err
:
any
):
void
{
if
(
isPromiseCanceledError
(
err
))
{
return
;
...
...
src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
浏览文件 @
3eafb202
...
...
@@ -9,7 +9,7 @@ import 'vs/css!./media/extensionsViewlet';
import
{
localize
}
from
'
vs/nls
'
;
import
{
ThrottledDelayer
,
always
}
from
'
vs/base/common/async
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
isPromiseCanceledError
,
create
as
createError
}
from
'
vs/base/common/errors
'
;
import
{
isPromiseCanceledError
,
onUnexpectedError
,
create
as
createError
}
from
'
vs/base/common/errors
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
Builder
,
Dimension
}
from
'
vs/base/browser/builder
'
;
import
{
assign
}
from
'
vs/base/common/objects
'
;
...
...
@@ -20,6 +20,8 @@ import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
import
{
StandardKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
Viewlet
}
from
'
vs/workbench/browser/viewlet
'
;
import
{
IViewlet
}
from
'
vs/workbench/common/viewlet
'
;
import
{
IViewletService
}
from
'
vs/workbench/services/viewlet/common/viewletService
'
;
import
{
append
,
$
,
addStandardDisposableListener
,
EventType
,
addClass
,
removeClass
,
toggleClass
}
from
'
vs/base/browser/dom
'
;
import
{
PagedModel
}
from
'
vs/base/common/paging
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
...
...
@@ -34,6 +36,7 @@ import { Query } from '../common/extensionQuery';
import
{
OpenGlobalSettingsAction
}
from
'
vs/workbench/browser/actions/openSettings
'
;
import
{
IProgressService
}
from
'
vs/platform/progress/common/progress
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
import
{
IMessageService
,
CloseAction
}
from
'
vs/platform/message/common/message
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
{
IURLService
}
from
'
vs/platform/url/common/url
'
;
...
...
@@ -63,16 +66,20 @@ export class ExtensionsViewlet extends Viewlet implements IExtensionsViewlet {
@
IProgressService
private
progressService
:
IProgressService
,
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
IWorkbenchEditorService
private
editorService
:
IWorkbenchEditorService
,
@
IEditorGroupService
private
editorInputService
:
IEditorGroupService
,
@
IExtensionsWorkbenchService
private
extensionsWorkbenchService
:
IExtensionsWorkbenchService
,
@
IURLService
urlService
:
IURLService
,
@
IExtensionTipsService
private
tipsService
:
IExtensionTipsService
,
@
IMessageService
private
messageService
:
IMessageService
@
IMessageService
private
messageService
:
IMessageService
,
@
IViewletService
private
viewletService
:
IViewletService
)
{
super
(
VIEWLET_ID
,
telemetryService
);
this
.
searchDelayer
=
new
ThrottledDelayer
(
500
);
const
onOpenExtensionUrl
=
filterEvent
(
urlService
.
onOpenURL
,
uri
=>
/^extension/
.
test
(
uri
.
path
));
onOpenExtensionUrl
(
this
.
onOpenExtensionUrl
,
this
,
this
.
disposables
);
this
.
disposables
.
push
(
viewletService
.
onDidViewletOpen
(
this
.
onViewletOpen
,
this
,
this
.
disposables
));
}
create
(
parent
:
Builder
):
TPromise
<
void
>
{
...
...
@@ -309,6 +316,24 @@ export class ExtensionsViewlet extends Viewlet implements IExtensionsViewlet {
return
always
(
promise
,
()
=>
progressRunner
.
done
());
}
private
onViewletOpen
(
viewlet
:
IViewlet
):
void
{
if
(
!
viewlet
||
viewlet
.
getId
()
===
VIEWLET_ID
)
{
return
;
}
const
model
=
this
.
editorInputService
.
getStacksModel
();
const
promises
=
model
.
groups
.
map
(
group
=>
{
const
position
=
model
.
positionOfGroup
(
group
);
const
inputs
=
group
.
getEditors
().
filter
(
input
=>
input
instanceof
ExtensionsInput
);
const
promises
=
inputs
.
map
(
input
=>
this
.
editorService
.
closeEditor
(
position
,
input
));
return
TPromise
.
join
(
promises
);
});
TPromise
.
join
(
promises
).
done
(
null
,
onUnexpectedError
);
}
private
onError
(
err
:
any
):
void
{
if
(
isPromiseCanceledError
(
err
))
{
return
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录