Skip to content

Notebook search highlights are not hidden when closing the search sidebar #187017

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

Merged
andreamah merged 1 commit into from
Jul 5, 2023
Merged

Notebook search highlights are not hidden when closing the search sidebar #187017

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 24 additions & 5 deletions src/vs/workbench/contrib/search/browser/searchModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,10 +723,7 @@ export class FileMatch extends Disposable implements IFileMatch {
}
this._notebookUpdateScheduler.schedule();
}) ?? null;

this._findMatchDecorationModel?.stopWebviewFind();
this._findMatchDecorationModel?.dispose();
this._findMatchDecorationModel = new FindMatchDecorationModel(this._notebookEditorWidget);
this._addNotebookHighlights();
}

unbindNotebookEditorWidget(widget?: NotebookEditorWidget) {
Expand All @@ -738,13 +735,34 @@ export class FileMatch extends Disposable implements IFileMatch {
this._notebookUpdateScheduler.cancel();
this._editorWidgetListener?.dispose();
}
this._removeNotebookHighlights();
this._notebookEditorWidget = null;
}

updateNotebookHighlights(): void {
if (this.parent().showHighlights) {
this._addNotebookHighlights();
this.setNotebookFindMatchDecorationsUsingCellMatches(Array.from(this._cellMatches.values()));
} else {
this._removeNotebookHighlights();
}
}

private _addNotebookHighlights(): void {
if (!this._notebookEditorWidget) {
return;
}
this._findMatchDecorationModel?.stopWebviewFind();
this._findMatchDecorationModel?.dispose();
this._findMatchDecorationModel = new FindMatchDecorationModel(this._notebookEditorWidget);
}

private _removeNotebookHighlights(): void {
if (this._findMatchDecorationModel) {
this._findMatchDecorationModel?.stopWebviewFind();
this._findMatchDecorationModel?.dispose();
this._findMatchDecorationModel = undefined;
}
this._notebookEditorWidget = null;
}
private updateNotebookMatches(matches: CellFindMatchWithIndex[], modelChange: boolean): void {

Expand Down Expand Up @@ -1808,6 +1826,7 @@ export class SearchResult extends Disposable {
let selectedMatch: Match | null = null;
this.matches().forEach((fileMatch: FileMatch) => {
fileMatch.updateHighlights();
fileMatch.updateNotebookHighlights();
if (!selectedMatch) {
selectedMatch = fileMatch.getSelectedMatch();
}
Expand Down