@codingame/monaco-vscode-search-service-override 1.83.16 → 1.85.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "1.83.16",
+  "version": "1.85.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.16",
-    "monaco-editor": "0.44.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.0",
+    "monaco-editor": "0.45.0"
   }
 }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.css.js

@@ -1,6 +1,6 @@
 import n from '../../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".monaco-workbench .simple-fr-find-part-wrapper{background-color:var(--vscode-editorWidget-background)!important;border-bottom-left-radius:4px;border-bottom-right-radius:4px;box-shadow:0 0 8px 2px var(--vscode-widget-shadow);color:var(--vscode-editorWidget-foreground);max-width:calc(100% - 64px);overflow:hidden;padding:0 var(--notebook-find-horizontal-padding);position:absolute;right:18px;top:-45px;transition:top .2s linear;visibility:hidden;width:var(--notebook-find-width);z-index:10}.monaco-workbench.reduce-motion .simple-fr-find-part-wrapper{transition:top 0ms linear}.monaco-workbench .notebookOverlay .simple-fr-find-part-wrapper.visible{z-index:100}.monaco-workbench .simple-fr-find-part,.monaco-workbench .simple-fr-replace-part{align-items:center;display:flex;margin:0 0 0 17px;padding:4px;pointer-events:all;position:relative;top:0;z-index:10}.monaco-workbench .simple-fr-find-part-wrapper .find-replace-progress{height:2px;position:absolute;width:100%}.monaco-workbench .simple-fr-find-part-wrapper .find-replace-progress .monaco-progress-container{height:2px;top:0!important;z-index:100!important}.monaco-workbench .simple-fr-find-part-wrapper .find-replace-progress .monaco-progress-container .progress-bit{height:2px}.monaco-workbench .simple-fr-find-part-wrapper .monaco-findInput{width:224px}.monaco-workbench .simple-fr-find-part-wrapper .button{align-items:center;background-position:50%;background-repeat:no-repeat;cursor:pointer;display:flex;flex:initial;height:20px;justify-content:center;margin-left:3px;width:20px}.monaco-workbench .simple-fr-find-part-wrapper.visible .simple-fr-find-part{visibility:visible}.monaco-workbench .simple-fr-find-part-wrapper .toggle{align-items:center;box-sizing:border-box;display:flex;height:100%;justify-content:center;margin-left:0;pointer-events:all;position:absolute;top:0;width:18px}.monaco-workbench .simple-fr-find-part-wrapper.visible{visibility:visible}.monaco-workbench .simple-fr-find-part-wrapper.visible-transition{top:0}.monaco-workbench .simple-fr-find-part .monaco-findInput{flex:1}.monaco-workbench .simple-fr-find-part .button{background-position:50%;background-repeat:no-repeat;cursor:pointer;display:flex;flex:initial;height:20px;margin-left:3px;min-width:20px;width:20px}.monaco-workbench .simple-fr-find-part-wrapper .button.disabled{cursor:default;opacity:.3}.monaco-workbench .simple-fr-find-part-wrapper .monaco-custom-toggle.disabled{background-color:inherit!important;cursor:default;opacity:.3;pointer-events:none;user-select:none;-webkit-user-select:none}.monaco-workbench .simple-fr-find-part-wrapper .find-filter-button{box-sizing:border-box;color:inherit;cursor:pointer;float:left;margin-left:2px;user-select:none;-webkit-user-select:none}.find-filter-button .monaco-action-bar .action-label{padding:0}.monaco-workbench .simple-fr-find-part .monaco-inputbox>.ibwrapper>.input,.monaco-workbench .simple-fr-replace-part .monaco-inputbox>.ibwrapper>.input{height:24px}.monaco-workbench .simple-fr-find-part-wrapper .monaco-sash{background-color:var(--vscode-editorWidget-resizeBorder,var(--vscode-editorWidget-border));left:0!important}";
