Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preserve highlights switching between single/multi file highlights #224243

Merged
merged 4 commits into from
Jul 30, 2024
Merged

Preserve highlights switching between single/multi file highlights #224243

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
250b901
preserve latest editor highlights during setting changes
Yoyokrazy Jul 29, 2024
19451dc
cleaning
Yoyokrazy Jul 30, 2024
3e4bef4
default case + correct URI comparison
Yoyokrazy Jul 30, 2024
8642d78
break statements...
Yoyokrazy Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegis
import { Schemas } from 'vs/base/common/network';
import { ResourceMap } from 'vs/base/common/map';
import { score } from 'vs/editor/common/languageSelector';
import { isEqual } from 'vs/base/common/resources';
// import { TextualMultiDocumentHighlightFeature } from 'vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider';
// import { registerEditorFeature } from 'vs/editor/common/editorFeatures';

Expand Down Expand Up @@ -335,7 +336,22 @@ class WordHighlighter {
const newValue = this.editor.getOption(EditorOption.occurrencesHighlight);
if (this.occurrencesHighlight !== newValue) {
this.occurrencesHighlight = newValue;
this._stopAll();
switch (newValue) {
Yoyokrazy marked this conversation as resolved.
Show resolved Hide resolved
case 'off':
this._stopAll();
break;
case 'singleFile':
this._stopAll(WordHighlighter.query?.modelInfo?.model);
break;
case 'multiFile':
if (WordHighlighter.query) {
this._run();
}
break;
default:
console.warn('Unknown occurrencesHighlight setting value:', newValue);
break;
}
}
}));

Expand Down Expand Up @@ -437,12 +453,12 @@ class WordHighlighter {
}
}

private _removeAllDecorations(): void {
private _removeAllDecorations(preservedModel?: ITextModel): void {
const currentEditors = this.codeEditorService.listCodeEditors();
const deleteURI = [];
// iterate over editors and store models in currentModels
for (const editor of currentEditors) {
if (!editor.hasModel()) {
if (!editor.hasModel() || isEqual(editor.getModel().uri, preservedModel?.uri)) {
continue;
}

Expand Down Expand Up @@ -505,11 +521,11 @@ class WordHighlighter {
}
}

private _stopAll() {
private _stopAll(preservedModel?: ITextModel): void {
// Remove any existing decorations
// TODO: @Yoyokrazy -- this triggers as notebooks scroll, causing highlights to disappear momentarily.
// maybe a nb type check?
this._removeAllDecorations();
this._removeAllDecorations(preservedModel);

// Cancel any renderDecorationsTimer
if (this.renderDecorationsTimer !== -1) {
Expand Down
Loading