Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
33e6f45d
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,发现更多精彩内容 >>
提交
33e6f45d
编写于
11月 10, 2016
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: rename setFocusedStackFrameAndEvaluate -> focusStackFrameAndEvaluate
上级
63e2c090
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
10 addition
and
10 deletion
+10
-10
src/vs/workbench/parts/debug/browser/debugActions.ts
src/vs/workbench/parts/debug/browser/debugActions.ts
+1
-1
src/vs/workbench/parts/debug/common/debug.ts
src/vs/workbench/parts/debug/common/debug.ts
+1
-1
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+6
-6
src/vs/workbench/parts/debug/electron-browser/debugViewer.ts
src/vs/workbench/parts/debug/electron-browser/debugViewer.ts
+1
-1
src/vs/workbench/parts/debug/test/common/mockDebug.ts
src/vs/workbench/parts/debug/test/common/mockDebug.ts
+1
-1
未找到文件。
src/vs/workbench/parts/debug/browser/debugActions.ts
浏览文件 @
33e6f45d
...
@@ -735,6 +735,6 @@ export class FocusProcessAction extends AbstractDebugAction {
...
@@ -735,6 +735,6 @@ export class FocusProcessAction extends AbstractDebugAction {
public
run
(
processName
:
string
):
TPromise
<
any
>
{
public
run
(
processName
:
string
):
TPromise
<
any
>
{
const
process
=
this
.
debugService
.
getModel
().
getProcesses
().
filter
(
p
=>
p
.
name
===
processName
).
pop
();
const
process
=
this
.
debugService
.
getModel
().
getProcesses
().
filter
(
p
=>
p
.
name
===
processName
).
pop
();
return
this
.
debugService
.
setFocused
StackFrameAndEvaluate
(
null
,
process
);
return
this
.
debugService
.
focus
StackFrameAndEvaluate
(
null
,
process
);
}
}
}
}
src/vs/workbench/parts/debug/common/debug.ts
浏览文件 @
33e6f45d
...
@@ -372,7 +372,7 @@ export interface IDebugService {
...
@@ -372,7 +372,7 @@ export interface IDebugService {
/**
/**
* Sets the focused stack frame and evaluates all expresions against the newly focused stack frame,
* Sets the focused stack frame and evaluates all expresions against the newly focused stack frame,
*/
*/
setFocused
StackFrameAndEvaluate
(
focusedStackFrame
:
IStackFrame
,
process
?:
IProcess
):
TPromise
<
void
>
;
focus
StackFrameAndEvaluate
(
focusedStackFrame
:
IStackFrame
,
process
?:
IProcess
):
TPromise
<
void
>
;
/**
/**
* Adds new breakpoints to the model for the file specified with the uri. Notifies debug adapter of breakpoint changes.
* Adds new breakpoints to the model for the file specified with the uri. Notifies debug adapter of breakpoint changes.
...
...
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
33e6f45d
...
@@ -280,13 +280,13 @@ export class DebugService implements debug.IDebugService {
...
@@ -280,13 +280,13 @@ export class DebugService implements debug.IDebugService {
if
(
callStack
.
length
>
0
)
{
if
(
callStack
.
length
>
0
)
{
// focus first stack frame from top that has source location
// focus first stack frame from top that has source location
const
stackFrameToFocus
=
first
(
callStack
,
sf
=>
sf
.
source
&&
sf
.
source
.
available
,
callStack
[
0
]);
const
stackFrameToFocus
=
first
(
callStack
,
sf
=>
sf
.
source
&&
sf
.
source
.
available
,
callStack
[
0
]);
this
.
setFocused
StackFrameAndEvaluate
(
stackFrameToFocus
).
done
(
null
,
errors
.
onUnexpectedError
);
this
.
focus
StackFrameAndEvaluate
(
stackFrameToFocus
).
done
(
null
,
errors
.
onUnexpectedError
);
this
.
windowService
.
getWindow
().
focus
();
this
.
windowService
.
getWindow
().
focus
();
aria
.
alert
(
nls
.
localize
(
'
debuggingPaused
'
,
"
Debugging paused, reason {0}, {1} {2}
"
,
event
.
body
.
reason
,
stackFrameToFocus
.
source
?
stackFrameToFocus
.
source
.
name
:
''
,
stackFrameToFocus
.
lineNumber
));
aria
.
alert
(
nls
.
localize
(
'
debuggingPaused
'
,
"
Debugging paused, reason {0}, {1} {2}
"
,
event
.
body
.
reason
,
stackFrameToFocus
.
source
?
stackFrameToFocus
.
source
.
name
:
''
,
stackFrameToFocus
.
lineNumber
));
return
this
.
openOrRevealSource
(
stackFrameToFocus
.
source
,
stackFrameToFocus
.
lineNumber
,
false
,
false
);
return
this
.
openOrRevealSource
(
stackFrameToFocus
.
source
,
stackFrameToFocus
.
lineNumber
,
false
,
false
);
}
else
{
}
else
{
this
.
setFocused
StackFrameAndEvaluate
(
null
).
done
(
null
,
errors
.
onUnexpectedError
);
this
.
focus
StackFrameAndEvaluate
(
null
).
done
(
null
,
errors
.
onUnexpectedError
);
}
}
});
});
}
}
...
@@ -445,7 +445,7 @@ export class DebugService implements debug.IDebugService {
...
@@ -445,7 +445,7 @@ export class DebugService implements debug.IDebugService {
return
!!
this
.
contextService
.
getWorkspace
();
return
!!
this
.
contextService
.
getWorkspace
();
}
}
public
setFocused
StackFrameAndEvaluate
(
focusedStackFrame
:
debug
.
IStackFrame
,
process
?:
debug
.
IProcess
):
TPromise
<
void
>
{
public
focus
StackFrameAndEvaluate
(
focusedStackFrame
:
debug
.
IStackFrame
,
process
?:
debug
.
IProcess
):
TPromise
<
void
>
{
const
processes
=
this
.
model
.
getProcesses
();
const
processes
=
this
.
model
.
getProcesses
();
if
(
!
process
)
{
if
(
!
process
)
{
process
=
focusedStackFrame
?
focusedStackFrame
.
thread
.
process
:
processes
.
length
?
processes
[
0
]
:
null
;
process
=
focusedStackFrame
?
focusedStackFrame
.
thread
.
process
:
processes
.
length
?
processes
[
0
]
:
null
;
...
@@ -512,7 +512,7 @@ export class DebugService implements debug.IDebugService {
...
@@ -512,7 +512,7 @@ export class DebugService implements debug.IDebugService {
this
.
telemetryService
.
publicLog
(
'
debugService/addReplExpression
'
);
this
.
telemetryService
.
publicLog
(
'
debugService/addReplExpression
'
);
return
this
.
model
.
addReplExpression
(
this
.
viewModel
.
focusedProcess
,
this
.
viewModel
.
focusedStackFrame
,
name
)
return
this
.
model
.
addReplExpression
(
this
.
viewModel
.
focusedProcess
,
this
.
viewModel
.
focusedStackFrame
,
name
)
// Evaluate all watch expressions again since repl evaluation might have changed some.
// Evaluate all watch expressions again since repl evaluation might have changed some.
.
then
(()
=>
this
.
setFocused
StackFrameAndEvaluate
(
this
.
viewModel
.
focusedStackFrame
));
.
then
(()
=>
this
.
focus
StackFrameAndEvaluate
(
this
.
viewModel
.
focusedStackFrame
));
}
}
public
logToRepl
(
value
:
string
|
{
[
key
:
string
]:
any
},
severity
?:
severity
):
void
{
public
logToRepl
(
value
:
string
|
{
[
key
:
string
]:
any
},
severity
?:
severity
):
void
{
...
@@ -802,7 +802,7 @@ export class DebugService implements debug.IDebugService {
...
@@ -802,7 +802,7 @@ export class DebugService implements debug.IDebugService {
}
}
this
.
model
.
removeProcess
(
session
.
getId
());
this
.
model
.
removeProcess
(
session
.
getId
());
this
.
setFocused
StackFrameAndEvaluate
(
null
).
done
(
null
,
errors
.
onUnexpectedError
);
this
.
focus
StackFrameAndEvaluate
(
null
).
done
(
null
,
errors
.
onUnexpectedError
);
this
.
setStateAndEmit
(
session
.
getId
(),
debug
.
State
.
Inactive
);
this
.
setStateAndEmit
(
session
.
getId
(),
debug
.
State
.
Inactive
);
if
(
this
.
model
.
getProcesses
().
length
===
0
)
{
if
(
this
.
model
.
getProcesses
().
length
===
0
)
{
...
@@ -906,7 +906,7 @@ export class DebugService implements debug.IDebugService {
...
@@ -906,7 +906,7 @@ export class DebugService implements debug.IDebugService {
private
transitionToRunningState
(
session
:
RawDebugSession
,
threadId
?:
number
):
void
{
private
transitionToRunningState
(
session
:
RawDebugSession
,
threadId
?:
number
):
void
{
this
.
model
.
clearThreads
(
session
.
getId
(),
false
,
threadId
);
this
.
model
.
clearThreads
(
session
.
getId
(),
false
,
threadId
);
this
.
setStateAndEmit
(
session
.
getId
(),
session
.
requestType
===
debug
.
SessionRequestType
.
LAUNCH_NO_DEBUG
?
debug
.
State
.
RunningNoDebug
:
debug
.
State
.
Running
);
this
.
setStateAndEmit
(
session
.
getId
(),
session
.
requestType
===
debug
.
SessionRequestType
.
LAUNCH_NO_DEBUG
?
debug
.
State
.
RunningNoDebug
:
debug
.
State
.
Running
);
this
.
setFocused
StackFrameAndEvaluate
(
null
).
done
(
null
,
errors
.
onUnexpectedError
);
this
.
focus
StackFrameAndEvaluate
(
null
).
done
(
null
,
errors
.
onUnexpectedError
);
}
}
private
getDebugStringEditorInput
(
process
:
debug
.
IProcess
,
source
:
Source
,
value
:
string
,
mtype
:
string
):
DebugStringEditorInput
{
private
getDebugStringEditorInput
(
process
:
debug
.
IProcess
,
source
:
Source
,
value
:
string
,
mtype
:
string
):
DebugStringEditorInput
{
...
...
src/vs/workbench/parts/debug/electron-browser/debugViewer.ts
浏览文件 @
33e6f45d
...
@@ -295,7 +295,7 @@ export class CallStackController extends BaseDebugController {
...
@@ -295,7 +295,7 @@ export class CallStackController extends BaseDebugController {
process
=
element
;
process
=
element
;
}
}
this
.
debugService
.
setFocused
StackFrameAndEvaluate
(
stackFrame
,
process
).
done
(
null
,
errors
.
onUnexpectedError
);
this
.
debugService
.
focus
StackFrameAndEvaluate
(
stackFrame
,
process
).
done
(
null
,
errors
.
onUnexpectedError
);
if
(
stackFrame
)
{
if
(
stackFrame
)
{
const
sideBySide
=
(
event
&&
(
event
.
ctrlKey
||
event
.
metaKey
));
const
sideBySide
=
(
event
&&
(
event
.
ctrlKey
||
event
.
metaKey
));
...
...
src/vs/workbench/parts/debug/test/common/mockDebug.ts
浏览文件 @
33e6f45d
...
@@ -25,7 +25,7 @@ export class MockDebugService implements debug.IDebugService {
...
@@ -25,7 +25,7 @@ export class MockDebugService implements debug.IDebugService {
return
null
;
return
null
;
}
}
public
setFocused
StackFrameAndEvaluate
(
focusedStackFrame
:
debug
.
IStackFrame
):
TPromise
<
void
>
{
public
focus
StackFrameAndEvaluate
(
focusedStackFrame
:
debug
.
IStackFrame
):
TPromise
<
void
>
{
return
TPromise
.
as
(
null
);
return
TPromise
.
as
(
null
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录