+var css = ".monaco-workbench .simple-fr-find-part-wrapper{background-color:var(--vscode-editorWidget-background)!important;border-bottom-left-radius:4px;border-bottom-right-radius:4px;box-shadow:0 0 8px 2px var(--vscode-widget-shadow);color:var(--vscode-editorWidget-foreground);max-width:calc(100% - 64px);overflow:hidden;padding:0 var(--notebook-find-horizontal-padding);position:absolute;right:18px;top:-45px;transition:top .2s linear;visibility:hidden;width:var(--notebook-find-width);z-index:10}.monaco-workbench.reduce-motion .simple-fr-find-part-wrapper{transition:top 0ms linear}.monaco-workbench .notebookOverlay .simple-fr-find-part-wrapper.visible{z-index:100}.monaco-workbench .simple-fr-find-part,.monaco-workbench .simple-fr-replace-part{align-items:center;display:flex;margin:0 0 0 17px;padding:4px;pointer-events:all;position:relative;top:0;z-index:10}.monaco-workbench .simple-fr-find-part-wrapper .find-replace-progress{height:2px;position:absolute;width:100%}.monaco-workbench .simple-fr-find-part-wrapper .find-replace-progress .monaco-progress-container{top:0!important;z-index:100!important}.monaco-workbench .simple-fr-find-part-wrapper .monaco-findInput{width:224px}.monaco-workbench .simple-fr-find-part-wrapper .button{align-items:center;background-position:50%;background-repeat:no-repeat;cursor:pointer;display:flex;flex:initial;height:20px;justify-content:center;margin-left:3px;width:20px}.monaco-workbench .simple-fr-find-part-wrapper.visible .simple-fr-find-part{visibility:visible}.monaco-workbench .simple-fr-find-part-wrapper .toggle{align-items:center;box-sizing:border-box;display:flex;height:100%;justify-content:center;margin-left:0;pointer-events:all;position:absolute;top:0;width:18px}.monaco-workbench .simple-fr-find-part-wrapper.visible{visibility:visible}.monaco-workbench .simple-fr-find-part-wrapper.visible-transition{top:0}.monaco-workbench .simple-fr-find-part .monaco-findInput{flex:1}.monaco-workbench .simple-fr-find-part .button{background-position:50%;background-repeat:no-repeat;cursor:pointer;display:flex;flex:initial;height:20px;margin-left:3px;min-width:20px;width:20px}.monaco-workbench .simple-fr-find-part-wrapper .button.disabled{cursor:default;opacity:.3}.monaco-workbench .simple-fr-find-part-wrapper .monaco-custom-toggle.disabled{background-color:inherit!important;cursor:default;opacity:.3;pointer-events:none;user-select:none;-webkit-user-select:none}.monaco-workbench .simple-fr-find-part-wrapper .find-filter-button{box-sizing:border-box;color:inherit;cursor:pointer;float:left;margin-left:2px;user-select:none;-webkit-user-select:none}.find-filter-button .monaco-action-bar .action-label{padding:0}.monaco-workbench .simple-fr-find-part .monaco-inputbox>.ibwrapper>.input,.monaco-workbench .simple-fr-replace-part .monaco-inputbox>.ibwrapper>.input{height:24px}.monaco-workbench .simple-fr-find-part-wrapper .monaco-sash{background-color:var(--vscode-editorWidget-resizeBorder,var(--vscode-editorWidget-border));left:0!important}";
 n(css,{});
 
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/search/browser/{notebookSearchContributions.js → notebookSearch/notebookSearchContributions.js}

@@ -1,4 +1,4 @@
-import { ReplacePreviewContentProvider } from './replaceService.js';
+import { ReplacePreviewContentProvider } from '../replaceService.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 

package/vscode/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.js

@@ -13,14 +13,14 @@ import { DefaultQuickAccessFilterValue } from 'monaco-editor/esm/vs/platform/qui
 import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
 import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
 import { searchDetailsIcon, searchOpenInFileIcon } from '../searchIcons.js';
