Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
8e8f4b00
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
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,发现更多精彩内容 >>
提交
8e8f4b00
编写于
12月 06, 2017
作者:
A
Andre Weinand
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bogus breakpoint position; fixes #39665
上级
1738c3e6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
42 addition
and
19 deletion
+42
-19
src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
.../workbench/api/electron-browser/mainThreadDebugService.ts
+2
-4
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+2
-1
src/vs/workbench/api/node/extHostDebugService.ts
src/vs/workbench/api/node/extHostDebugService.ts
+38
-14
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
浏览文件 @
8e8f4b00
...
...
@@ -111,10 +111,8 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
condition
:
sbp
.
condition
,
hitCondition
:
bp
.
hitCondition
,
sourceUriStr
:
sbp
.
uri
.
toString
(),
location
:
{
line
:
sbp
.
lineNumber
,
character
:
sbp
.
column
}
line
:
sbp
.
lineNumber
>
0
?
sbp
.
lineNumber
-
1
:
0
,
character
:
(
typeof
sbp
.
column
===
'
number
'
&&
sbp
.
column
>
0
)
?
sbp
.
column
-
1
:
0
};
}
});
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
8e8f4b00
...
...
@@ -636,7 +636,8 @@ export interface IBreakpointData {
export
interface
ISourceBreakpointData
extends
IBreakpointData
{
type
:
'
source
'
;
sourceUriStr
:
string
;
location
:
vscode
.
Position
;
line
:
number
;
character
:
number
;
}
export
interface
IFunctionBreakpointData
extends
IBreakpointData
{
...
...
src/vs/workbench/api/node/extHostDebugService.ts
浏览文件 @
8e8f4b00
...
...
@@ -12,7 +12,7 @@ import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
import
*
as
vscode
from
'
vscode
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
*
as
types
from
'
vs/workbench/api/node/extHostTypes
'
;
import
{
Disposable
,
Position
}
from
'
vs/workbench/api/node/extHostTypes
'
;
export
class
ExtHostDebugService
implements
ExtHostDebugServiceShape
{
...
...
@@ -103,9 +103,9 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
if
(
delta
.
added
)
{
a
=
delta
.
added
.
map
(
bpd
=>
{
const
id
=
bpd
.
id
;
this
.
_breakpoints
.
set
(
id
,
this
.
fromWire
(
bpd
)
);
return
bp
d
;
const
bp
=
this
.
fromWire
(
bpd
)
;
this
.
_breakpoints
.
set
(
bpd
.
id
,
bp
);
return
bp
;
});
}
...
...
@@ -121,9 +121,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
if
(
delta
.
changed
)
{
c
=
delta
.
changed
.
map
(
bpd
=>
{
const
id
=
bpd
.
id
;
this
.
_breakpoints
.
set
(
id
,
this
.
fromWire
(
bpd
));
return
bpd
;
return
extendObject
(
this
.
_breakpoints
.
get
(
bpd
.
id
),
this
.
fromWire
(
bpd
));
});
}
...
...
@@ -135,24 +133,37 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
}
private
fromWire
(
bp
:
ISourceBreakpointData
|
IFunctionBreakpointData
):
vscode
.
Breakpoint
{
delete
bp
.
id
;
if
(
bp
.
type
===
'
source
'
)
{
(
<
any
>
bp
).
source
=
URI
.
parse
(
bp
.
sourceUriStr
);
delete
bp
.
sourceUriStr
;
if
(
bp
.
type
===
'
function
'
)
{
const
fbp
:
vscode
.
FunctionBreakpoint
=
{
type
:
'
function
'
,
enabled
:
bp
.
enabled
,
condition
:
bp
.
condition
,
hitCondition
:
bp
.
hitCondition
,
functionName
:
bp
.
functionName
};
return
fbp
;
}
return
bp
;
const
sbp
:
vscode
.
SourceBreakpoint
=
{
type
:
'
source
'
,
enabled
:
bp
.
enabled
,
condition
:
bp
.
condition
,
hitCondition
:
bp
.
hitCondition
,
source
:
URI
.
parse
(
bp
.
sourceUriStr
),
location
:
new
Position
(
bp
.
line
,
bp
.
character
)
};
return
sbp
;
}
public
registerDebugConfigurationProvider
(
type
:
string
,
provider
:
vscode
.
DebugConfigurationProvider
):
vscode
.
Disposable
{
if
(
!
provider
)
{
return
new
types
.
Disposable
(()
=>
{
});
return
new
Disposable
(()
=>
{
});
}
let
handle
=
this
.
nextHandle
();
this
.
_handlers
.
set
(
handle
,
provider
);
this
.
_debugServiceProxy
.
$registerDebugConfigurationProvider
(
type
,
!!
provider
.
provideDebugConfigurations
,
!!
provider
.
resolveDebugConfiguration
,
handle
);
return
new
types
.
Disposable
(()
=>
{
return
new
Disposable
(()
=>
{
this
.
_handlers
.
delete
(
handle
);
this
.
_debugServiceProxy
.
$unregisterDebugConfigurationProvider
(
handle
);
});
...
...
@@ -299,3 +310,16 @@ export class ExtHostDebugConsole implements vscode.DebugConsole {
this
.
append
(
value
+
'
\n
'
);
}
}
/**
* Copy attributes from fromObject to toObject.
*/
export
function
extendObject
<
T
>
(
toObject
:
T
,
fromObject
:
T
):
T
{
for
(
let
key
in
fromObject
)
{
if
(
fromObject
.
hasOwnProperty
(
key
))
{
toObject
[
key
]
=
fromObject
[
key
];
}
}
return
toObject
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录