Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
d0202cc1
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,发现更多精彩内容 >>
提交
d0202cc1
编写于
9月 07, 2017
作者:
A
Andre Weinand
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
do not break existing debug extensions
上级
338de08a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
50 addition
and
38 deletion
+50
-38
src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
.../workbench/api/electron-browser/mainThreadDebugService.ts
+2
-2
src/vs/workbench/parts/debug/common/debug.ts
src/vs/workbench/parts/debug/common/debug.ts
+3
-3
src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
...parts/debug/electron-browser/debugConfigurationManager.ts
+7
-3
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+38
-30
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
浏览文件 @
d0202cc1
...
...
@@ -50,12 +50,12 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
type
:
debugType
};
if
(
hasProvide
)
{
provider
.
provideDebugConfigurations
=
(
folder
:
URI
|
undefined
)
=>
{
provider
.
provideDebugConfigurations
=
folder
=>
{
return
this
.
_proxy
.
$provideDebugConfigurations
(
handle
,
folder
);
};
}
if
(
hasResolve
)
{
provider
.
resolveDebugConfiguration
=
(
folder
:
URI
|
undefined
,
debugConfiguration
:
any
)
=>
{
provider
.
resolveDebugConfiguration
=
(
folder
,
debugConfiguration
)
=>
{
return
this
.
_proxy
.
$resolveDebugConfiguration
(
handle
,
folder
,
debugConfiguration
);
};
}
...
...
src/vs/workbench/parts/debug/common/debug.ts
浏览文件 @
d0202cc1
...
...
@@ -375,8 +375,8 @@ export interface IRawAdapter extends IRawEnvAdapter {
export
interface
IDebugConfigurationProvider
{
type
:
string
;
resolveDebugConfiguration
?(
folderUri
:
uri
|
undefined
,
debugConfiguration
:
any
):
TPromise
<
any
>
;
provideDebugConfigurations
?(
folderUri
:
uri
|
undefined
):
TPromise
<
any
[]
>
;
resolveDebugConfiguration
?(
folderUri
:
uri
|
undefined
,
debugConfiguration
:
IConfig
):
TPromise
<
IConfig
>
;
provideDebugConfigurations
?(
folderUri
:
uri
|
undefined
):
TPromise
<
IConfig
[]
>
;
}
export
interface
IConfigurationManager
{
...
...
@@ -410,7 +410,7 @@ export interface IConfigurationManager {
registerDebugConfigurationProvider
(
handle
:
number
,
debugConfigurationProvider
:
IDebugConfigurationProvider
):
void
;
unregisterDebugConfigurationProvider
(
handle
:
number
):
void
;
resolveDebugConfiguration
(
folderUri
:
uri
|
undefined
,
debugConfiguration
:
any
):
TPromise
<
any
>
;
resolveDebugConfiguration
(
folderUri
:
uri
|
undefined
,
type
:
string
|
undefined
,
debugConfiguration
:
any
):
TPromise
<
any
>
;
}
export
interface
ILaunch
{
...
...
src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
浏览文件 @
d0202cc1
...
...
@@ -259,12 +259,12 @@ export class ConfigurationManager implements IConfigurationManager {
return
this
.
_providers
.
delete
(
handle
);
}
public
resolveDebugConfiguration
(
folderUri
:
uri
|
undefined
,
debugConfiguration
:
IConfig
):
TPromise
<
IConfig
>
{
public
resolveDebugConfiguration
(
folderUri
:
uri
|
undefined
,
type
:
string
|
undefined
,
debugConfiguration
:
IConfig
):
TPromise
<
IConfig
>
{
// collect all candidates
const
providers
:
IDebugConfigurationProvider
[]
=
[];
this
.
_providers
.
forEach
(
provider
=>
{
if
(
provider
.
type
===
debugConfiguration
.
type
&&
provider
.
resolveDebugConfiguration
)
{
if
(
provider
.
type
===
type
&&
provider
.
resolveDebugConfiguration
)
{
providers
.
push
(
provider
);
}
});
...
...
@@ -272,7 +272,11 @@ export class ConfigurationManager implements IConfigurationManager {
// pipe the config through the promises sequentially
return
providers
.
reduce
((
promise
,
provider
)
=>
{
return
promise
.
then
(
config
=>
{
return
provider
.
resolveDebugConfiguration
(
folderUri
,
config
);
if
(
config
)
{
return
provider
.
resolveDebugConfiguration
(
folderUri
,
config
);
}
else
{
return
Promise
.
resolve
(
config
);
}
});
},
TPromise
.
as
(
debugConfiguration
));
}
...
...
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
d0202cc1
...
...
@@ -639,47 +639,55 @@ export class DebugService implements debug.IDebugService {
return
manager
.
getStartSessionCommand
(
config
?
config
.
type
:
undefined
).
then
<
any
>
(
commandAndType
=>
{
if
(
!
config
)
{
// no-folder workspace
// We keep the debug type in a separate variable 'type' so that a no-folder config has no attributes.
// Storing the type in the config would break extensions that assume that the no-folder case is indicated by an empty config.
let
type
:
string
;
if
(
config
)
{
type
=
config
.
type
;
}
else
{
// a no-folder workspace has no launch.config
config
=
<
debug
.
IConfig
>
{};
if
(
commandAndType
&&
commandAndType
.
type
)
{
config
.
type
=
commandAndType
.
type
;
}
}
if
(
!
type
&&
commandAndType
&&
commandAndType
.
type
)
{
type
=
commandAndType
.
type
;
}
if
(
noDebug
)
{
config
.
noDebug
=
true
;
}
return
this
.
configurationManager
.
resolveDebugConfiguration
(
launch
?
launch
.
workspaceUri
:
undefined
,
config
).
then
(
config
=>
{
// deprecated code: use DebugConfigurationProvider instead of startSessionCommand
if
(
commandAndType
&&
commandAndType
.
command
)
{
const
defaultConfig
=
noDebug
?
{
noDebug
:
true
}
:
{};
return
this
.
commandService
.
executeCommand
(
commandAndType
.
command
,
config
||
defaultConfig
,
launch
?
launch
.
workspaceUri
:
undefined
).
then
((
result
:
StartSessionResult
)
=>
{
if
(
launch
)
{
if
(
result
&&
result
.
status
===
'
initialConfiguration
'
)
{
return
launch
.
openConfigFile
(
false
,
commandAndType
.
type
);
}
return
this
.
configurationManager
.
resolveDebugConfiguration
(
launch
?
launch
.
workspaceUri
:
undefined
,
type
,
config
).
then
(
config
=>
{
if
(
result
&&
result
.
status
===
'
saveConfiguration
'
)
{
return
this
.
fileService
.
updateContent
(
launch
.
uri
,
result
.
content
).
then
(()
=>
launch
.
openConfigFile
(
false
));
}
}
return
<
TPromise
>
undefined
;
});
}
// end of deprecation
// a falsy config indicates an aborted launch
if
(
config
)
{
if
(
config
.
type
)
{
// TODO@AW: handle the 'initialConfiguration' and 'saveConfiguration' cases from above!
return
this
.
createProcess
(
root
,
config
);
}
// deprecated code: use DebugConfigurationProvider instead of startSessionCommand
if
(
commandAndType
&&
commandAndType
.
command
)
{
return
this
.
commandService
.
executeCommand
(
commandAndType
.
command
,
config
,
launch
?
launch
.
workspaceUri
:
undefined
).
then
((
result
:
StartSessionResult
)
=>
{
if
(
launch
)
{
if
(
result
&&
result
.
status
===
'
initialConfiguration
'
)
{
return
launch
.
openConfigFile
(
false
,
commandAndType
.
type
);
}
if
(
launch
&&
commandAndType
)
{
return
launch
.
openConfigFile
(
false
,
commandAndType
.
type
);
if
(
result
&&
result
.
status
===
'
saveConfiguration
'
)
{
return
this
.
fileService
.
updateContent
(
launch
.
uri
,
result
.
content
).
then
(()
=>
launch
.
openConfigFile
(
false
));
}
}
return
<
TPromise
>
undefined
;
});
}
// end of deprecation
if
(
config
.
type
)
{
return
this
.
createProcess
(
root
,
config
);
}
if
(
launch
&&
commandAndType
)
{
return
launch
.
openConfigFile
(
false
,
commandAndType
.
type
);
}
}
return
undefined
;
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录