-import { SearchModel, searchComparer, MatchInNotebook } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
+import { SearchModel, searchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { getEditorSelectionFromMatch } from '../searchView.js';
 import { getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
 import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
 
-const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '% ';
+const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '%';
 const DEFAULT_TEXT_QUERY_BUILDER_OPTIONS = {
     _reason: 'quickAccessSearch',
     disregardIgnoreFiles: false,
@@ -62,6 +62,9 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
     }
     provide(picker, token, runOptions) {
         const disposables = ( new DisposableStore());
+        if (TEXT_SEARCH_QUICK_ACCESS_PREFIX.length < picker.value.length) {
+            picker.valueSelection = [TEXT_SEARCH_QUICK_ACCESS_PREFIX.length, picker.value.length];
+        }
         disposables.add(super.provide(picker, token, runOptions));
         disposables.add(picker.onDidHide(() => this.searchModel.searchResult.toggleHighlights(false)));
         disposables.add(picker.onDidAccept(() => this.searchModel.searchResult.toggleHighlights(false)));
@@ -185,8 +188,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                             keyMods,
                             selection: getEditorSelectionFromMatch(element, this.searchModel),
                             preserveFocus: event.inBackground,
-                            forcePinned: event.inBackground,
-                            indexedCellOptions: element instanceof MatchInNotebook ? { index: element.cellIndex, selection: element.range() } : undefined
+                            forcePinned: event.inBackground
                         });
                     }
                 });
