Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7400c5a5
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,发现更多精彩内容 >>
提交
7400c5a5
编写于
2月 25, 2016
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: better updating of labels for actions
fixes #3386
上级
8c24bc7d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
17 deletion
+17
-17
src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
...kbench/parts/debug/electron-browser/debug.contribution.ts
+1
-1
src/vs/workbench/parts/debug/electron-browser/debugActions.ts
...vs/workbench/parts/debug/electron-browser/debugActions.ts
+16
-16
未找到文件。
src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
浏览文件 @
7400c5a5
...
...
@@ -96,7 +96,7 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
dbgactions
.
StepOverDebugAction
,
dbgactions
.
StepOverDebugAction
.
ID
,
dbgactions
.
StepOverDebugAction
.
LABEL
,
{
primary
:
KeyCode
.
F10
},
KbExpr
.
has
(
debug
.
CONTEXT_IN_DEBUG_MODE
)),
debugCategory
);
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
dbgactions
.
StepIntoDebugAction
,
dbgactions
.
StepIntoDebugAction
.
ID
,
dbgactions
.
StepIntoDebugAction
.
LABEL
,
{
primary
:
KeyCode
.
F11
},
KbExpr
.
has
(
debug
.
CONTEXT_IN_DEBUG_MODE
),
KeybindingsRegistry
.
WEIGHT
.
workbenchContrib
(
1
)),
debugCategory
);
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
dbgactions
.
StepOutDebugAction
,
dbgactions
.
StepOutDebugAction
.
ID
,
dbgactions
.
StepOutDebugAction
.
LABEL
,
{
primary
:
KeyMod
.
Shift
|
KeyCode
.
F11
},
KbExpr
.
has
(
debug
.
CONTEXT_IN_DEBUG_MODE
)),
debugCategory
);
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
dbgactions
.
RestartDebugAction
,
dbgactions
.
RestartDebugAction
.
ID
,
dbgactions
.
RestartDebugAction
.
LABEL
),
debugCategory
);
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
dbgactions
.
RestartDebugAction
,
dbgactions
.
RestartDebugAction
.
ID
,
dbgactions
.
RestartDebugAction
.
LABEL
,
{
primary
:
KeyMod
.
Shift
|
KeyMod
.
CtrlCmd
|
KeyCode
.
F5
},
KbExpr
.
has
(
debug
.
CONTEXT_IN_DEBUG_MODE
)
),
debugCategory
);
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
dbgactions
.
StopDebugAction
,
dbgactions
.
StopDebugAction
.
ID
,
dbgactions
.
StopDebugAction
.
LABEL
,
{
primary
:
KeyMod
.
Shift
|
KeyCode
.
F5
},
KbExpr
.
has
(
debug
.
CONTEXT_IN_DEBUG_MODE
)),
debugCategory
);
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
dbgactions
.
ContinueAction
,
dbgactions
.
ContinueAction
.
ID
,
dbgactions
.
ContinueAction
.
LABEL
,
{
primary
:
KeyCode
.
F5
},
KbExpr
.
has
(
debug
.
CONTEXT_IN_DEBUG_MODE
)),
debugCategory
);
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
dbgactions
.
PauseAction
,
dbgactions
.
PauseAction
.
ID
,
dbgactions
.
PauseAction
.
LABEL
),
debugCategory
);
...
...
src/vs/workbench/parts/debug/electron-browser/debugActions.ts
浏览文件 @
7400c5a5
...
...
@@ -29,6 +29,7 @@ export class AbstractDebugAction extends actions.Action {
protected
debugService
:
IDebugService
;
private
keybindingService
:
IKeybindingService
;
protected
toDispose
:
lifecycle
.
IDisposable
[];
private
keybinding
:
string
;
constructor
(
id
:
string
,
label
:
string
,
cssClass
:
string
,
@
IDebugService
debugService
:
IDebugService
,
@
IKeybindingService
keybindingService
:
IKeybindingService
)
{
super
(
id
,
label
,
cssClass
,
false
);
...
...
@@ -37,18 +38,12 @@ export class AbstractDebugAction extends actions.Action {
this
.
toDispose
=
[];
this
.
toDispose
.
push
(
this
.
debugService
.
addListener2
(
debug
.
ServiceEvents
.
STATE_CHANGED
,
()
=>
this
.
updateEnablement
()));
let
keybinding
:
string
=
null
;
const
keys
=
this
.
keybindingService
.
lookupKeybindings
(
id
).
map
(
k
=>
this
.
keybindingService
.
getLabelFor
(
k
));
if
(
keys
&&
keys
.
length
)
{
keybinding
=
keys
[
0
];
}
if
(
keybinding
)
{
this
.
label
=
nls
.
localize
(
'
debugActionLabelAndKeybinding
'
,
"
{0} ({1})
"
,
label
,
keybinding
);
}
else
{
this
.
label
=
label
;
this
.
keybinding
=
keys
[
0
];
}
this
.
updateLabel
(
label
);
this
.
updateEnablement
();
}
...
...
@@ -56,6 +51,14 @@ export class AbstractDebugAction extends actions.Action {
throw
new
Error
(
'
implement me
'
);
}
protected
updateLabel
(
newLabel
:
string
):
void
{
if
(
this
.
keybinding
)
{
this
.
label
=
nls
.
localize
(
'
debugActionLabelAndKeybinding
'
,
"
{0} ({1})
"
,
newLabel
,
this
.
keybinding
);
}
else
{
this
.
label
=
newLabel
;
}
}
protected
updateEnablement
():
void
{
this
.
enabled
=
this
.
isEnabled
();
}
...
...
@@ -132,7 +135,7 @@ export class RestartDebugAction extends AbstractDebugAction {
this
.
toDispose
.
push
(
this
.
debugService
.
addListener2
(
debug
.
ServiceEvents
.
STATE_CHANGED
,
()
=>
{
const
session
=
this
.
debugService
.
getActiveSession
();
if
(
session
)
{
this
.
label
=
session
.
isAttach
?
RestartDebugAction
.
RECONNECT_LABEL
:
RestartDebugAction
.
LABEL
;
this
.
updateLabel
(
session
.
isAttach
?
RestartDebugAction
.
RECONNECT_LABEL
:
RestartDebugAction
.
LABEL
)
;
}
}));
}
...
...
@@ -207,7 +210,7 @@ export class StopDebugAction extends AbstractDebugAction {
this
.
toDispose
.
push
(
this
.
debugService
.
addListener2
(
debug
.
ServiceEvents
.
STATE_CHANGED
,
()
=>
{
const
session
=
this
.
debugService
.
getActiveSession
();
if
(
session
)
{
this
.
label
=
session
.
isAttach
?
StopDebugAction
.
DISCONNECT_LABEL
:
StopDebugAction
.
LABEL
;
this
.
updateLabel
(
session
.
isAttach
?
StopDebugAction
.
DISCONNECT_LABEL
:
StopDebugAction
.
LABEL
)
;
}
}));
}
...
...
@@ -347,16 +350,13 @@ export class ToggleBreakpointsActivatedAction extends AbstractDebugAction {
constructor
(
id
:
string
,
label
:
string
,
@
IDebugService
debugService
:
IDebugService
,
@
IKeybindingService
keybindingService
:
IKeybindingService
)
{
super
(
id
,
label
,
'
debug-action breakpoints-activate
'
,
debugService
,
keybindingService
);
this
.
updateLabel
();
this
.
updateLabel
(
this
.
debugService
.
getModel
().
areBreakpointsActivated
()
?
ToggleBreakpointsActivatedAction
.
DEACTIVATE_LABEL
:
ToggleBreakpointsActivatedAction
.
ACTIVATE_LABEL
);
this
.
toDispose
.
push
(
this
.
debugService
.
getModel
().
addListener2
(
debug
.
ModelEvents
.
BREAKPOINTS_UPDATED
,
()
=>
{
this
.
updateLabel
();
this
.
updateLabel
(
this
.
debugService
.
getModel
().
areBreakpointsActivated
()
?
ToggleBreakpointsActivatedAction
.
DEACTIVATE_LABEL
:
ToggleBreakpointsActivatedAction
.
ACTIVATE_LABEL
);
}));
}
private
updateLabel
():
void
{
this
.
label
=
this
.
debugService
.
getModel
().
areBreakpointsActivated
()
?
ToggleBreakpointsActivatedAction
.
DEACTIVATE_LABEL
:
ToggleBreakpointsActivatedAction
.
ACTIVATE_LABEL
;
}
public
run
():
TPromise
<
any
>
{
return
this
.
debugService
.
toggleBreakpointsActivated
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录