Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
旅途_2012
vscode
提交
9bb443d1
V
vscode
项目概览
旅途_2012
/
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,发现更多精彩内容 >>
提交
9bb443d1
编写于
3月 22, 2019
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "debugToolbar -> debugToolBar"
This reverts commit
e7ca7d58
.
上级
73fc9662
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
31 addition
and
32 deletion
+31
-32
src/vs/platform/actions/common/actions.ts
src/vs/platform/actions/common/actions.ts
+1
-1
src/vs/workbench/api/common/menusExtensionPoint.ts
src/vs/workbench/api/common/menusExtensionPoint.ts
+3
-4
src/vs/workbench/contrib/debug/browser/debugToolbar.ts
src/vs/workbench/contrib/debug/browser/debugToolbar.ts
+6
-6
src/vs/workbench/contrib/debug/browser/debugViewlet.ts
src/vs/workbench/contrib/debug/browser/debugViewlet.ts
+6
-6
src/vs/workbench/contrib/debug/electron-browser/debug.contribution.ts
...ench/contrib/debug/electron-browser/debug.contribution.ts
+14
-14
src/vs/workbench/test/electron-browser/colorRegistry.releaseTest.ts
...kbench/test/electron-browser/colorRegistry.releaseTest.ts
+1
-1
未找到文件。
src/vs/platform/actions/common/actions.ts
浏览文件 @
9bb443d1
...
...
@@ -65,7 +65,7 @@ export const enum MenuId {
DebugConsoleContext
,
DebugVariablesContext
,
DebugWatchContext
,
DebugTool
B
ar
,
DebugTool
b
ar
,
EditorContext
,
EditorTitle
,
EditorTitleContext
,
...
...
src/vs/workbench/api/common/menusExtensionPoint.ts
浏览文件 @
9bb443d1
...
...
@@ -34,8 +34,7 @@ namespace schema {
case
'
explorer/context
'
:
return
MenuId
.
ExplorerContext
;
case
'
editor/title/context
'
:
return
MenuId
.
EditorTitleContext
;
case
'
debug/callstack/context
'
:
return
MenuId
.
DebugCallStackContext
;
case
'
debug/toolbar
'
:
return
MenuId
.
DebugToolBar
;
case
'
debug/toolBar
'
:
return
MenuId
.
DebugToolBar
;
case
'
debug/toolbar
'
:
return
MenuId
.
DebugToolbar
;
case
'
menuBar/file
'
:
return
MenuId
.
MenubarFileMenu
;
case
'
scm/title
'
:
return
MenuId
.
SCMTitle
;
case
'
scm/sourceControl
'
:
return
MenuId
.
SCMSourceControl
;
...
...
@@ -139,8 +138,8 @@ namespace schema {
type
:
'
array
'
,
items
:
menuItem
},
'
debug/tool
B
ar
'
:
{
description
:
localize
(
'
menus.debugTool
B
ar
'
,
"
The debug toolbar menu
"
),
'
debug/tool
b
ar
'
:
{
description
:
localize
(
'
menus.debugTool
b
ar
'
,
"
The debug toolbar menu
"
),
type
:
'
array
'
,
items
:
menuItem
},
...
...
src/vs/workbench/contrib/debug/browser/debugTool
B
ar.ts
→
src/vs/workbench/contrib/debug/browser/debugTool
b
ar.ts
浏览文件 @
9bb443d1
...
...
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
'
vs/css!./media/debugTool
B
ar
'
;
import
'
vs/css!./media/debugTool
b
ar
'
;
import
*
as
errors
from
'
vs/base/common/errors
'
;
import
*
as
browser
from
'
vs/base/browser/browser
'
;
import
*
as
dom
from
'
vs/base/browser/dom
'
;
...
...
@@ -46,14 +46,14 @@ export const debugToolBarBorder = registerColor('debugToolBar.border', {
hc
:
null
},
localize
(
'
debugToolBarBorder
'
,
"
Debug toolbar border color.
"
));
export
class
DebugTool
B
ar
extends
Themable
implements
IWorkbenchContribution
{
export
class
DebugTool
b
ar
extends
Themable
implements
IWorkbenchContribution
{
private
$el
:
HTMLElement
;
private
dragArea
:
HTMLElement
;
private
actionBar
:
ActionBar
;
private
activeActions
:
IAction
[];
private
updateScheduler
:
RunOnceScheduler
;
private
debugTool
B
arMenu
:
IMenu
;
private
debugTool
b
arMenu
:
IMenu
;
private
isVisible
:
boolean
;
private
isBuilt
:
boolean
;
...
...
@@ -81,8 +81,8 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
this
.
dragArea
=
dom
.
append
(
this
.
$el
,
dom
.
$
(
'
div.drag-area
'
));
const
actionBarContainer
=
dom
.
append
(
this
.
$el
,
dom
.
$
(
'
div.action-bar-container
'
));
this
.
debugTool
BarMenu
=
menuService
.
createMenu
(
MenuId
.
DebugToolB
ar
,
contextKeyService
);
this
.
toDispose
.
push
(
this
.
debugTool
B
arMenu
);
this
.
debugTool
barMenu
=
menuService
.
createMenu
(
MenuId
.
DebugToolb
ar
,
contextKeyService
);
this
.
toDispose
.
push
(
this
.
debugTool
b
arMenu
);
this
.
activeActions
=
[];
this
.
actionBar
=
this
.
_register
(
new
ActionBar
(
actionBarContainer
,
{
...
...
@@ -106,7 +106,7 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
return
this
.
hide
();
}
const
actions
=
DebugTool
Bar
.
getActions
(
this
.
debugToolB
arMenu
,
this
.
debugService
,
this
.
instantiationService
);
const
actions
=
DebugTool
bar
.
getActions
(
this
.
debugToolb
arMenu
,
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
});
...
...
src/vs/workbench/contrib/debug/browser/debugViewlet.ts
浏览文件 @
9bb443d1
...
...
@@ -24,7 +24,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import
{
IWorkbenchLayoutService
}
from
'
vs/workbench/services/layout/browser/layoutService
'
;
import
{
memoize
}
from
'
vs/base/common/decorators
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
DebugTool
Bar
}
from
'
vs/workbench/contrib/debug/browser/debugToolB
ar
'
;
import
{
DebugTool
bar
}
from
'
vs/workbench/contrib/debug/browser/debugToolb
ar
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
ViewletPanel
}
from
'
vs/workbench/browser/parts/views/panelViewlet
'
;
import
{
IMenu
,
MenuId
,
IMenuService
,
MenuItemAction
}
from
'
vs/platform/actions/common/actions
'
;
...
...
@@ -40,7 +40,7 @@ export class DebugViewlet extends ViewContainerViewlet {
private
progressRunner
:
IProgressRunner
;
private
breakpointView
:
ViewletPanel
;
private
panelListeners
=
new
Map
<
string
,
IDisposable
>
();
private
debugTool
B
arMenu
:
IMenu
;
private
debugTool
b
arMenu
:
IMenu
;
constructor
(
@
IWorkbenchLayoutService
layoutService
:
IWorkbenchLayoutService
,
...
...
@@ -110,11 +110,11 @@ export class DebugViewlet extends ViewContainerViewlet {
return
[
this
.
startAction
,
this
.
configureAction
,
this
.
toggleReplAction
];
}
if
(
!
this
.
debugTool
B
arMenu
)
{
this
.
debugTool
BarMenu
=
this
.
menuService
.
createMenu
(
MenuId
.
DebugToolB
ar
,
this
.
contextKeyService
);
this
.
toDispose
.
push
(
this
.
debugTool
B
arMenu
);
if
(
!
this
.
debugTool
b
arMenu
)
{
this
.
debugTool
barMenu
=
this
.
menuService
.
createMenu
(
MenuId
.
DebugToolb
ar
,
this
.
contextKeyService
);
this
.
toDispose
.
push
(
this
.
debugTool
b
arMenu
);
}
return
DebugTool
Bar
.
getActions
(
this
.
debugToolB
arMenu
,
this
.
debugService
,
this
.
instantiationService
);
return
DebugTool
bar
.
getActions
(
this
.
debugToolb
arMenu
,
this
.
debugService
,
this
.
instantiationService
);
}
get
showInitialDebugActions
():
boolean
{
...
...
src/vs/workbench/contrib/debug/electron-browser/debug.contribution.ts
浏览文件 @
9bb443d1
...
...
@@ -28,7 +28,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la
import
{
IPanelService
}
from
'
vs/workbench/services/panel/common/panelService
'
;
import
{
DebugEditorModelManager
}
from
'
vs/workbench/contrib/debug/browser/debugEditorModelManager
'
;
import
{
StartAction
,
AddFunctionBreakpointAction
,
ConfigureAction
,
DisableAllBreakpointsAction
,
EnableAllBreakpointsAction
,
RemoveAllBreakpointsAction
,
RunAction
,
ReapplyBreakpointsAction
,
SelectAndStartAction
}
from
'
vs/workbench/contrib/debug/browser/debugActions
'
;
import
{
DebugTool
Bar
}
from
'
vs/workbench/contrib/debug/browser/debugToolB
ar
'
;
import
{
DebugTool
bar
}
from
'
vs/workbench/contrib/debug/browser/debugToolb
ar
'
;
import
*
as
service
from
'
vs/workbench/contrib/debug/electron-browser/debugService
'
;
import
{
IViewletService
}
from
'
vs/workbench/services/viewlet/browser/viewlet
'
;
import
{
registerCommands
,
ADD_CONFIGURATION_ID
,
TOGGLE_INLINE_BREAKPOINT_ID
,
COPY_STACK_TRACE_ID
,
REVERSE_CONTINUE_ID
,
STEP_BACK_ID
,
RESTART_SESSION_ID
,
TERMINATE_THREAD_ID
,
STEP_OVER_ID
,
STEP_INTO_ID
,
STEP_OUT_ID
,
PAUSE_ID
,
DISCONNECT_ID
,
STOP_ID
,
RESTART_FRAME_ID
,
CONTINUE_ID
,
FOCUS_REPL_ID
}
from
'
vs/workbench/contrib/debug/browser/debugCommands
'
;
...
...
@@ -123,7 +123,7 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(OpenDebugPanelAction,
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
OpenDebugViewletAction
,
OpenDebugViewletAction
.
ID
,
OpenDebugViewletAction
.
LABEL
,
openViewletKb
),
'
View: Show Debug
'
,
nls
.
localize
(
'
view
'
,
"
View
"
));
Registry
.
as
<
IWorkbenchContributionsRegistry
>
(
WorkbenchExtensions
.
Workbench
).
registerWorkbenchContribution
(
DebugEditorModelManager
,
LifecyclePhase
.
Restored
);
Registry
.
as
<
IWorkbenchContributionsRegistry
>
(
WorkbenchExtensions
.
Workbench
).
registerWorkbenchContribution
(
DebugTool
B
ar
,
LifecyclePhase
.
Restored
);
Registry
.
as
<
IWorkbenchContributionsRegistry
>
(
WorkbenchExtensions
.
Workbench
).
registerWorkbenchContribution
(
DebugTool
b
ar
,
LifecyclePhase
.
Restored
);
Registry
.
as
<
IWorkbenchContributionsRegistry
>
(
WorkbenchExtensions
.
Workbench
).
registerWorkbenchContribution
(
DebugContentProvider
,
LifecyclePhase
.
Eventually
);
Registry
.
as
<
IWorkbenchContributionsRegistry
>
(
WorkbenchExtensions
.
Workbench
).
registerWorkbenchContribution
(
StatusBarColorProvider
,
LifecyclePhase
.
Eventually
);
...
...
@@ -258,8 +258,8 @@ statusBar.registerStatusbarItem(new StatusbarItemDescriptor(DebugStatus, Statusb
// Debug toolbar
const
registerDebugTool
B
arItem
=
(
id
:
string
,
title
:
string
,
icon
:
string
,
order
:
number
,
when
?:
ContextKeyExpr
,
precondition
?:
ContextKeyExpr
)
=>
{
MenuRegistry
.
appendMenuItem
(
MenuId
.
DebugTool
B
ar
,
{
const
registerDebugTool
b
arItem
=
(
id
:
string
,
title
:
string
,
icon
:
string
,
order
:
number
,
when
?:
ContextKeyExpr
,
precondition
?:
ContextKeyExpr
)
=>
{
MenuRegistry
.
appendMenuItem
(
MenuId
.
DebugTool
b
ar
,
{
group
:
'
navigation
'
,
when
,
order
,
...
...
@@ -275,16 +275,16 @@ const registerDebugToolBarItem = (id: string, title: string, icon: string, order
});
};
registerDebugTool
B
arItem
(
CONTINUE_ID
,
continueLabel
,
'
continue
'
,
10
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
registerDebugTool
B
arItem
(
PAUSE_ID
,
pauseLabel
,
'
pause
'
,
10
,
CONTEXT_DEBUG_STATE
.
notEqualsTo
(
'
stopped
'
),
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
running
'
));
registerDebugTool
B
arItem
(
STOP_ID
,
stopLabel
,
'
stop
'
,
70
,
CONTEXT_FOCUSED_SESSION_IS_ATTACH
.
toNegated
());
registerDebugTool
B
arItem
(
DISCONNECT_ID
,
disconnectLabel
,
'
disconnect
'
,
70
,
CONTEXT_FOCUSED_SESSION_IS_ATTACH
);
registerDebugTool
B
arItem
(
STEP_OVER_ID
,
stepOverLabel
,
'
step-over
'
,
20
,
undefined
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
registerDebugTool
B
arItem
(
STEP_INTO_ID
,
stepIntoLabel
,
'
step-into
'
,
30
,
undefined
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
registerDebugTool
B
arItem
(
STEP_OUT_ID
,
stepOutLabel
,
'
step-out
'
,
40
,
undefined
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
registerDebugTool
B
arItem
(
RESTART_SESSION_ID
,
restartLabel
,
'
restart
'
,
60
);
registerDebugTool
B
arItem
(
STEP_BACK_ID
,
nls
.
localize
(
'
stepBackDebug
'
,
"
Step Back
"
),
'
step-back
'
,
50
,
CONTEXT_STEP_BACK_SUPPORTED
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
registerDebugTool
B
arItem
(
REVERSE_CONTINUE_ID
,
nls
.
localize
(
'
reverseContinue
'
,
"
Reverse
"
),
'
reverse-continue
'
,
60
,
CONTEXT_STEP_BACK_SUPPORTED
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
registerDebugTool
b
arItem
(
CONTINUE_ID
,
continueLabel
,
'
continue
'
,
10
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
registerDebugTool
b
arItem
(
PAUSE_ID
,
pauseLabel
,
'
pause
'
,
10
,
CONTEXT_DEBUG_STATE
.
notEqualsTo
(
'
stopped
'
),
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
running
'
));
registerDebugTool
b
arItem
(
STOP_ID
,
stopLabel
,
'
stop
'
,
70
,
CONTEXT_FOCUSED_SESSION_IS_ATTACH
.
toNegated
());
registerDebugTool
b
arItem
(
DISCONNECT_ID
,
disconnectLabel
,
'
disconnect
'
,
70
,
CONTEXT_FOCUSED_SESSION_IS_ATTACH
);
registerDebugTool
b
arItem
(
STEP_OVER_ID
,
stepOverLabel
,
'
step-over
'
,
20
,
undefined
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
registerDebugTool
b
arItem
(
STEP_INTO_ID
,
stepIntoLabel
,
'
step-into
'
,
30
,
undefined
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
registerDebugTool
b
arItem
(
STEP_OUT_ID
,
stepOutLabel
,
'
step-out
'
,
40
,
undefined
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
registerDebugTool
b
arItem
(
RESTART_SESSION_ID
,
restartLabel
,
'
restart
'
,
60
);
registerDebugTool
b
arItem
(
STEP_BACK_ID
,
nls
.
localize
(
'
stepBackDebug
'
,
"
Step Back
"
),
'
step-back
'
,
50
,
CONTEXT_STEP_BACK_SUPPORTED
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
registerDebugTool
b
arItem
(
REVERSE_CONTINUE_ID
,
nls
.
localize
(
'
reverseContinue
'
,
"
Reverse
"
),
'
reverse-continue
'
,
60
,
CONTEXT_STEP_BACK_SUPPORTED
,
CONTEXT_DEBUG_STATE
.
isEqualTo
(
'
stopped
'
));
// Debug callstack context menu
const
registerDebugCallstackItem
=
(
id
:
string
,
title
:
string
,
order
:
number
,
when
?:
ContextKeyExpr
,
precondition
?:
ContextKeyExpr
,
group
=
'
navigation
'
)
=>
{
...
...
src/vs/workbench/test/electron-browser/colorRegistry.releaseTest.ts
浏览文件 @
9bb443d1
...
...
@@ -9,7 +9,7 @@ import { editorMarkerNavigationError } from 'vs/editor/contrib/gotoError/gotoErr
import
{
overviewRulerModifiedForeground
}
from
'
vs/workbench/contrib/scm/browser/dirtydiffDecorator
'
;
import
{
STATUS_BAR_DEBUGGING_BACKGROUND
}
from
'
vs/workbench/contrib/debug/browser/statusbarColorProvider
'
;
import
{
debugExceptionWidgetBackground
}
from
'
vs/workbench/contrib/debug/browser/exceptionWidget
'
;
import
{
debugToolBarBackground
}
from
'
vs/workbench/contrib/debug/browser/debugTool
B
ar
'
;
import
{
debugToolBarBackground
}
from
'
vs/workbench/contrib/debug/browser/debugTool
b
ar
'
;
import
{
buttonBackground
}
from
'
vs/workbench/contrib/welcome/page/browser/welcomePage
'
;
import
{
embeddedEditorBackground
}
from
'
vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart
'
;
import
{
request
,
asText
}
from
'
vs/base/node/request
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录