Add ability to search in notebook inputs (under experimental flag) #167952

andreamah · 2022-12-02T17:55:59Z

andreamah · 2023-02-07T23:01:56Z

src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts

@@ -666,7 +666,7 @@ export interface INotebookEditor {
 	getNextVisibleCellIndex(index: number): number | undefined;
 	getPreviousVisibleCellIndex(index: number): number | undefined;
 	find(query: string, options: INotebookSearchOptions, token: CancellationToken): Promise<CellFindMatchWithIndex[]>;
-	highlightFind(cell: ICellViewModel, matchIndex: number): Promise<number>;


this argument wasn't be used by the implementation

src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts

andreamah · 2023-02-08T23:20:12Z

notes about this PR:

this behavior is behind an experimental flag
tests will likely be added soon, but I just wanted reviewers to take a first look at the code, since it is such a large PR
there is some code that controls getting webview results from the find widget, but it's not enabled, even with the experimental flag on. I just left it in there because there's progress there that might be hard to separate from the Find Match code (and it might make some of the code make more sense)?

src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts

src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts

rebornix

let's make sure that extractSelectionLine doesn't run unless requested.

src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts

andreamah · 2023-02-10T01:50:24Z

src/vs/workbench/contrib/search/test/browser/searchResult.test.ts

@@ -268,21 +312,6 @@ suite('SearchResult', () => {
 		assert.deepStrictEqual([{ elements: arrayToRemove, removed: true }], target.args[0]);
 	});

-	test('remove triggers change event', function () {


this is a repeat test of a test with the same name above.

roblourens · 2023-02-10T03:15:38Z

src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts

@@ -124,6 +124,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	readonly onDidChangeCellState = this._onDidChangeCellState.event;
 	private readonly _onDidChangeViewCells = this._register(new Emitter<INotebookViewCellsUpdateEvent>());
 	readonly onDidChangeViewCells: Event<INotebookViewCellsUpdateEvent> = this._onDidChangeViewCells.event;
+	private readonly _onWillChangeModel = this._register(new Emitter<NotebookTextModel | undefined>());
+	readonly onWillChangeModel: Event<NotebookTextModel | undefined> = this._onWillChangeModel.event;


I'm not seeing where this is used?

it's used here

vscode/src/vs/workbench/contrib/search/browser/searchModel.ts

Line 1416 in 99c2baa

widget.onWillChangeModel(

src/vs/workbench/contrib/search/browser/replaceService.ts

roblourens · 2023-02-10T03:19:04Z

src/vs/workbench/contrib/search/browser/replaceService.ts

+			if (e.resource.scheme === network.Schemas.vscodeNotebookCell) {
+				const notebookResource = CellUri.parse(e.resource)?.notebook;
+				if (notebookResource) {
+					return this.editorService.save([...this.editorService.findEditors(notebookResource)]);


Maybe we should be doing this at the model level as well like for text files? I don't know which service would do that.

I was under the impression that saving the text models happened here

vscode/src/vs/workbench/contrib/search/browser/replaceService.ts

Line 122 in 349b100

return this.textFileService.files.get(e.resource)?.save({ source: ReplaceService.REPLACE_SAVE_SOURCE });

(even if it's unsaved)

src/vs/workbench/contrib/search/browser/searchModel.ts

…icrosoft#167952)

andreamah added 9 commits November 7, 2022 11:38

initial marks

f895929

initial changes to support notebook editor binding

03ad467

change notebook track qualifications

cc1a778

needs to read into dom

6bba961

random logs

75dddd2

some progress on notebook search

b7f40ea

Improve workspace text search with notebook editors

ac5a174

Fixes #148068

some rendered content showing in search viewlet

90763cc

rough draft of notebook search

e37722e

andreamah self-assigned this Dec 2, 2022

andreamah mentioned this pull request Dec 2, 2022

Bind notebook editor to search model #165745

Closed

andreamah added 9 commits December 2, 2022 13:15

move local notebook search out of searchservice

d20ea1d

working replace

188ee99

add propert highlighting and open notebook editor when replace active

51c667e

merge main

65337b5

cleanup and compile error fixing

da22b6a

fix function for notebook opening in search

779e721

clarity on shouldOpenInNotebookEditor

b8c5133

added experimental flag

15ea8bc

extra docs for notebook extractSelectionLine

310c13a

andreamah mentioned this pull request Jan 20, 2023

add FindMatchDecorationModel #171857

Merged

andreamah added 6 commits January 20, 2023 13:07

fix experimental flag bug

a782747

resolve merge

f262935

incorporated shared findMatchDecorationModel

eff7d26

jump to nth result on raw text results to notebook results

b1e69a1

Merge branch 'main' into andreamah/issue148068

136438c

fix bug with focus shift

7b97332

andreamah commented Feb 7, 2023

View reviewed changes

cleanup

349b100

roblourens reviewed Feb 8, 2023

View reviewed changes

src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts Outdated Show resolved Hide resolved

remove comments and add readonly field

a368db1

andreamah requested a review from rebornix February 8, 2023 23:16

andreamah marked this pull request as ready for review February 8, 2023 23:20

VSCodeTriageBot added this to the February 2023 milestone Feb 8, 2023

rebornix reviewed Feb 9, 2023

View reviewed changes

src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts Outdated Show resolved Hide resolved

src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts Outdated Show resolved Hide resolved

rebornix requested changes Feb 9, 2023

View reviewed changes

src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts Outdated Show resolved Hide resolved

andreamah added 2 commits February 9, 2023 10:06

remove webview extract match for now

917ac78

remove comma

aa79ffc

andreamah mentioned this pull request Feb 9, 2023

Add search for output rich content in notebooks #173978

Merged

andreamah added 4 commits February 9, 2023 12:26

use onDidAddNotebookEditor

99c2baa

add simple tests

3cbc5af

test corrections

b4c213e

move notebooksearchhelper tests

2bfad50

andreamah commented Feb 10, 2023

View reviewed changes

roblourens reviewed Feb 10, 2023

View reviewed changes

rebornix previously approved these changes Feb 10, 2023

View reviewed changes

PR feedback

9d16b92

andreamah dismissed rebornix’s stale review via 9d16b92 February 10, 2023 18:33

andreamah added 2 commits February 10, 2023 10:37

add listener dispose

8255fc5

get notebook model for replace using notebookEditorModelResolverService

350ed49

andreamah requested a review from roblourens February 10, 2023 20:01

roblourens previously approved these changes Feb 13, 2023

View reviewed changes

dispose reference to notebook in replaceService

3c94737

andreamah dismissed roblourens’s stale review via 3c94737 February 13, 2023 16:46

rebornix approved these changes Feb 13, 2023

View reviewed changes

andreamah merged commit e4d5a17 into main Feb 13, 2023

andreamah deleted the andreamah/issue148068 branch February 13, 2023 19:46

c-claeys pushed a commit to c-claeys/vscode that referenced this pull request Feb 16, 2023

Add ability to search in notebook inputs (under experimental flag) (m…

1b8da50

…icrosoft#167952)

github-actions bot locked and limited conversation to collaborators Mar 30, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ability to search in notebook inputs (under experimental flag) #167952

Add ability to search in notebook inputs (under experimental flag) #167952

andreamah commented Dec 2, 2022 •

edited

andreamah Feb 7, 2023

andreamah commented Feb 8, 2023

rebornix left a comment

andreamah Feb 10, 2023

roblourens Feb 10, 2023

andreamah Feb 10, 2023

roblourens Feb 10, 2023

andreamah Feb 10, 2023

Add ability to search in notebook inputs (under experimental flag) #167952

Add ability to search in notebook inputs (under experimental flag) #167952

Conversation

andreamah commented Dec 2, 2022 • edited

andreamah Feb 7, 2023

Choose a reason for hiding this comment

andreamah commented Feb 8, 2023

rebornix left a comment

Choose a reason for hiding this comment

andreamah Feb 10, 2023

Choose a reason for hiding this comment

roblourens Feb 10, 2023

Choose a reason for hiding this comment

andreamah Feb 10, 2023

Choose a reason for hiding this comment

roblourens Feb 10, 2023

Choose a reason for hiding this comment

andreamah Feb 10, 2023

Choose a reason for hiding this comment

andreamah commented Dec 2, 2022 •

edited