提交 11bc6762 编写于 作者: I isidor

debug: clearBreakpoints -> removeBreakpoints

上级 e0614e64
......@@ -280,7 +280,7 @@ export class RemoveAllBreakpointsAction extends AbstractDebugAction {
}
public run(): Promise {
return this.debugService.clearBreakpoints();
return this.debugService.removeBreakpoints();
}
protected isEnabled(): boolean {
......
......@@ -219,7 +219,7 @@ export interface IDebugService extends ee.IEventEmitter {
toggleBreakpoint(modelUri: uri, lineNumber: number, condition?: string): Promise;
enableOrDisableAllBreakpoints(enabled: boolean): Promise;
toggleEnablement(element: IEnablement): Promise;
clearBreakpoints(modelUri?: uri): Promise;
removeBreakpoints(modelUri?: uri): Promise;
toggleBreakpointsActivated(): Promise;
sendAllBreakpoints(): Promise;
......
......@@ -412,14 +412,14 @@ export class Model extends ee.EventEmitter implements debug.IModel {
}
public setBreakpointsForModel(modelUri: uri, data: { lineNumber: number; enabled: boolean; condition?: string; }[]): void {
this.clearBreakpoints(modelUri);
this.removeBreakpoints(modelUri);
for (var i = 0, len = data.length; i < len; i++) {
this.breakpoints.push(new Breakpoint(Source.fromUri(modelUri), data[i].lineNumber, data[i].enabled, data[i].condition));
}
this.emit(debug.ModelEvents.BREAKPOINTS_UPDATED);
}
public clearBreakpoints(modelUri: uri): void {
public removeBreakpoints(modelUri: uri): void {
this.breakpoints = this.breakpoints.filter(bp => modelUri && modelUri.toString() !== bp.source.uri.toString());
this.emit(debug.ModelEvents.BREAKPOINTS_UPDATED);
}
......
......@@ -394,9 +394,9 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService
return this.sendExceptionBreakpoints();
}
public clearBreakpoints(modelUri: uri = null): Promise {
public removeBreakpoints(modelUri: uri = null): Promise {
var urisToClear = modelUri ? [modelUri] : arrays.distinct(this.model.getBreakpoints(), bp => bp.source.uri.toString()).map(bp => bp.source.uri);
this.model.clearBreakpoints(modelUri);
this.model.removeBreakpoints(modelUri);
return Promise.join(urisToClear.map(uri => this.sendBreakpoints(uri)));
}
......@@ -760,7 +760,7 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService
var uri = breakpoints[i].source.uri;
var uriStr = uri.toString();
if (!clearedUris[uriStr] && fileChangesEvent.contains(uri, FileChangeType.DELETED)) {
this.clearBreakpoints(uri);
this.removeBreakpoints(uri);
clearedUris[uriStr] = true;
}
}
......
......@@ -28,7 +28,7 @@ suite('Debug - Model', () => {
assert.equal(model.areBreakpointsActivated(), true);
assert.equal(model.getBreakpoints().length, 2);
model.clearBreakpoints(modelUri);
model.removeBreakpoints(modelUri);
assert.equal(model.getBreakpoints().length, 0);
});
......@@ -66,7 +66,7 @@ suite('Debug - Model', () => {
model.toggleEnablement(bp);
assert.equal(bp.enabled, true);
model.clearBreakpoints(modelUri1);
model.removeBreakpoints(modelUri1);
assert.equal(model.getBreakpoints().length, 3);
});
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册