Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 19:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

make addBreakpoint/removeBreakpoint sync

Browse Source
This commit is contained in:
Andre Weinand
2018-01-26 12:51:01 +01:00
parent fc2984abaf
commit 22c5903847
8 changed files with 58 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
View File

@@ -11,7 +11,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import {
ExtHostContext, ExtHostDebugServiceShape, MainThreadDebugServiceShape, DebugSessionUUID, MainContext,
IExtHostContext, IBreakpointsDeltaDto, ISourceMultiBreakpointDto, ISourceBreakpointDto, IFunctionBreakpointDto, IBreakpointIndexDto
IExtHostContext, IBreakpointsDeltaDto, ISourceMultiBreakpointDto, ISourceBreakpointDto, IFunctionBreakpointDto
} from '../node/extHost.protocol';
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
import severity from 'vs/base/common/severity';
@@ -92,14 +92,13 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
return TPromise.wrap<void>(undefined);
}
public async $registerBreakpoints(DTOs: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): TPromise<IBreakpointIndexDto[]> {
public $registerBreakpoints(DTOs: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): TPromise<void> {
const result: IBreakpointIndexDto[] = [];
for (let dto of DTOs) {
if (dto.type === 'sourceMulti') {
const sdto = <ISourceMultiBreakpointDto>dto;
const rawbps = dto.lines.map(l =>
<IRawBreakpoint>{
id: l.id,
enabled: l.enabled,
lineNumber: l.line + 1,
column: l.character > 0 ? l.character + 1 : 0,
@@ -107,20 +106,12 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
hitCondition: l.hitCondition
}
);
const bps = await this.debugService.addBreakpoints(uri.revive(dto.uri), rawbps);
bps.forEach((bp, ix) => result.push({
index: sdto.lines[ix].index,
id: bp.getId()
}));
this.debugService.addBreakpoints(uri.revive(dto.uri), rawbps);
} else if (dto.type === 'function') {
const fbs = this.debugService.addFunctionBreakpoint(dto.functionName);
result.push({
index: dto.index,
id: fbs.getId()
});
this.debugService.addFunctionBreakpoint(dto.functionName, dto.id);
}
}
return result;
return void 0;
}
public $unregisterBreakpoints(breakpointIds: string[], functionBreakpointIds: string[]): TPromise<void> {