Skip to content

Commit 8551a8e

Browse files
committed
setting highlighted label to undefined when not needed
1 parent 0fb2b79 commit 8551a8e

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

src/views/live-watch/live-watch.test.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ describe('LiveWatchTreeDataProvider', () => {
141141
(tracker as any)._onWillStopSession.fire(gdbtargetDebugSession);
142142
// Allow async handlers to complete
143143
await new Promise(resolve => setTimeout(resolve, 0));
144-
expect(node.value.highlightedLabel).toEqual({ label: 'myVar = ' });
144+
expect(node.value.highlightedLabel).toBeUndefined();
145145
});
146146

147147
it('reassigns IDs sequentially for restored nodes on construction', () => {
@@ -413,9 +413,7 @@ describe('LiveWatchTreeDataProvider', () => {
413413
session: {}
414414
};
415415
await (liveWatchTreeDataProvider as any).refresh();
416-
expect(node.value.highlightedLabel).toEqual({
417-
label: 'myVar = '
418-
});
416+
expect(node.value.highlightedLabel).toBeUndefined();
419417
});
420418
});
421419

src/views/live-watch/live-watch.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export interface LiveWatchValue {
3434
variablesReference: number;
3535
type?: string;
3636
evaluateName?: string;
37-
highlightedLabel?: vscode.TreeItemLabel;
37+
highlightedLabel?: vscode.TreeItemLabel | undefined;
3838
}
3939

4040
interface SessionLiveWatchState {
@@ -403,7 +403,7 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
403403
if (node.value.result !== result.result) {
404404
node.value.highlightedLabel = { label: node.expression + ' = ', highlights: [[0, node.expression.length]] };
405405
} else {
406-
node.value.highlightedLabel = { label: node.expression + ' = ' };
406+
node.value.highlightedLabel = undefined;
407407
}
408408
node.value.result = result.result;
409409
node.value.variablesReference = result.variablesReference;
@@ -493,7 +493,7 @@ export class LiveWatchTreeDataProvider implements vscode.TreeDataProvider<LiveWa
493493
private async save() {
494494
// Clear highlighted labels before saving, as they are only relevant for the current state of the tree and can cause confusion when reloading
495495
for (const node of this.roots) {
496-
node.value.highlightedLabel = { label: node.expression + ' = ' };
496+
node.value.highlightedLabel = undefined;
497497
}
498498
await this.context.workspaceState.update(this.STORAGE_KEY, this.roots);
499499
}

0 commit comments

Comments
 (0)