From 12efa7ffdd83f58a5130a67ffbecd2b03428d654 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 2 Dec 2015 11:47:41 +0100 Subject: [PATCH] debug: show error breakpoints in breakpoints tree fixes #864 --- src/vs/workbench/parts/debug/browser/debugViewer.ts | 2 +- src/vs/workbench/parts/debug/common/debugModel.ts | 2 ++ src/vs/workbench/parts/debug/electron-browser/debugService.ts | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/debug/browser/debugViewer.ts b/src/vs/workbench/parts/debug/browser/debugViewer.ts index 5c8c8292796..79324645580 100644 --- a/src/vs/workbench/parts/debug/browser/debugViewer.ts +++ b/src/vs/workbench/parts/debug/browser/debugViewer.ts @@ -852,7 +852,7 @@ export class BreakpointsRenderer implements tree.IRenderer { } private renderBreakpoint(tree: tree.ITree, breakpoint: debug.IBreakpoint, data: IBreakpointTemplateData): void { - this.debugService.getModel().areBreakpointsActivated() ? tree.removeTraits('disabled', [breakpoint]) : tree.addTraits('disabled', [breakpoint]); + (this.debugService.getModel().areBreakpointsActivated() && !breakpoint.error) ? tree.removeTraits('disabled', [breakpoint]) : tree.addTraits('disabled', [breakpoint]); data.name.textContent = labels.getPathLabel(paths.basename(breakpoint.source.uri.fsPath), this.contextService); data.lineNumber.textContent = breakpoint.desiredLineNumber !== breakpoint.lineNumber ? breakpoint.desiredLineNumber + ' \u2192 ' + breakpoint.lineNumber : '' + breakpoint.lineNumber; diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index b9f0ce43313..710d0208a80 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -393,6 +393,7 @@ export class Model extends ee.EventEmitter implements debug.IModel { if (element instanceof Breakpoint && !element.enabled) { var breakpoint = element; breakpoint.lineNumber = breakpoint.desiredLineNumber; + breakpoint.error = false; } this.emit(debug.ModelEvents.BREAKPOINTS_UPDATED); @@ -403,6 +404,7 @@ export class Model extends ee.EventEmitter implements debug.IModel { bp.enabled = enabled; if (!enabled) { bp.lineNumber = bp.desiredLineNumber; + bp.error = false; } }); this.exceptionBreakpoints.forEach(ebp => ebp.enabled = enabled); diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 0c54fdf84c7..c8dd7742aa5 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -752,7 +752,7 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService breakpointsToSend.forEach(bp => { const rawBreakpointData = response.body.breakpoints[index++]; if (bp.lineNumber !== rawBreakpointData.line || !rawBreakpointData.verified !== bp.error) { - this.model.updateBreakpoint(bp.getId(), rawBreakpointData.line, !rawBreakpointData.verified); + this.model.updateBreakpoint(bp.getId(), rawBreakpointData.line, rawBreakpointData.verified); } }); });