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

debug: better undefined check for updating breakpoint properties

Browse Source 
fixes #44909
This commit is contained in:
isidor
2018-03-02 16:05:32 +01:00
parent 675e09114f
commit 99010dcf57
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/parts/debug/common/debugModel.ts
+14 -5
View File
@@ -13,7 +13,7 @@ import { generateUuid } from 'vs/base/common/uuid';
import * as errors from 'vs/base/common/errors';
import { RunOnceScheduler } from 'vs/base/common/async';
import severity from 'vs/base/common/severity';
import { isObject, isString } from 'vs/base/common/types';
import { isObject, isString, isUndefinedOrNull } from 'vs/base/common/types';
import { distinct } from 'vs/base/common/arrays';
import { Range, IRange } from 'vs/editor/common/core/range';
import { ISuggestion } from 'vs/editor/common/modes';
@@ -891,16 +891,25 @@ export class Model implements IModel {
this.breakpoints.forEach(bp => {
const bpData = data[bp.getId()];
if (bpData) {
bp.lineNumber = bpData.line ? bpData.line : bp.lineNumber;
if (!isUndefinedOrNull(bpData.line)) {
bp.lineNumber = bpData.line;
}
bp.endLineNumber = bpData.endLine;
bp.column = bpData.column;
bp.endColumn = bpData.endColumn;
bp.verified = bp.verified || bpData.verified;
if (!isUndefinedOrNull(bpData.verified)) {
bp.verified = bpData.verified;
}
bp.idFromAdapter = bpData.id;
bp.message = bpData.message;
bp.adapterData = bpData.source ? bpData.source.adapterData : bp.adapterData;
bp.condition = bpData.condition || bp.condition;
bp.hitCondition = bpData.hitCondition || bp.hitCondition;
if (!isUndefinedOrNull(bpData.condition)) {
bp.condition = bpData.condition;
}
if (!isUndefinedOrNull(bpData.hitCondition)) {
bp.hitCondition = bpData.hitCondition;
}
updated.push(bp);
}
});