development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 11:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Toggle cells with matches to editing mode only. (#180164)

Browse source 
* Switch cells to editing mode once there is replace str.

* Toggle cells with matches to editing mode only
This commit is contained in:
Peng Lyu 2023-04-17 14:05:35 -07:00 committed by GitHub
parent b242a8730c
commit 88072ceeb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts
View file

@ -126,11 +126,37 @@ export class FindModel extends Disposable {
// we only update cell state if users are using the hybrid mode (both input and preview are enabled)
const updateEditingState = (editing: boolean) => {
const viewModel = this._notebookEditor._getViewModel() as NotebookViewModel | undefined;
if (viewModel) {
if (!viewModel) {
return;
}
if (!editing) {
for (let i = 0; i < viewModel.length; i++) {
const cell = viewModel.cellAt(i);
if (cell && cell.cellKind === CellKind.Markup) {
cell.updateEditState(editing ? CellEditState.Editing : CellEditState.Preview, 'Find');
cell.updateEditState(CellEditState.Preview, 'Find');
}
}
} else {
// search markup sources first to decide if a markup cell should be in editing mode
const wordSeparators = this._configurationService.inspect<string>('editor.wordSeparators').value;
const options: INotebookSearchOptions = {
regex: this._state.isRegex,
wholeWord: this._state.wholeWord,
caseSensitive: this._state.matchCase,
wordSeparators: wordSeparators,
includeMarkupInput: true,
includeCodeInput: false,
includeMarkupPreview: false,
includeOutput: false
};
const contentMatches = viewModel.find(this._state.searchString, options);
for (let i = 0; i < viewModel.length; i++) {
const cell = viewModel.cellAt(i);
if (cell && cell.cellKind === CellKind.Markup) {
const foundContentMatch = contentMatches.find(m => m.cell.handle === cell.handle && m.contentMatches.length > 0);
cell.updateEditState(foundContentMatch ? CellEditState.Editing : CellEditState.Preview, 'Find');
}
}
}
@ -144,7 +170,7 @@ export class FindModel extends Disposable {
updateEditingState(false);
}
if (e.replaceString && this._state.isRevealed && this._state.isReplaceRevealed && this._state.replaceString.length > 0) {
if ((e.searchString || e.replaceString) && this._state.isRevealed && this._state.isReplaceRevealed && this._state.replaceString.length > 0) {
updateEditingState(true);
}
}