Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
cc5c1030
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,发现更多精彩内容 >>
提交
cc5c1030
编写于
6月 08, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: adopt to new taskIdentifier
上级
deb7a38b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
11 deletion
+18
-11
src/vs/workbench/parts/debug/common/debug.ts
src/vs/workbench/parts/debug/common/debug.ts
+3
-2
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+7
-7
src/vs/workbench/parts/debug/node/debugger.ts
src/vs/workbench/parts/debug/node/debugger.ts
+8
-2
未找到文件。
src/vs/workbench/parts/debug/common/debug.ts
浏览文件 @
cc5c1030
...
...
@@ -23,6 +23,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IViewContainersRegistry
,
ViewContainer
,
Extensions
as
ViewContainerExtensions
}
from
'
vs/workbench/common/views
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
TaskIdentifier
}
from
'
vs/workbench/parts/tasks/common/tasks
'
;
export
const
VIEWLET_ID
=
'
workbench.view.debug
'
;
export
const
VIEW_CONTAINER
:
ViewContainer
=
Registry
.
as
<
IViewContainersRegistry
>
(
ViewContainerExtensions
.
ViewContainersRegistry
).
registerViewContainer
(
VIEWLET_ID
);
...
...
@@ -372,8 +373,8 @@ export interface IGlobalConfig {
export
interface
IEnvConfig
{
internalConsoleOptions
?:
'
neverOpen
'
|
'
openOnSessionStart
'
|
'
openOnFirstSessionStart
'
;
preLaunchTask
?:
string
;
postDebugTask
?:
string
;
preLaunchTask
?:
string
|
TaskIdentifier
;
postDebugTask
?:
string
|
TaskIdentifier
;
debugServer
?:
number
;
noDebug
?:
boolean
;
}
...
...
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
cc5c1030
...
...
@@ -47,7 +47,7 @@ import { EXTENSION_LOG_BROADCAST_CHANNEL, EXTENSION_ATTACH_BROADCAST_CHANNEL, EX
import
{
IBroadcastService
,
IBroadcast
}
from
'
vs/platform/broadcast/electron-browser/broadcastService
'
;
import
{
IRemoteConsoleLog
,
parse
,
getFirstFrame
}
from
'
vs/base/node/console
'
;
import
{
Source
}
from
'
vs/workbench/parts/debug/common/debugSource
'
;
import
{
TaskEvent
,
TaskEventKind
}
from
'
vs/workbench/parts/tasks/common/tasks
'
;
import
{
TaskEvent
,
TaskEventKind
,
TaskIdentifier
}
from
'
vs/workbench/parts/tasks/common/tasks
'
;
import
{
IDialogService
}
from
'
vs/platform/dialogs/common/dialogs
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
IAction
,
Action
}
from
'
vs/base/common/actions
'
;
...
...
@@ -1029,16 +1029,16 @@ export class DebugService implements debug.IDebugService {
});
}
private
runTask
(
sessionId
:
string
,
root
:
IWorkspaceFolder
,
task
Name
:
string
):
TPromise
<
ITaskSummary
>
{
if
(
!
task
Name
||
this
.
skipRunningTask
)
{
private
runTask
(
sessionId
:
string
,
root
:
IWorkspaceFolder
,
task
Id
:
string
|
TaskIdentifier
):
TPromise
<
ITaskSummary
>
{
if
(
!
task
Id
||
this
.
skipRunningTask
)
{
this
.
skipRunningTask
=
false
;
return
TPromise
.
as
(
null
);
}
// run a task before starting a debug session
return
this
.
taskService
.
getTask
(
root
,
taskName
).
then
(
task
=>
{
return
this
.
taskService
.
getTask
(
root
,
taskId
).
then
(
task
=>
{
const
taskDisplayName
=
typeof
taskId
===
'
string
'
?
`'
${
taskId
}
'`
:
nls
.
localize
(
'
specified
'
,
"
specified
"
);
if
(
!
task
)
{
return
TPromise
.
wrapError
(
errors
.
create
(
nls
.
localize
(
'
DebugTaskNotFound
'
,
"
Could not find the task
\
'{0}
\
'.
"
,
task
Name
)));
return
TPromise
.
wrapError
(
errors
.
create
(
nls
.
localize
(
'
DebugTaskNotFound
'
,
"
Could not find the task
{0}.
"
,
taskDisplay
Name
)));
}
function
once
(
kind
:
TaskEventKind
,
event
:
Event
<
TaskEvent
>
):
Event
<
TaskEvent
>
{
...
...
@@ -1082,7 +1082,7 @@ export class DebugService implements debug.IDebugService {
setTimeout
(()
=>
{
if
(
!
taskStarted
)
{
e
({
severity
:
severity
.
Error
,
message
:
nls
.
localize
(
'
taskNotTracked
'
,
"
The task
'{0}' cannot be tracked.
"
,
task
Name
)
});
e
({
severity
:
severity
.
Error
,
message
:
nls
.
localize
(
'
taskNotTracked
'
,
"
The task
{0} cannot be tracked.
"
,
taskDisplay
Name
)
});
}
},
10000
);
});
...
...
src/vs/workbench/parts/debug/node/debugger.ts
浏览文件 @
cc5c1030
...
...
@@ -22,6 +22,7 @@ import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService'
import
uri
from
'
vs/base/common/uri
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
memoize
}
from
'
vs/base/common/decorators
'
;
import
{
TaskDefinitionRegistry
}
from
'
vs/workbench/parts/tasks/common/taskDefinitionRegistry
'
;
export
class
Debugger
{
...
...
@@ -207,6 +208,7 @@ export class Debugger {
return
null
;
}
// fill in the default configuration attributes shared by all adapters.
const
taskSchema
=
TaskDefinitionRegistry
.
getJsonSchema
();
return
Object
.
keys
(
this
.
debuggerContribution
.
configurationAttributes
).
map
(
request
=>
{
const
attributes
:
IJSONSchema
=
this
.
debuggerContribution
.
configurationAttributes
[
request
];
const
defaultRequired
=
[
'
name
'
,
'
type
'
,
'
request
'
];
...
...
@@ -239,12 +241,16 @@ export class Debugger {
default
:
4711
};
properties
[
'
preLaunchTask
'
]
=
{
type
:
[
'
string
'
,
'
null
'
],
anyOf
:
[
taskSchema
,
{
type
:
[
'
string
'
,
'
null
'
],
}],
default
:
''
,
description
:
nls
.
localize
(
'
debugPrelaunchTask
'
,
"
Task to run before debug session starts.
"
)
};
properties
[
'
postDebugTask
'
]
=
{
type
:
[
'
string
'
,
'
null
'
],
anyOf
:
[
taskSchema
,
{
type
:
[
'
string
'
,
'
null
'
],
}],
default
:
''
,
description
:
nls
.
localize
(
'
debugPostDebugTask
'
,
"
Task to run after debug session ends.
"
)
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录