Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-06 14:34:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Closed notebook search: current result not highlighted on notebook open (#188719)

Browse Source 
Fixes #188558
This commit is contained in:
Andrea Mah
2023-07-24 22:53:58 +01:00
committed by GitHub
parent 2b5bf2176e
commit 67e47344d2
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/search/browser/searchModel.ts
+14 -2
View File
@@ -625,6 +625,12 @@ export class FileMatch extends Disposable implements IFileMatch {
setSelectedMatch(match: Match | null): void {
if (match) {
if (!this.isMatchSelected(match) && match instanceof MatchInNotebook) {
this._selectedMatch = match;
return;
}
if (!this._textMatches.has(match.id())) {
return;
}
@@ -765,6 +771,9 @@ export class FileMatch extends Disposable implements IFileMatch {
this._findMatchDecorationModel?.stopWebviewFind();
this._findMatchDecorationModel?.dispose();
this._findMatchDecorationModel = new FindMatchDecorationModel(this._notebookEditorWidget, this.searchInstanceID);
if (this._selectedMatch instanceof MatchInNotebook) {
this.highlightCurrentFindMatchDecoration(this._selectedMatch);
}
}
private _removeNotebookHighlights(): void {
@@ -780,6 +789,7 @@ export class FileMatch extends Disposable implements IFileMatch {
return;
}
const oldCellMatches = new Map<string, CellMatch>(this._cellMatches);
if (this._notebookEditorWidget.getId() !== this._lastEditorWidgetIdForUpdate) {
this._cellMatches.clear();
this._lastEditorWidgetIdForUpdate = this._notebookEditorWidget.getId();
@@ -790,10 +800,9 @@ export class FileMatch extends Disposable implements IFileMatch {
let existingCell = this._cellMatches.get(match.cell.id);
if (this._notebookEditorWidget && !existingCell) {
const index = this._notebookEditorWidget.getCellIndex(match.cell);
const existingRawCell = this._cellMatches.get(`${rawCellPrefix}${index}`);
const existingRawCell = oldCellMatches.get(`${rawCellPrefix}${index}`);
if (existingRawCell) {
existingRawCell.setCellModel(match.cell);
this._cellMatches.delete(`${rawCellPrefix}${index}`);
existingCell = existingRawCell;
}
}
@@ -805,6 +814,9 @@ export class FileMatch extends Disposable implements IFileMatch {
});
this._findMatchDecorationModel?.setAllFindMatchesDecorations(matches);
if (this._selectedMatch instanceof MatchInNotebook) {
this.highlightCurrentFindMatchDecoration(this._selectedMatch);
}
this._onChange.fire({ forceUpdateModel: modelChange });
}