Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b57a00bd
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b57a00bd
编写于
7月 02, 2019
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: Handle disposable result of createAndFillInActionBarActions
#76419
上级
f91bd186
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
5 deletion
+26
-5
src/vs/workbench/contrib/debug/browser/debugToolBar.ts
src/vs/workbench/contrib/debug/browser/debugToolBar.ts
+17
-4
src/vs/workbench/contrib/debug/browser/debugViewlet.ts
src/vs/workbench/contrib/debug/browser/debugViewlet.ts
+9
-1
未找到文件。
src/vs/workbench/contrib/debug/browser/debugToolBar.ts
浏览文件 @
b57a00bd
...
...
@@ -31,6 +31,7 @@ import { createAndFillInActionBarActions, MenuEntryActionViewItem } from 'vs/pla
import
{
IMenu
,
IMenuService
,
MenuId
,
MenuItemAction
}
from
'
vs/platform/actions/common/actions
'
;
import
{
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
FocusSessionAction
}
from
'
vs/workbench/contrib/debug/browser/debugActions
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
const
DEBUG_TOOLBAR_POSITION_KEY
=
'
debug.actionswidgetposition
'
;
const
DEBUG_TOOLBAR_Y_KEY
=
'
debug.actionswidgety
'
;
...
...
@@ -54,6 +55,7 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
private
activeActions
:
IAction
[];
private
updateScheduler
:
RunOnceScheduler
;
private
debugToolBarMenu
:
IMenu
;
private
disposeOnUpdate
:
IDisposable
;
private
isVisible
:
boolean
;
private
isBuilt
:
boolean
;
...
...
@@ -105,12 +107,17 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
return
this
.
hide
();
}
const
actions
=
DebugToolBar
.
getActions
(
this
.
debugToolBarMenu
,
this
.
debugService
,
this
.
instantiationService
);
const
{
actions
,
disposable
}
=
DebugToolBar
.
getActions
(
this
.
debugToolBarMenu
,
this
.
debugService
,
this
.
instantiationService
);
if
(
!
arrays
.
equals
(
actions
,
this
.
activeActions
,
(
first
,
second
)
=>
first
.
id
===
second
.
id
))
{
this
.
actionBar
.
clear
();
this
.
actionBar
.
push
(
actions
,
{
icon
:
true
,
label
:
false
});
this
.
activeActions
=
actions
;
}
if
(
this
.
disposeOnUpdate
)
{
dispose
(
this
.
disposeOnUpdate
);
}
this
.
disposeOnUpdate
=
disposable
;
this
.
show
();
},
20
));
...
...
@@ -257,14 +264,17 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
dom
.
hide
(
this
.
$el
);
}
public
static
getActions
(
menu
:
IMenu
,
debugService
:
IDebugService
,
instantiationService
:
IInstantiationService
):
IAction
[]
{
public
static
getActions
(
menu
:
IMenu
,
debugService
:
IDebugService
,
instantiationService
:
IInstantiationService
):
{
actions
:
IAction
[],
disposable
:
IDisposable
}
{
const
actions
:
IAction
[]
=
[];
createAndFillInActionBarActions
(
menu
,
undefined
,
actions
,
()
=>
false
);
c
onst
disposable
=
c
reateAndFillInActionBarActions
(
menu
,
undefined
,
actions
,
()
=>
false
);
if
(
debugService
.
getViewModel
().
isMultiSessionView
())
{
actions
.
push
(
instantiationService
.
createInstance
(
FocusSessionAction
,
FocusSessionAction
.
ID
,
FocusSessionAction
.
LABEL
));
}
return
actions
.
filter
(
a
=>
!
(
a
instanceof
Separator
));
// do not render separators for now
return
{
actions
:
actions
.
filter
(
a
=>
!
(
a
instanceof
Separator
)),
// do not render separators for now
disposable
};
}
public
dispose
():
void
{
...
...
@@ -274,5 +284,8 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
this
.
$el
.
remove
();
delete
this
.
$el
;
}
if
(
this
.
disposeOnUpdate
)
{
dispose
(
this
.
disposeOnUpdate
);
}
}
}
src/vs/workbench/contrib/debug/browser/debugViewlet.ts
浏览文件 @
b57a00bd
...
...
@@ -41,6 +41,7 @@ export class DebugViewlet extends ViewContainerViewlet {
private
breakpointView
:
ViewletPanel
;
private
panelListeners
=
new
Map
<
string
,
IDisposable
>
();
private
debugToolBarMenu
:
IMenu
;
private
disposeOnTitleUpdate
:
IDisposable
;
constructor
(
@
IWorkbenchLayoutService
layoutService
:
IWorkbenchLayoutService
,
...
...
@@ -114,7 +115,14 @@ export class DebugViewlet extends ViewContainerViewlet {
this
.
debugToolBarMenu
=
this
.
menuService
.
createMenu
(
MenuId
.
DebugToolBar
,
this
.
contextKeyService
);
this
.
_register
(
this
.
debugToolBarMenu
);
}
return
DebugToolBar
.
getActions
(
this
.
debugToolBarMenu
,
this
.
debugService
,
this
.
instantiationService
);
const
{
actions
,
disposable
}
=
DebugToolBar
.
getActions
(
this
.
debugToolBarMenu
,
this
.
debugService
,
this
.
instantiationService
);
if
(
this
.
disposeOnTitleUpdate
)
{
dispose
(
this
.
disposeOnTitleUpdate
);
}
this
.
disposeOnTitleUpdate
=
disposable
;
return
actions
;
}
get
showInitialDebugActions
():
boolean
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录