Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2e19abd3
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,发现更多精彩内容 >>
提交
2e19abd3
编写于
3月 12, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: better selection of launch
fixes #45580
上级
7d452a92
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
13 deletion
+28
-13
src/vs/workbench/parts/debug/browser/debugActions.ts
src/vs/workbench/parts/debug/browser/debugActions.ts
+21
-3
src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
...parts/debug/electron-browser/debugConfigurationManager.ts
+7
-10
未找到文件。
src/vs/workbench/parts/debug/browser/debugActions.ts
浏览文件 @
2e19abd3
...
...
@@ -7,7 +7,7 @@ import * as nls from 'vs/nls';
import
{
Action
}
from
'
vs/base/common/actions
'
;
import
*
as
lifecycle
from
'
vs/base/common/lifecycle
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
ICodeEditor
,
isCodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
...
...
@@ -23,6 +23,7 @@ import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
CollapseAction
}
from
'
vs/workbench/browser/viewlet
'
;
import
{
ITree
}
from
'
vs/base/parts/tree/browser/tree
'
;
import
{
first
}
from
'
vs/base/common/arrays
'
;
export
abstract
class
AbstractDebugAction
extends
Action
{
...
...
@@ -116,7 +117,8 @@ export class StartAction extends AbstractDebugAction {
constructor
(
id
:
string
,
label
:
string
,
@
IDebugService
debugService
:
IDebugService
,
@
IKeybindingService
keybindingService
:
IKeybindingService
,
@
IWorkspaceContextService
private
contextService
:
IWorkspaceContextService
@
IWorkspaceContextService
private
contextService
:
IWorkspaceContextService
,
@
IWorkbenchEditorService
private
editorService
:
IWorkbenchEditorService
)
{
super
(
id
,
label
,
'
debug-action start
'
,
debugService
,
keybindingService
);
...
...
@@ -126,7 +128,23 @@ export class StartAction extends AbstractDebugAction {
}
public
run
():
TPromise
<
any
>
{
const
launch
=
this
.
debugService
.
getConfigurationManager
().
selectedConfiguration
.
launch
;
const
configurationManager
=
this
.
debugService
.
getConfigurationManager
();
let
launch
=
configurationManager
.
selectedConfiguration
.
launch
;
if
(
!
launch
)
{
const
activeEditor
=
this
.
editorService
.
getActiveEditor
();
const
launches
=
configurationManager
.
getLaunches
();
if
(
isCodeEditor
(
activeEditor
))
{
const
resource
=
activeEditor
.
input
.
getResource
();
const
root
=
this
.
contextService
.
getWorkspaceFolder
(
resource
);
launch
=
configurationManager
.
getLaunch
(
root
.
uri
);
}
if
(
!
launch
)
{
launch
=
first
(
launches
,
l
=>
!!
l
.
getConfigurationNames
().
length
,
launches
.
length
?
launches
[
0
]
:
undefined
);
}
configurationManager
.
selectConfiguration
(
launch
);
}
return
this
.
debugService
.
startDebugging
(
launch
,
undefined
,
this
.
isNoDebug
());
}
...
...
src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
浏览文件 @
2e19abd3
...
...
@@ -8,7 +8,6 @@ import { dispose, IDisposable } from 'vs/base/common/lifecycle';
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
first
}
from
'
vs/base/common/arrays
'
;
import
{
isLinux
,
isMacintosh
,
isWindows
}
from
'
vs/base/common/platform
'
;
import
*
as
objects
from
'
vs/base/common/objects
'
;
import
uri
from
'
vs/base/common/uri
'
;
...
...
@@ -247,8 +246,10 @@ export class ConfigurationManager implements IConfigurationManager {
this
.
registerListeners
(
lifecycleService
);
this
.
initLaunches
();
const
previousSelectedRoot
=
this
.
storageService
.
get
(
DEBUG_SELECTED_ROOT
,
StorageScope
.
WORKSPACE
);
const
filtered
=
this
.
launches
.
filter
(
l
=>
l
.
uri
.
toString
()
===
previousSelectedRoot
);
this
.
selectConfiguration
(
filtered
.
length
?
filtered
[
0
]
:
undefined
,
this
.
storageService
.
get
(
DEBUG_SELECTED_CONFIG_NAME_KEY
,
StorageScope
.
WORKSPACE
));
const
previousSelectedLaunch
=
this
.
launches
.
filter
(
l
=>
l
.
uri
.
toString
()
===
previousSelectedRoot
).
pop
();
if
(
previousSelectedLaunch
)
{
this
.
selectConfiguration
(
previousSelectedLaunch
,
this
.
storageService
.
get
(
DEBUG_SELECTED_CONFIG_NAME_KEY
,
StorageScope
.
WORKSPACE
));
}
}
public
registerDebugConfigurationProvider
(
handle
:
number
,
debugConfigurationProvider
:
IDebugConfigurationProvider
):
void
{
...
...
@@ -347,12 +348,12 @@ export class ConfigurationManager implements IConfigurationManager {
this
.
toDispose
.
push
(
this
.
contextService
.
onDidChangeWorkspaceFolders
(()
=>
{
this
.
initLaunches
();
this
.
selectConfiguration
();
this
.
selectConfiguration
(
this
.
selectedLaunch
);
this
.
setCompoundSchemaValues
();
}));
this
.
toDispose
.
push
(
this
.
configurationService
.
onDidChangeConfiguration
(
e
=>
{
if
(
e
.
affectsConfiguration
(
'
launch
'
))
{
this
.
selectConfiguration
();
this
.
selectConfiguration
(
this
.
selectedLaunch
);
this
.
setCompoundSchemaValues
();
}
}));
...
...
@@ -416,14 +417,10 @@ export class ConfigurationManager implements IConfigurationManager {
return
undefined
;
}
public
selectConfiguration
(
launch
?:
ILaunch
,
name
?:
string
,
debugStarted
?:
boolean
):
void
{
public
selectConfiguration
(
launch
:
ILaunch
,
name
?:
string
):
void
{
const
previousLaunch
=
this
.
selectedLaunch
;
const
previousName
=
this
.
selectedName
;
if
(
!
launch
)
{
launch
=
this
.
selectedLaunch
&&
this
.
selectedLaunch
.
getConfigurationNames
().
length
?
this
.
selectedLaunch
:
first
(
this
.
launches
,
l
=>
!!
l
.
getConfigurationNames
().
length
,
this
.
launches
.
length
?
this
.
launches
[
0
]
:
undefined
);
}
this
.
selectedLaunch
=
launch
;
const
names
=
launch
?
launch
.
getConfigurationNames
()
:
[];
if
(
name
&&
names
.
indexOf
(
name
)
>=
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录