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

use classes for breakpoints API; fixes #39639

Browse Source
This commit is contained in:
Andre Weinand
2017-12-07 00:30:41 +01:00
parent 24a193313d
commit c70c818503
4 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/vs/workbench/api/node/extHostDebugService.ts
View File

@@ -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 { Disposable, Position, Location } from 'vs/workbench/api/node/extHostTypes';
import { Disposable, Position, Location, SourceBreakpoint, FunctionBreakpoint } from 'vs/workbench/api/node/extHostTypes';
export class ExtHostDebugService implements ExtHostDebugServiceShape {
@@ -121,7 +121,9 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
if (delta.changed) {
c = delta.changed.map(bpd => {
return extendObject(this._breakpoints.get(bpd.id), this.fromWire(bpd));
const bp = this.fromWire(bpd);
this._breakpoints.set(bpd.id, bp);
return bp;
});
}
@@ -134,23 +136,9 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
private fromWire(bp: ISourceBreakpointData | IFunctionBreakpointData): vscode.Breakpoint {
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 new FunctionBreakpoint(bp.enabled, bp.condition, bp.hitCondition, bp.functionName);
}
const sbp: vscode.SourceBreakpoint = {
type: 'source',
enabled: bp.enabled,
condition: bp.condition,
hitCondition: bp.hitCondition,
location: new Location(bp.uri, new Position(bp.line, bp.character))
};
return sbp;
return new SourceBreakpoint(bp.enabled, bp.condition, bp.hitCondition, new Location(bp.uri, new Position(bp.line, bp.character)));
}
public registerDebugConfigurationProvider(type: string, provider: vscode.DebugConfigurationProvider): vscode.Disposable {
@@ -309,16 +297,3 @@ 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;
}