Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
3ecae531
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,发现更多精彩内容 >>
提交
3ecae531
编写于
1月 23, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes around mr compound debugging
上级
fb208416
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
8 deletion
+9
-8
src/vs/workbench/parts/debug/browser/debugActions.ts
src/vs/workbench/parts/debug/browser/debugActions.ts
+1
-1
src/vs/workbench/parts/debug/common/debugModel.ts
src/vs/workbench/parts/debug/common/debugModel.ts
+1
-1
src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
...s/workbench/parts/debug/electron-browser/debugCommands.ts
+2
-2
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+5
-4
未找到文件。
src/vs/workbench/parts/debug/browser/debugActions.ts
浏览文件 @
3ecae531
...
...
@@ -142,7 +142,7 @@ export class StartAction extends AbstractDebugAction {
if
(
contextService
&&
contextService
.
getWorkbenchState
()
===
WorkbenchState
.
EMPTY
&&
processes
.
length
>
0
)
{
return
false
;
}
if
(
processes
.
some
(
p
=>
p
.
getName
(
false
)
===
configName
&&
(
!
launch
||
p
.
session
.
root
.
uri
.
toString
()
===
launch
.
uri
.
toString
())))
{
if
(
processes
.
some
(
p
=>
p
.
getName
(
false
)
===
configName
&&
(
!
launch
||
!
launch
.
workspace
||
!
p
.
session
.
root
||
p
.
session
.
root
.
uri
.
toString
()
===
launch
.
workspace
.
uri
.
toString
())))
{
return
false
;
}
const
compound
=
launch
&&
launch
.
getCompound
(
configName
);
...
...
src/vs/workbench/parts/debug/common/debugModel.ts
浏览文件 @
3ecae531
...
...
@@ -545,7 +545,7 @@ export class Process implements IProcess {
}
public
getName
(
includeRoot
:
boolean
):
string
{
return
includeRoot
?
`
${
this
.
configuration
.
name
}
(
${
resources
.
basenameOrAuthority
(
this
.
session
.
root
.
uri
)}
)`
:
this
.
configuration
.
name
;
return
includeRoot
&&
this
.
session
.
root
?
`
${
this
.
configuration
.
name
}
(
${
resources
.
basenameOrAuthority
(
this
.
session
.
root
.
uri
)}
)`
:
this
.
configuration
.
name
;
}
public
get
state
():
ProcessState
{
...
...
src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
浏览文件 @
3ecae531
...
...
@@ -163,13 +163,13 @@ export function registerCommands(): void {
weight
:
KeybindingsRegistry
.
WEIGHT
.
workbenchContrib
(),
when
:
undefined
,
primary
:
undefined
,
handler
:
(
accessor
,
workspace
Uri
:
string
)
=>
{
handler
:
(
accessor
,
launch
Uri
:
string
)
=>
{
const
manager
=
accessor
.
get
(
IDebugService
).
getConfigurationManager
();
if
(
accessor
.
get
(
IWorkspaceContextService
).
getWorkbenchState
()
===
WorkbenchState
.
EMPTY
)
{
accessor
.
get
(
IMessageService
).
show
(
severity
.
Info
,
nls
.
localize
(
'
noFolderDebugConfig
'
,
"
Please first open a folder in order to do advanced debug configuration.
"
));
return
TPromise
.
as
(
null
);
}
const
launch
=
manager
.
getLaunches
().
filter
(
l
=>
l
.
uri
.
toString
()
===
workspace
Uri
).
pop
()
||
manager
.
selectedLaunch
;
const
launch
=
manager
.
getLaunches
().
filter
(
l
=>
l
.
uri
.
toString
()
===
launch
Uri
).
pop
()
||
manager
.
selectedLaunch
;
return
launch
.
openConfigFile
(
false
).
done
(
editor
=>
{
if
(
editor
)
{
...
...
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
3ecae531
...
...
@@ -53,6 +53,7 @@ import { IBroadcastService, IBroadcast } from 'vs/platform/broadcast/electron-br
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
{
sequence
}
from
'
vs/base/common/async
'
;
const
DEBUG_BREAKPOINTS_KEY
=
'
debug.breakpoint
'
;
const
DEBUG_BREAKPOINTS_ACTIVATED_KEY
=
'
debug.breakpointactivated
'
;
...
...
@@ -668,7 +669,7 @@ export class DebugService implements debug.IDebugService {
this
.
model
.
getBreakpoints
().
forEach
(
bp
=>
bp
.
verified
=
false
);
}
this
.
launchJsonChanged
=
false
;
const
launch
=
root
?
this
.
configurationManager
.
getLaunches
().
filter
(
l
=>
l
.
uri
.
toString
()
===
root
.
uri
.
toString
()).
pop
()
const
launch
=
root
?
this
.
configurationManager
.
getLaunches
().
filter
(
l
=>
l
.
workspace
&&
l
.
workspace
.
uri
.
toString
()
===
root
.
uri
.
toString
()).
pop
()
:
this
.
configurationManager
.
getWorkspaceLaunch
();
let
config
:
debug
.
IConfig
,
compound
:
debug
.
ICompound
;
...
...
@@ -692,7 +693,7 @@ export class DebugService implements debug.IDebugService {
"
Compound must have
\"
configurations
\"
attribute set in order to start multiple configurations.
"
)));
}
return
TPromise
.
join
(
compound
.
configurations
.
map
(
name
=>
{
return
sequence
(
compound
.
configurations
.
map
(
name
=>
()
=>
{
if
(
name
===
compound
.
name
)
{
return
TPromise
.
as
(
null
);
}
...
...
@@ -738,7 +739,7 @@ export class DebugService implements debug.IDebugService {
return
(
type
?
TPromise
.
as
(
null
)
:
this
.
configurationManager
.
guessAdapter
().
then
(
a
=>
type
=
a
&&
a
.
type
)).
then
(()
=>
(
type
?
this
.
extensionService
.
activateByEvent
(
`onDebugResolve:
${
type
}
`
)
:
TPromise
.
as
(
null
)).
then
(()
=>
this
.
configurationManager
.
resolveConfigurationByProviders
(
launch
?
launch
.
uri
:
undefined
,
type
,
config
).
then
(
config
=>
{
this
.
configurationManager
.
resolveConfigurationByProviders
(
launch
&&
launch
.
workspace
?
launch
.
workspace
.
uri
:
undefined
,
type
,
config
).
then
(
config
=>
{
// a falsy config indicates an aborted launch
if
(
config
&&
config
.
type
)
{
return
this
.
createProcess
(
root
,
config
,
sessionId
);
...
...
@@ -1035,7 +1036,7 @@ export class DebugService implements debug.IDebugService {
const
preserveFocus
=
focusedProcess
&&
process
.
getId
()
===
focusedProcess
.
getId
();
return
process
.
session
.
disconnect
(
true
).
then
(()
=>
{
if
(
strings
.
equalsIgnoreCase
(
process
.
configuration
.
type
,
'
extensionHost
'
))
{
if
(
strings
.
equalsIgnoreCase
(
process
.
configuration
.
type
,
'
extensionHost
'
)
&&
process
.
session
.
root
)
{
return
this
.
broadcastService
.
broadcast
({
channel
:
EXTENSION_RELOAD_BROADCAST_CHANNEL
,
payload
:
[
process
.
session
.
root
.
uri
.
fsPath
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录