Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5a5c2a8d
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,发现更多精彩内容 >>
提交
5a5c2a8d
编写于
2月 13, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: some cleanup around getting launches
上级
98101e1a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
4 deletion
+14
-4
src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
.../workbench/api/electron-browser/mainThreadDebugService.ts
+2
-2
src/vs/workbench/parts/debug/browser/debugActionItems.ts
src/vs/workbench/parts/debug/browser/debugActionItems.ts
+1
-1
src/vs/workbench/parts/debug/common/debug.ts
src/vs/workbench/parts/debug/common/debug.ts
+2
-0
src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
...parts/debug/electron-browser/debugConfigurationManager.ts
+8
-0
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+1
-1
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
浏览文件 @
5a5c2a8d
...
...
@@ -177,8 +177,8 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
}
public
$startDebugging
(
_folderUri
:
uri
|
undefined
,
nameOrConfiguration
:
string
|
IConfig
):
TPromise
<
boolean
>
{
const
folderUri
String
=
_folderUri
?
uri
.
revive
(
_folderUri
).
toString
(
)
:
undefined
;
const
launch
=
folderUriString
?
this
.
debugService
.
getConfigurationManager
().
getLaunches
().
filter
(
l
=>
l
.
workspace
&&
l
.
workspace
.
uri
.
toString
()
===
folderUriString
).
pop
()
:
undefined
;
const
folderUri
=
_folderUri
?
uri
.
revive
(
_folderUri
)
:
undefined
;
const
launch
=
this
.
debugService
.
getConfigurationManager
().
getLaunch
(
folderUri
)
;
return
this
.
debugService
.
startDebugging
(
launch
,
nameOrConfiguration
).
then
(
x
=>
{
return
true
;
},
err
=>
{
...
...
src/vs/workbench/parts/debug/browser/debugActionItems.ts
浏览文件 @
5a5c2a8d
...
...
@@ -156,7 +156,7 @@ export class StartDebugActionItem implements IActionItem {
const
manager
=
this
.
debugService
.
getConfigurationManager
();
const
launches
=
manager
.
getLaunches
();
const
inWorkspace
=
this
.
contextService
.
getWorkbenchState
()
===
WorkbenchState
.
WORKSPACE
;
manager
.
getLaunches
()
.
forEach
(
launch
=>
launches
.
forEach
(
launch
=>
launch
.
getConfigurationNames
().
forEach
(
name
=>
{
if
(
name
===
manager
.
selectedConfiguration
.
name
&&
launch
===
manager
.
selectedConfiguration
.
launch
)
{
this
.
selected
=
this
.
options
.
length
;
...
...
src/vs/workbench/parts/debug/common/debug.ts
浏览文件 @
5a5c2a8d
...
...
@@ -429,6 +429,8 @@ export interface IConfigurationManager {
getLaunches
():
ILaunch
[];
getLaunch
(
workspaceUri
:
uri
):
ILaunch
|
undefined
;
/**
* Allows to register on change of selected debug configuration.
*/
...
...
src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
浏览文件 @
5a5c2a8d
...
...
@@ -390,6 +390,14 @@ export class ConfigurationManager implements IConfigurationManager {
return
this
.
launches
;
}
public
getLaunch
(
workspaceUri
:
uri
):
ILaunch
{
if
(
!
uri
.
isUri
(
workspaceUri
))
{
return
undefined
;
}
return
this
.
launches
.
filter
(
l
=>
l
.
workspace
&&
l
.
workspace
.
uri
.
toString
()
===
workspaceUri
.
toString
()).
pop
();
}
public
get
selectedConfiguration
():
{
launch
:
ILaunch
,
name
:
string
}
{
return
{
launch
:
this
.
selectedLaunch
,
...
...
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
5a5c2a8d
...
...
@@ -1061,7 +1061,7 @@ export class DebugService implements debug.IDebugService {
// Read the configuration again if a launch.json has been changed, if not just use the inmemory configuration
let
config
=
process
.
configuration
;
const
launch
=
this
.
configurationManager
.
getLaunches
().
filter
(
l
=>
l
.
workspace
&&
process
.
session
.
root
&&
l
.
workspace
.
uri
.
toString
()
===
process
.
session
.
root
.
uri
.
toString
()).
pop
()
;
const
launch
=
process
.
session
.
root
?
this
.
configurationManager
.
getLaunch
(
process
.
session
.
root
.
uri
)
:
undefined
;
if
(
this
.
launchJsonChanged
&&
launch
)
{
this
.
launchJsonChanged
=
false
;
config
=
launch
.
getConfiguration
(
process
.
configuration
.
name
)
||
config
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录