maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Deduplicate decorations since same variable can appear in multiple scopes, leading to duplicated decorations

Browse source 
fixes #129770
This commit is contained in:
isidor 2021-08-03 17:35:14 +02:00
parent 456470f38d
commit ec11c7a494
No known key found for this signature in database
GPG key ID: F9280366A8370105
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
View file

@ -14,7 +14,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { InlineValueContext, InlineValuesProviderRegistry, StandardTokenType } from 'vs/editor/common/modes';
import { CancellationTokenSource } from 'vs/base/common/cancellation';
import { flatten } from 'vs/base/common/arrays';
import { distinct, flatten } from 'vs/base/common/arrays';
import { onUnexpectedExternalError } from 'vs/base/common/errors';
import { DEFAULT_WORD_REGEXP } from 'vs/editor/common/model/wordHelper';
import { ICodeEditor, IEditorMouseEvent, MouseTargetType, IPartialEditorMouseEvent } from 'vs/editor/browser/editorBrowser';
@ -715,7 +715,9 @@ export class DebugEditorContribution implements IDebugEditorContribution {
return createInlineValueDecorationsInsideRange(variables, range, model, this.wordToLineNumbersMap);
}));
allDecorations = decorationsPerScope.reduce((previous, current) => previous.concat(current), []);
allDecorations = distinct(decorationsPerScope.reduce((previous, current) => previous.concat(current), []),
// Deduplicate decorations since same variable can appear in multiple scopes, leading to duplicated decorations #129770
decoration => `${decoration.range.startLineNumber}:${decoration.renderOptions?.after?.contentText}`);
}
this.editor.setDecorations('debug-inline-value-decoration', INLINE_VALUE_DECORATION_KEY, allDecorations);