@@ -226,7 +228,13 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         return {
             picks: syncResult,
             additionalPicks: allMatches.asyncResults
-                .then(asyncResults => this._getPicksFromMatches(asyncResults, MAX_FILES_SHOWN - matches.length))
+                .then(asyncResults => (asyncResults.length + syncResult.length === 0) ? [{
+                    label: ( localizeWithPath(
+                        'vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess',
+                        'noAnythingResults',
+                        "No matching results"
+                    ))
+                }] : this._getPicksFromMatches(asyncResults, MAX_FILES_SHOWN - matches.length))
                 .then(picks => {
                 if (picks.length > 0) {
                     this.searchModel.searchResult.toggleHighlights(true);

package/vscode/src/vs/workbench/contrib/search/browser/replaceService.js

@@ -186,9 +186,9 @@ let ReplaceService = class ReplaceService {
         const edits = [];
         if (arg instanceof Match) {
             if (arg instanceof MatchInNotebook) {
-                if (!arg.isWebviewMatch()) {
+                if (!arg.isReadonly()) {
                     const match = arg;
-                    edits.push(this.createEdit(match, match.replaceString, match.cell.uri));
+                    edits.push(this.createEdit(match, match.replaceString, match.cell?.uri));
                 }
             }
             else {

package/vscode/src/vs/workbench/contrib/search/browser/search.contribution.js

@@ -15,7 +15,7 @@ import { Extensions, IViewDescriptorService } from 'vscode/vscode/vs/workbench/c
 import { GotoSymbolQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
 import { AnythingQuickAccessProvider } from './anythingQuickAccess.js';
 import { registerContributions } from './replaceContributions.js';
-import { registerContributions as registerContributions$1 } from './notebookSearchContributions.js';
+import { registerContributions as registerContributions$1 } from './notebookSearch/notebookSearchContributions.js';
 import { searchViewIcon } from './searchIcons.js';
 import { SearchView } from './searchView.js';
 import { registerContributions as registerContributions$2 } from './searchWidget.js';
@@ -41,11 +41,11 @@ registerContributions$2();
 const SEARCH_MODE_CONFIG = 'search.mode';
 const viewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: VIEWLET_ID,
-    title: { value: ( nls.localizeWithPath(
+    title: ( nls.localize2WithPath(
         'vs/workbench/contrib/search/browser/search.contribution',
-        'name',
+        'search',
         "Search"
-    )), original: 'Search' },
+    )),
     ctorDescriptor: ( new SyncDescriptor(
         ViewPaneContainer,
         [VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }]
@@ -57,7 +57,7 @@ const viewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).register
 const viewDescriptor = {
     id: VIEW_ID,
     containerIcon: searchViewIcon,
-    name: ( nls.localizeWithPath(
+    name: ( nls.localize2WithPath(
         'vs/workbench/contrib/search/browser/search.contribution',
         'search',
         "Search"
@@ -84,7 +84,7 @@ let RegisterSearchViewContribution = class RegisterSearchViewContribution {
     constructor(configurationService, viewDescriptorService) {
         const data = configurationService.inspect('search.location');
         if (data.value === 'panel') {
-            viewDescriptorService.moveViewToLocation(viewDescriptor, 1 );
+            viewDescriptorService.moveViewToLocation(viewDescriptor, 1 , 'search.location');
         }
         ( Registry.as(Extensions$4.ConfigurationMigration))
             .registerConfigurationMigrations([{ key: 'search.location', migrateFn: (value) => ({ value: undefined }) }]);
@@ -271,7 +271,7 @@ configurationRegistry.registerConfiguration({
             markdownDescription: ( nls.localizeWithPath(
                 'vs/workbench/contrib/search/browser/search.contribution',
                 'useGlobalIgnoreFiles',
-                "Controls whether to use your global gitignore file (e.g., from `$HOME/.config/git/ignore`) when searching for files. Requires `#search.useIgnoreFiles#` to be enabled."
+                "Controls whether to use your global gitignore file (for example, from `$HOME/.config/git/ignore`) when searching for files. Requires `#search.useIgnoreFiles#` to be enabled."
             )),
             default: false,
             scope: 4

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js

@@ -10,8 +10,7 @@ const category = { value: ( nls.localizeWithPath(
 )), original: 'Search' };
 function isSearchViewFocused(viewsService) {
     const searchView = getSearchView(viewsService);
-    const activeElement = document.activeElement;
-    return !!(searchView && activeElement && dom.isAncestor(activeElement, searchView.getContainer()));
+    return !!(searchView && dom.isAncestorOfActiveElement(searchView.getContainer()));
 }
 function appendKeyBindingLabel(label, inputKeyBinding) {
     return doAppendKeyBindingLabel(label, inputKeyBinding);

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js

@@ -151,7 +151,7 @@ registerAction2(class FindInFilesAction extends Action2 {
                 )),
                 original: 'Find in Files'
             },
-            description: {
+            metadata: {
                 description: ( nls.localizeWithPath(
                     'vs/workbench/contrib/search/browser/searchActionsFind',
                     'findInFiles.description',

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsNav.js

@@ -13,6 +13,7 @@ import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/
 import { ToggleCaseSensitiveKeybinding, ToggleWholeWordKeybinding, ToggleRegexKeybinding, TogglePreserveCaseKeybinding } from 'monaco-editor/esm/vs/editor/contrib/find/browser/findModel.js';
 import { category, getSearchView, openSearchView } from './searchActionsBase.js';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
+import { getActiveElement } from 'monaco-editor/esm/vs/base/browser/dom.js';
 
 registerAction2(class ToggleQueryDetailsAction extends Action2 {
     constructor() {
@@ -35,7 +36,7 @@ registerAction2(class ToggleQueryDetailsAction extends Action2 {
         });
     }
     run(accessor, ...args) {
-        const contextService = accessor.get(IContextKeyService).getContext(document.activeElement);
+        const contextService = accessor.get(IContextKeyService).getContext(getActiveElement());
         if (contextService.getValue(InSearchEditor.serialize())) {
             accessor.get(IEditorService).activeEditorPane.toggleQueryDetails(args[0]?.show);
         }

package/vscode/src/vs/workbench/contrib/search/browser/searchResultsView.js

@@ -269,12 +269,12 @@ let MatchRenderer = class MatchRenderer extends Disposable {
     }
     renderTemplate(container) {
         container.classList.add('linematch');
+        const lineNumber = dom.append(container, dom.$('span.matchLineNum'));
         const parent = dom.append(container, dom.$('a.plain.match'));
         const before = dom.append(parent, dom.$('span'));
         const match = dom.append(parent, dom.$('span.findInFileMatch'));
         const replace = dom.append(parent, dom.$('span.replaceMatch'));
         const after = dom.append(parent, dom.$('span'));
-        const lineNumber = dom.append(container, dom.$('span.matchLineNum'));
         const actionBarContainer = dom.append(container, dom.$('span.actionBarContainer'));
         const disposables = ( new DisposableStore());
         const contextKeyServiceMain = disposables.add(this.contextKeyService.createScoped(container));
@@ -306,18 +306,20 @@ let MatchRenderer = class MatchRenderer extends Disposable {
     renderElement(node, index, templateData) {
         const match = node.element;
         const preview = match.preview();
-        const replace = this.searchModel.isReplaceActive() && !!this.searchModel.replaceString && !(match instanceof MatchInNotebook && match.isWebviewMatch());
+        const replace = this.searchModel.isReplaceActive() &&
+            !!this.searchModel.replaceString &&
+            !(match instanceof MatchInNotebook && match.isReadonly());
         templateData.before.textContent = preview.before;
         templateData.match.textContent = preview.inside;
         templateData.match.classList.toggle('replace', replace);
         templateData.replace.textContent = replace ? match.replaceString : '';
         templateData.after.textContent = preview.after;
         templateData.parent.title = (preview.before + (replace ? match.replaceString : preview.inside) + preview.after).trim().substr(0, 999);
-        IsEditableItemKey.bindTo(templateData.contextKeyService).set(!(match instanceof MatchInNotebook && match.isWebviewMatch()));
+        IsEditableItemKey.bindTo(templateData.contextKeyService).set(!(match instanceof MatchInNotebook && match.isReadonly()));
         const numLines = match.range().endLineNumber - match.range().startLineNumber;
         const extraLinesStr = numLines > 0 ? `+${numLines}` : '';
         const showLineNumbers = this.configurationService.getValue('search').showLineNumbers;
-        const lineNumberStr = showLineNumbers ? `:${match.range().startLineNumber}` : '';
+        const lineNumberStr = showLineNumbers ? `${match.range().startLineNumber}:` : '';
         templateData.lineNumber.classList.toggle('show', (numLines > 0) || showLineNumbers);
         templateData.lineNumber.textContent = lineNumberStr + extraLinesStr;
         templateData.lineNumber.setAttribute('title', this.getMatchTitle(match, showLineNumbers));

package/vscode/src/vs/workbench/contrib/search/browser/searchView.js

@@ -13,14 +13,14 @@ import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import * as network from 'monaco-editor/esm/vs/base/common/network.js';
 import './media/searchview.css.js';
-import { isCodeEditor, isDiffEditor, getCodeEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
+import { isCodeEditor, getCodeEditor, isDiffEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
 import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
 import { EmbeddedCodeEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/embeddedCodeEditorWidget.js';
 import { Selection } from 'monaco-editor/esm/vs/editor/common/core/selection.js';
 import { CommonFindController } from 'monaco-editor/esm/vs/editor/contrib/find/browser/findController.js';
 import { MultiCursorSelectionController } from 'monaco-editor/esm/vs/editor/contrib/multicursor/browser/multicursor.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { IAccessibilityService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
+import { IAccessibilityService, IAccessibleNotificationService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
 import { MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
@@ -81,7 +81,7 @@ const DEBOUNCE_DELAY = 75;
 let SearchView = class SearchView extends ViewPane {
     static { SearchView_1 = this; }
     static { this.ACTIONS_RIGHT_CLASS_NAME = 'actions-right'; }
-    constructor(options, fileService, editorService, codeEditorService, progressService, notificationService, dialogService, commandService, contextViewService, instantiationService, viewDescriptorService, configurationService, contextService, searchViewModelWorkbenchService, contextKeyService, replaceService, textFileService, preferencesService, themeService, searchHistoryService, contextMenuService, accessibilityService, keybindingService, storageService, openerService, telemetryService, notebookService, logService) {
+    constructor(options, fileService, editorService, codeEditorService, progressService, notificationService, dialogService, commandService, contextViewService, instantiationService, viewDescriptorService, configurationService, contextService, searchViewModelWorkbenchService, contextKeyService, replaceService, textFileService, preferencesService, themeService, searchHistoryService, contextMenuService, accessibilityService, keybindingService, storageService, openerService, telemetryService, notebookService, logService, accessibleNotificationService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
         this.fileService = fileService;
         this.editorService = editorService;
@@ -101,6 +101,7 @@ let SearchView = class SearchView extends ViewPane {
         this.storageService = storageService;
         this.notebookService = notebookService;
         this.logService = logService;
+        this.accessibleNotificationService = accessibleNotificationService;
         this.isDisposed = false;
         this.lastFocusState = 'input';
         this.messageDisposables = ( new DisposableStore());
@@ -812,7 +813,7 @@ let SearchView = class SearchView extends ViewPane {
             }
             let editable = false;
             if (focus instanceof Match) {
-                editable = (focus instanceof MatchInNotebook) ? !focus.isWebviewMatch() : true;
+                editable = (focus instanceof MatchInNotebook) ? !focus.isReadonly() : true;
             }
             else if (focus instanceof FileMatch) {
                 editable = !focus.hasOnlyReadOnlyMatches();
@@ -952,7 +953,7 @@ let SearchView = class SearchView extends ViewPane {
         return this.updateTextFromSelection({ allowUnselectedWord, allowSearchOnType }, activeEditor);
     }
     updateTextFromFindWidget(controller, { allowSearchOnType = true }) {
-        if (!this.searchConfig.seedWithNearestWord && (window.getSelection()?.toString() ?? '') === '') {
+        if (!this.searchConfig.seedWithNearestWord && (dom.getActiveWindow().getSelection()?.toString() ?? '') === '') {
             return false;
         }
         const searchString = controller.getState().searchString;
@@ -1102,11 +1103,7 @@ let SearchView = class SearchView extends ViewPane {
             'emptySearch',
             "Empty Search"
         ));
-        aria.status(( nls.localizeWithPath(
-            'vs/workbench/contrib/search/browser/searchView',
-            'ariaSearchResultsClearStatus',
-            "The search results have been cleared"
-        )));
+        this.accessibleNotificationService.notify("clear" );
         this.reLayout();
     }
     clearFilePatternFields() {
@@ -1134,18 +1131,10 @@ let SearchView = class SearchView extends ViewPane {
         }
     }
     getSearchTextFromEditor(allowUnselectedWord, editor) {
-        if (dom.isAncestor(document.activeElement, this.getContainer())) {
+        if (dom.isAncestorOfActiveElement(this.getContainer())) {
             return null;
         }
         editor = editor ?? this.editorService.activeTextEditorControl;
-        if (isDiffEditor(editor)) {
-            if (editor.getOriginalEditor().hasTextFocus()) {
-                editor = editor.getOriginalEditor();
-            }
-            else {
-                editor = editor.getModifiedEditor();
-            }
-        }
         if (!editor) {
             return null;
         }
@@ -1985,7 +1974,8 @@ SearchView = SearchView_1 = ( __decorate([
     ( __param(24, IOpenerService)),
     ( __param(25, ITelemetryService)),
     ( __param(26, INotebookService)),
-    ( __param(27, ILogService))
+    ( __param(27, ILogService)),
+    ( __param(28, IAccessibleNotificationService))
 ], SearchView));
 class SearchLinkButton extends Disposable {
     constructor(label, handler, tooltip) {
@@ -2032,7 +2022,16 @@ function getEditorSelectionFromMatch(element, viewModel) {
     }
     return undefined;
 }
-function getSelectionTextFromEditor(allowUnselectedWord, editor) {
+function getSelectionTextFromEditor(allowUnselectedWord, activeEditor) {
+    let editor = activeEditor;
+    if (isDiffEditor(editor)) {
+        if (editor.getOriginalEditor().hasTextFocus()) {
+            editor = editor.getOriginalEditor();
+        }
+        else {
+            editor = editor.getModifiedEditor();
+        }
+    }
     if (!isCodeEditor(editor) || !editor.hasModel()) {
         return null;
     }

package/vscode/src/vs/workbench/contrib/search/browser/searchWidget.js

@@ -139,7 +139,7 @@ let SearchWidget = class SearchWidget extends Widget {
         this._register(this.editorService.onDidEditorsChange((e) => {
             if (this.searchInput instanceof SearchFindInput &&
                 e.event.editor instanceof NotebookEditorInput &&
-                ((e.event.kind === 3  || e.event.kind === 4) )) {
+                ((e.event.kind === 4  || e.event.kind === 5) )) {
                 this.searchInput.filterVisible = this._hasNotebookOpen();
             }
         }));

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.js

@@ -26,6 +26,7 @@ import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/searc
 import { RegisteredEditorPriority, IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { getActiveElement } from 'monaco-editor/esm/vs/base/browser/dom.js';
 
 const OpenInEditorCommandId = 'search.action.openInEditor';
 const OpenNewEditorToSideCommandId = 'search.action.openNewEditorToSide';
@@ -140,7 +141,7 @@ const translateLegacyConfig = (legacyConfig = {}) => {
     });
     return config;
 };
-const openArgDescription = {
+const openArgMetadata = {
     description: 'Open a new search editor. Arguments passed can include variables like ${relativeFileDirname}.',
     args: [{
             name: 'Open new Search Editor args',
@@ -181,7 +182,7 @@ registerAction2(class extends Action2 {
         });
     }
     async run(accessor) {
-        const contextService = accessor.get(IContextKeyService).getContext(document.activeElement);
+        const contextService = accessor.get(IContextKeyService).getContext(getActiveElement());
         if (contextService.getValue(InSearchEditor.serialize())) {
             accessor.get(IEditorService).activeEditorPane.deleteResultBlock();
         }
@@ -198,7 +199,7 @@ registerAction2(class extends Action2 {
             )), original: 'New Search Editor' },
             category,
             f1: true,
-            description: openArgDescription
+            metadata: openArgMetadata
         });
     }
     async run(accessor, args) {
@@ -216,7 +217,7 @@ registerAction2(class extends Action2 {
             )), original: 'Open Search Editor' },
             category,
             f1: true,
-            description: openArgDescription
+            metadata: openArgMetadata
         });
     }
     async run(accessor, args) {
@@ -234,7 +235,7 @@ registerAction2(class extends Action2 {
             )), original: 'Open new Search Editor to the Side' },
             category,
             f1: true,
-            description: openArgDescription
+            metadata: openArgMetadata
         });
     }
     async run(accessor, args) {

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.js

@@ -224,6 +224,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         return this.searchResultEditor;
     }
     focus() {
+        super.focus();
         const viewState = this.loadEditorViewState(this.getInput());
         if (viewState && viewState.focused === 'editor') {
             this.searchResultEditor.focus();
@@ -618,7 +619,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         }
         this.searchResultEditor.setModel(resultsModel);
         this.pauseSearching = true;
-        this.toggleRunAgainMessage(!newInput.ongoingSearchOperation && resultsModel.getLineCount() === 1 && resultsModel.getValue() === '' && configurationModel.config.query !== '');
+        this.toggleRunAgainMessage(!newInput.ongoingSearchOperation && resultsModel.getLineCount() === 1 && resultsModel.getValueLength() === 0 && configurationModel.config.query !== '');
         this.setSearchConfig(configurationModel.config);
         this._register(configurationModel.onConfigDidUpdate(newConfig => {
             if (newConfig !== this.priorConfig) {

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.js

@@ -91,7 +91,7 @@ function matchesToSearchResultFormat(resource, sortedMatches, matchContext, labe
     return { text, matchRanges };
 }
 function cellMatchToSearchResultFormat(cellMatch, labelFormatter, shouldUseHeader) {
-    return matchesToSearchResultFormat(cellMatch.cell.uri, cellMatch.contentMatches.sort(searchMatchComparer), cellMatch.context, labelFormatter, shouldUseHeader);
+    return matchesToSearchResultFormat(cellMatch.cell?.uri ?? cellMatch.parent.resource, cellMatch.contentMatches.sort(searchMatchComparer), cellMatch.context, labelFormatter, shouldUseHeader);
 }
 const contentPatternToSearchConfiguration = (pattern, includes, excludes, contextLines) => {
     return {

package/vscode/src/vs/workbench/services/search/common/searchService.js

@@ -16,7 +16,7 @@ import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workb
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { deserializeSearchError, SearchErrorCode, SEARCH_RESULT_LANGUAGE_ID, FileMatch, pathIncludedInQuery, isFileMatch, isProgressMessage } from 'vscode/vscode/vs/workbench/services/search/common/search';
-import { editorMatchesToTextSearchResults, addContextToEditorMatches } from 'vscode/vscode/vs/workbench/services/search/common/searchHelpers';
+import { editorMatchesToTextSearchResults, getTextSearchMatchWithModelContext } from 'vscode/vscode/vs/workbench/services/search/common/searchHelpers';
 
 let SearchService = class SearchService extends Disposable {
     constructor(modelService, editorService, telemetryService, logService, extensionService, fileService, uriIdentityService) {
@@ -338,7 +338,7 @@ let SearchService = class SearchService extends Disposable {
                     const fileMatch = ( new FileMatch(originalResource));
                     openEditorResults.set(originalResource, fileMatch);
                     const textSearchResults = editorMatchesToTextSearchResults(matches, model, query.previewOptions);
-                    fileMatch.results = addContextToEditorMatches(textSearchResults, model, query);
+                    fileMatch.results = getTextSearchMatchWithModelContext(textSearchResults, model, query);
                 }
                 else {
                     openEditorResults.set(originalResource, null);