diff --git a/src/vs/workbench/parts/debug/browser/debugViews.ts b/src/vs/workbench/parts/debug/browser/debugViews.ts index e943f9398cabf7df554b05c7eaaccfe05c06d849..4ec25be967ac77ebfb24568dd0d03a05b1dea990 100644 --- a/src/vs/workbench/parts/debug/browser/debugViews.ts +++ b/src/vs/workbench/parts/debug/browser/debugViews.ts @@ -249,7 +249,7 @@ export class CallStackView extends viewlet.CollapsibleViewletView { } const sideBySide = (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey)); - this.debugService.openOrRevealEditor(stackFrame.source, stackFrame.lineNumber, preserveFocus, sideBySide).done(null, errors.onUnexpectedError); + this.debugService.openOrRevealSource(stackFrame.source, stackFrame.lineNumber, preserveFocus, sideBySide).done(null, errors.onUnexpectedError); } // user clicked on 'Load More Stack Frames', get those stack frames and refresh the tree. @@ -393,7 +393,7 @@ export class BreakpointsView extends viewlet.AdaptiveCollapsibleViewletView { } const sideBySide = (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey)); - this.debugService.openOrRevealEditor(breakpoint.source, breakpoint.lineNumber, preserveFocus, sideBySide).done(null, errors.onUnexpectedError); + this.debugService.openOrRevealSource(breakpoint.source, breakpoint.lineNumber, preserveFocus, sideBySide).done(null, errors.onUnexpectedError); } })); diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts index 1f04a51ef8fd88dc606e2b8ed6effe91879d215a..eac1fbb28a7873988ae13bb03ba2ec1304be4fad 100644 --- a/src/vs/workbench/parts/debug/common/debug.ts +++ b/src/vs/workbench/parts/debug/common/debug.ts @@ -308,9 +308,8 @@ export interface IDebugService { toggleBreakpoint(IRawBreakpoint): TPromise; enableOrDisableAllBreakpoints(enabled: boolean): TPromise; toggleEnablement(element: IEnablement): TPromise; - toggleBreakpointsActivated(): TPromise; + setBreakpointsActivated(activated: boolean): TPromise; removeAllBreakpoints(): TPromise; - sendAllBreakpoints(): TPromise; addFunctionBreakpoint(): void; renameFunctionBreakpoint(id: string, newFunctionName: string): TPromise; @@ -318,10 +317,7 @@ export interface IDebugService { addReplExpression(name: string): TPromise; clearReplExpressions(): void; - - logToRepl(value: string, severity?: severity): void; - logToRepl(value: { [key: string]: any }, severity?: severity): void; - + logToRepl(value: string | { [key: string]: any }, severity?: severity): void; appendReplOutput(value: string, severity?: severity): void; addWatchExpression(name?: string): TPromise; @@ -356,7 +352,7 @@ export interface IDebugService { /** * Opens a new or reveals an already visible editor showing the source. */ - openOrRevealEditor(source: Source, lineNumber: number, preserveFocus: boolean, sideBySide: boolean): TPromise; + openOrRevealSource(source: Source, lineNumber: number, preserveFocus: boolean, sideBySide: boolean): TPromise; } // Editor interfaces diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index 436db083f87d942a91a35a50dcab1f801e36a292..6c44c1620593abc4b61472fe0269019759f8d7ca 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -487,8 +487,8 @@ export class Model implements debug.IModel { return this.breakpointsActivated; } - public toggleBreakpointsActivated(): void { - this.breakpointsActivated = !this.breakpointsActivated; + public setBreakpointsActivated(activated: boolean): void { + this.breakpointsActivated = activated; this._onDidChangeBreakpoints.fire(); } @@ -576,9 +576,7 @@ export class Model implements debug.IModel { .then(() => this._onDidChangeREPLElements.fire()); } - public logToRepl(value: string, severity?: severity): void; - public logToRepl(value: { [key: string]: any }, severity?: severity): void; - public logToRepl(value: any, severity?: severity): void { + public logToRepl(value: string | { [key: string]: any }, severity?: severity): void { let elements:OutputElement[] = []; let previousOutput = this.replElements.length && (this.replElements[this.replElements.length - 1]); @@ -596,7 +594,7 @@ export class Model implements debug.IModel { // key-value output else { - elements.push(new KeyValueOutputElement(value.prototype, value, nls.localize('snapshotObj', "Only primitive values are shown for this object."))); + elements.push(new KeyValueOutputElement((value).prototype, value, nls.localize('snapshotObj', "Only primitive values are shown for this object."))); } if (elements.length) { diff --git a/src/vs/workbench/parts/debug/electron-browser/debugActions.ts b/src/vs/workbench/parts/debug/electron-browser/debugActions.ts index 30be592eb9ec0cff255e51014addb44780178310..d7db208252c24fc14bece399c5bb64fd77a23b13 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugActions.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugActions.ts @@ -361,7 +361,7 @@ export class ToggleBreakpointsActivatedAction extends AbstractDebugAction { } public run(): TPromise { - return this.debugService.toggleBreakpointsActivated(); + return this.debugService.setBreakpointsActivated(!this.debugService.getModel().areBreakpointsActivated()); } protected isEnabled(state: debug.State): boolean { @@ -379,7 +379,7 @@ export class ReapplyBreakpointsAction extends AbstractDebugAction { } public run(): TPromise { - return this.debugService.sendAllBreakpoints(); + return this.debugService.setBreakpointsActivated(true); } protected isEnabled(state: debug.State): boolean { diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 4356a5c36ba0baa6284f4ccd26ce55304a463273..6a95cdc5d91dfca1c3d62b64b842e25007002235 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -258,7 +258,7 @@ export class DebugService implements debug.IDebugService { this.setFocusedStackFrameAndEvaluate(stackFrameToFocus).done(null, errors.onUnexpectedError); aria.alert(nls.localize('debuggingPaused', "Debugging paused, reason {0}, {1} {2}", event.body.reason, stackFrameToFocus.source ? stackFrameToFocus.source.name : '', stackFrameToFocus.lineNumber)); - return this.openOrRevealEditor(stackFrameToFocus.source, stackFrameToFocus.lineNumber, false, false); + return this.openOrRevealSource(stackFrameToFocus.source, stackFrameToFocus.lineNumber, false, false); } else { this.setFocusedStackFrameAndEvaluate(null).done(null, errors.onUnexpectedError); } @@ -467,8 +467,8 @@ export class DebugService implements debug.IDebugService { return TPromise.join(urisToClear.map(uri => this.sendBreakpoints(uri))); } - public toggleBreakpointsActivated(): TPromise { - this.model.toggleBreakpointsActivated(); + public setBreakpointsActivated(activated: boolean): TPromise { + this.model.setBreakpointsActivated(activated); return this.sendAllBreakpoints(); } @@ -491,9 +491,7 @@ export class DebugService implements debug.IDebugService { return this.model.addReplExpression(this.session, this.viewModel.getFocusedStackFrame(), name); } - public logToRepl(value: string, severity?: severity): void; - public logToRepl(value: { [key: string]: any }, severity?: severity): void; - public logToRepl(value: any, severity?: severity): void { + public logToRepl(value: string | { [key: string]: any }, severity?: severity): void { this.model.logToRepl(value, severity); } @@ -753,7 +751,7 @@ export class DebugService implements debug.IDebugService { return this.viewModel; } - public openOrRevealEditor(source: Source, lineNumber: number, preserveFocus: boolean, sideBySide: boolean): TPromise { + public openOrRevealSource(source: Source, lineNumber: number, preserveFocus: boolean, sideBySide: boolean): TPromise { const visibleEditors = this.editorService.getVisibleEditors(); for (let i = 0; i < visibleEditors.length; i++) { const fileInput = wbeditorcommon.asFileEditorInput(visibleEditors[i].input); @@ -832,7 +830,7 @@ export class DebugService implements debug.IDebugService { } } - public sendAllBreakpoints(): TPromise { + private sendAllBreakpoints(): TPromise { return TPromise.join(arrays.distinct(this.model.getBreakpoints(), bp => bp.source.uri.toString()).map(bp => this.sendBreakpoints(bp.source.uri))) .then(() => this.sendFunctionBreakpoints()) // send exception breakpoints at the end since some debug adapters rely on the order diff --git a/src/vs/workbench/parts/debug/test/common/debugModel.test.ts b/src/vs/workbench/parts/debug/test/common/debugModel.test.ts index 581f8eb9702d81d0ac04a9f7f1242aaff57693ea..d1aa9af758625f5fde54350449eeaff9c45caafd 100644 --- a/src/vs/workbench/parts/debug/test/common/debugModel.test.ts +++ b/src/vs/workbench/parts/debug/test/common/debugModel.test.ts @@ -44,9 +44,9 @@ suite('Debug - Model', () => { model.removeBreakpoints([model.getBreakpoints().pop()]); assert.equal(model.getBreakpoints().length, 2); - model.toggleBreakpointsActivated(); + model.setBreakpointsActivated(false); assert.equal(model.areBreakpointsActivated(), false); - model.toggleBreakpointsActivated(); + model.setBreakpointsActivated(true); assert.equal(model.areBreakpointsActivated(), true); }); diff --git a/src/vs/workbench/parts/debug/test/common/mockDebugService.ts b/src/vs/workbench/parts/debug/test/common/mockDebugService.ts index 44d4e425be0c55ea62a5bef80526b1b1d93a28c9..8c312d623ca400159d85537b1bec62409a2621c1 100644 --- a/src/vs/workbench/parts/debug/test/common/mockDebugService.ts +++ b/src/vs/workbench/parts/debug/test/common/mockDebugService.ts @@ -51,7 +51,7 @@ export class MockDebugService implements debug.IDebugService { return TPromise.as(null); } - public toggleBreakpointsActivated(): TPromise { + public setBreakpointsActivated(): TPromise { return TPromise.as(null); } @@ -59,10 +59,6 @@ export class MockDebugService implements debug.IDebugService { return TPromise.as(null); } - public sendAllBreakpoints(): TPromise { - return TPromise.as(null); - } - public addFunctionBreakpoint(): void {} public renameFunctionBreakpoint(id: string, newFunctionName: string): TPromise { @@ -115,7 +111,7 @@ export class MockDebugService implements debug.IDebugService { return null; } - public openOrRevealEditor(source: Source, lineNumber: number, preserveFocus: boolean, sideBySide: boolean): TPromise { + public openOrRevealSource(source: Source, lineNumber: number, preserveFocus: boolean, sideBySide: boolean): TPromise { return TPromise.as(null); } }