Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-24 17:31:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

debug: show error breakpoints in breakpoints tree

Browse Source 
fixes #864
This commit is contained in:
isidor
2015-12-02 11:47:41 +01:00
parent df339f922e
commit 12efa7ffdd
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/parts/debug/browser/debugViewer.ts
+1 -1
View File
@@ -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;
src/vs/workbench/parts/debug/common/debugModel.ts
+2
View File
@@ -393,6 +393,7 @@ export class Model extends ee.EventEmitter implements debug.IModel {
if (element instanceof Breakpoint && !element.enabled) {
var breakpoint = <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);
src/vs/workbench/parts/debug/electron-browser/debugService.ts
+1 -1
View File
@@ -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);
}
});
});