@codingame/monaco-vscode-search-service-override 6.0.2 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "6.0.2",
+  "version": "7.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -29,6 +29,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@6.0.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.0.0"
   }
 }

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

@@ -22,7 +22,7 @@ import { registerContributions as registerContributions$1 } from './searchWidget
 import { SymbolsQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
 import '../common/searchHistoryService.js';
 import 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
-import { VIEWLET_ID, VIEW_ID, SEARCH_EXCLUDE_CONFIG, SearchSortOrder, ViewMode } from 'vscode/vscode/vs/workbench/services/search/common/search';
+import { VIEWLET_ID, VIEW_ID, SEARCH_EXCLUDE_CONFIG, DEFAULT_MAX_SEARCH_RESULTS, SearchSortOrder, ViewMode } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { assertType } from 'vscode/vscode/vs/base/common/types';
 import { getWorkspaceSymbols } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
@@ -218,7 +218,8 @@ configurationRegistry.registerConfiguration({
             markdownDescription: ( localizeWithPath(
                 _moduleId,
                 21,
-                "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."
+                "Controls whether to use your global gitignore file (for example, from `$HOME/.config/git/ignore`) when searching for files. Requires {0} to be enabled.",
+                '`#search.useIgnoreFiles#`'
             )),
             default: false,
             scope: ConfigurationScope.RESOURCE
@@ -228,7 +229,8 @@ configurationRegistry.registerConfiguration({
             markdownDescription: ( localizeWithPath(
                 _moduleId,
                 22,
-                "Controls whether to use `.gitignore` and `.ignore` files in parent directories when searching for files. Requires `#search.useIgnoreFiles#` to be enabled."
+                "Controls whether to use `.gitignore` and `.ignore` files in parent directories when searching for files. Requires {0} to be enabled.",
+                '`#search.useIgnoreFiles#`'
             )),
             default: false,
             scope: ConfigurationScope.RESOURCE
@@ -242,11 +244,20 @@ configurationRegistry.registerConfiguration({
             )),
             default: false
         },
+        'search.ripgrep.maxThreads': {
+            type: 'number',
+            description: ( localizeWithPath(
+                _moduleId,
+                24,
+                "Number of threads to use for searching. When set to 0, the engine automatically determines this value."
+            )),
+            default: 0
+        },
         'search.quickOpen.includeHistory': {
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                24,
+                25,
                 "Whether to include results from recently opened files in the file results for Quick Open."
             )),
             default: true
@@ -258,31 +269,31 @@ configurationRegistry.registerConfiguration({
             enumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    25,
+                    26,
                     'History entries are sorted by relevance based on the filter value used. More relevant entries appear first.'
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    26,
+                    27,
                     'History entries are sorted by recency. More recently opened entries appear first.'
                 ))
             ],
             description: ( localizeWithPath(
                 _moduleId,
-                27,
+                28,
                 "Controls sorting order of editor history in quick open when filtering."
             ))
         },
         'search.followSymlinks': {
             type: 'boolean',
-            description: ( localizeWithPath(_moduleId, 28, "Controls whether to follow symlinks while searching.")),
+            description: ( localizeWithPath(_moduleId, 29, "Controls whether to follow symlinks while searching.")),
             default: true
         },
         'search.smartCase': {
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                29,
+                30,
                 "Search case-insensitively if the pattern is all lowercase, otherwise, search case-sensitively."
             )),
             default: false
@@ -292,7 +303,7 @@ configurationRegistry.registerConfiguration({
             default: false,
             description: ( localizeWithPath(
                 _moduleId,
-                30,
+                31,
                 "Controls whether the search view should read or modify the shared find clipboard on macOS."
             )),
             included: isMacintosh
@@ -303,21 +314,21 @@ configurationRegistry.registerConfiguration({
             default: 'sidebar',
             description: ( localizeWithPath(
                 _moduleId,
-                31,
+                32,
                 "Controls whether the search will be shown as a view in the sidebar or as a panel in the panel area for more horizontal space."
             )),
             deprecationMessage: ( localizeWithPath(
                 _moduleId,
-                32,
+                33,
                 "This setting is deprecated. You can drag the search icon to a new location instead."
             ))
         },
         'search.maxResults': {
             type: ['number', 'null'],
-            default: 20000,
+            default: DEFAULT_MAX_SEARCH_RESULTS,
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                33,
+                34,
                 "Controls the maximum number of search results, this can be set to `null` (empty) to return unlimited results."
             ))
         },
@@ -327,7 +338,7 @@ configurationRegistry.registerConfiguration({
             enumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    34,
+                    35,
                     "Files with less than 10 results are expanded. Others are collapsed."
                 )),
                 '',
@@ -336,7 +347,7 @@ configurationRegistry.registerConfiguration({
             default: 'alwaysExpand',
             description: ( localizeWithPath(
                 _moduleId,
-                35,
+                36,
                 "Controls whether the search results will be collapsed or expanded."
             )),
         },
@@ -345,26 +356,26 @@ configurationRegistry.registerConfiguration({
             default: true,
             description: ( localizeWithPath(
                 _moduleId,
-                36,
+                37,
                 "Controls whether to open Replace Preview when selecting or replacing a match."
             )),
         },
         'search.showLineNumbers': {
             type: 'boolean',
             default: false,
-            description: ( localizeWithPath(_moduleId, 37, "Controls whether to show line numbers for search results.")),
+            description: ( localizeWithPath(_moduleId, 38, "Controls whether to show line numbers for search results.")),
         },
         'search.usePCRE2': {
             type: 'boolean',
             default: false,
             description: ( localizeWithPath(
                 _moduleId,
-                38,
+                39,
                 "Whether to use the PCRE2 regex engine in text search. This enables using some advanced regex features like lookahead and backreferences. However, not all PCRE2 features are supported - only features that are also supported by JavaScript."
             )),
             deprecationMessage: ( localizeWithPath(
                 _moduleId,
-                39,
+                40,
                 "Deprecated. PCRE2 will be used automatically when using regex features that are only supported by PCRE2."
             )),
         },
@@ -374,29 +385,29 @@ configurationRegistry.registerConfiguration({
             enumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    40,
+                    41,
                     "Position the actionbar to the right when the search view is narrow, and immediately after the content when the search view is wide."
                 )),
-                ( localizeWithPath(_moduleId, 41, "Always position the actionbar to the right.")),
+                ( localizeWithPath(_moduleId, 42, "Always position the actionbar to the right.")),
             ],
             default: 'right',
             description: ( localizeWithPath(
                 _moduleId,
-                42,
+                43,
                 "Controls the positioning of the actionbar on rows in the search view."
             ))
         },
         'search.searchOnType': {
             type: 'boolean',
             default: true,
-            description: ( localizeWithPath(_moduleId, 43, "Search all files as you type."))
+            description: ( localizeWithPath(_moduleId, 44, "Search all files as you type."))
         },
         'search.seedWithNearestWord': {
             type: 'boolean',
             default: false,
             description: ( localizeWithPath(
                 _moduleId,
-                44,
+                45,
                 "Enable seeding search from the word nearest the cursor when the active editor has no selection."
             ))
         },
@@ -405,7 +416,7 @@ configurationRegistry.registerConfiguration({
             default: false,
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                45,
+                46,
                 "Update the search query to the editor's selected text when focusing the search view. This happens either on click or when triggering the `workbench.views.search.focus` command."
             ))
         },
@@ -414,7 +425,7 @@ configurationRegistry.registerConfiguration({
             default: 300,
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                46,
+                47,
                 "When {0} is enabled, controls the timeout in milliseconds between a character being typed and the search starting. Has no effect when {0} is disabled.",
                 '`#search.searchOnType#`'
             ))
@@ -424,21 +435,21 @@ configurationRegistry.registerConfiguration({
             enum: ['selectWord', 'goToLocation', 'openLocationToSide'],
             default: 'goToLocation',
             enumDescriptions: [
-                ( localizeWithPath(_moduleId, 47, "Double-clicking selects the word under the cursor.")),
+                ( localizeWithPath(_moduleId, 48, "Double-clicking selects the word under the cursor.")),
                 ( localizeWithPath(
                     _moduleId,
-                    48,
+                    49,
                     "Double-clicking opens the result in the active editor group."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    49,
+                    50,
                     "Double-clicking opens the result in the editor group to the side, creating one if it does not yet exist."
                 )),
             ],
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                50,
+                51,
                 "Configure effect of double-clicking a result in a search editor."
             ))
         },
@@ -447,12 +458,12 @@ configurationRegistry.registerConfiguration({
             enum: ['default', 'peekDefinition',],
             default: 'default',
             enumDescriptions: [
-                ( localizeWithPath(_moduleId, 51, "Single-clicking does nothing.")),
-                ( localizeWithPath(_moduleId, 52, "Single-clicking opens a Peek Definition window.")),
+                ( localizeWithPath(_moduleId, 52, "Single-clicking does nothing.")),
+                ( localizeWithPath(_moduleId, 53, "Single-clicking opens a Peek Definition window.")),
             ],
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                53,
+                54,
                 "Configure effect of single-clicking a result in a search editor."
             ))
         },
@@ -461,7 +472,7 @@ configurationRegistry.registerConfiguration({
             default: false,
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                54,
+                55,
                 "When enabled, new Search Editors will reuse the includes, excludes, and flags of the previously opened Search Editor."
             ))
         },
@@ -470,7 +481,7 @@ configurationRegistry.registerConfiguration({
             default: 1,
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                55,
+                56,
                 "The default number of surrounding context lines to use when creating new Search Editors. If using `#search.searchEditor.reusePriorSearchConfiguration#`, this can be set to `null` (empty) to use the prior Search Editor's configuration."
             ))
         },
@@ -481,38 +492,38 @@ configurationRegistry.registerConfiguration({
             enumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    56,
+                    57,
                     "Results are sorted by folder and file names, in alphabetical order."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    57,
+                    58,
                     "Results are sorted by file names ignoring folder order, in alphabetical order."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    58,
+                    59,
                     "Results are sorted by file extensions, in alphabetical order."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    59,
+                    60,
                     "Results are sorted by file last modified date, in descending order."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    60,
+                    61,
                     "Results are sorted by count per file, in descending order."
                 )),
-                ( localizeWithPath(_moduleId, 61, "Results are sorted by count per file, in ascending order."))
+                ( localizeWithPath(_moduleId, 62, "Results are sorted by count per file, in ascending order."))
             ],
-            description: ( localizeWithPath(_moduleId, 62, "Controls sorting order of search results."))
+            description: ( localizeWithPath(_moduleId, 63, "Controls sorting order of search results."))
         },
         'search.decorations.colors': {
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                63,
+                64,
                 "Controls whether search file decorations should use colors."
             )),
             default: true
@@ -521,7 +532,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                64,
+                65,
                 "Controls whether search file decorations should use badges."
             )),
             default: true
@@ -531,16 +542,16 @@ configurationRegistry.registerConfiguration({
             enum: [ViewMode.Tree, ViewMode.List],
             default: ViewMode.List,
             enumDescriptions: [
-                ( localizeWithPath(_moduleId, 65, "Shows search results as a tree.")),
-                ( localizeWithPath(_moduleId, 66, "Shows search results as a list."))
+                ( localizeWithPath(_moduleId, 66, "Shows search results as a tree.")),
+                ( localizeWithPath(_moduleId, 67, "Shows search results as a list."))
             ],
-            description: ( localizeWithPath(_moduleId, 67, "Controls the default search result view mode."))
+            description: ( localizeWithPath(_moduleId, 68, "Controls the default search result view mode."))
         },
         'search.quickAccess.preserveInput': {
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                68,
+                69,
                 "Controls whether the last typed input to Quick Search should be restored when opening it the next time."
             )),
             default: false
@@ -549,7 +560,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                69,
+                70,
                 "Show notebook editor rich content results for closed notebooks. Please refresh your search results after changing this setting."
             )),
             default: false

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

@@ -83,7 +83,7 @@ let FolderMatchRenderer = class FolderMatchRenderer extends Disposable {
         SearchContext.MatchFocusKey.bindTo(contextKeyServiceMain).set(false);
         SearchContext.FileFocusKey.bindTo(contextKeyServiceMain).set(false);
         SearchContext.FolderFocusKey.bindTo(contextKeyServiceMain).set(true);
-        const instantiationService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, contextKeyServiceMain]))));
+        const instantiationService = this._register(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, contextKeyServiceMain])))));
         const actions = disposables.add(instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, MenuId.SearchActionMenu, {
             menuOptions: {
                 shouldForwardArgs: true
@@ -286,7 +286,7 @@ let MatchRenderer = class MatchRenderer extends Disposable {
         templateData.replace.textContent = replace ? match.replaceString : '';
         templateData.after.textContent = preview.after;
         const title = (preview.fullBefore + (replace ? match.replaceString : preview.inside) + preview.after).trim().substr(0, 999);
-        templateData.disposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), templateData.parent, title));
+        templateData.disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), templateData.parent, title));
         SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!(match instanceof MatchInNotebook && match.isReadonly()));
         const numLines = match.range().endLineNumber - match.range().startLineNumber;
         const extraLinesStr = numLines > 0 ? `+${numLines}` : '';
@@ -294,7 +294,7 @@ let MatchRenderer = class MatchRenderer extends Disposable {
         const lineNumberStr = showLineNumbers ? `${match.range().startLineNumber}:` : '';
         templateData.lineNumber.classList.toggle('show', (numLines > 0) || showLineNumbers);
         templateData.lineNumber.textContent = lineNumberStr + extraLinesStr;
-        templateData.disposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), templateData.lineNumber, this.getMatchTitle(match, showLineNumbers)));
+        templateData.disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), templateData.lineNumber, this.getMatchTitle(match, showLineNumbers)));
         templateData.actions.context = { viewer: this.searchView.getControl(), element: match };
     }
     disposeTemplate(templateData) {

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

@@ -118,6 +118,8 @@ let SearchView = class SearchView extends ViewPane {
         this.currentSearchQ = Promise.resolve();
         this.pauseSearching = false;
         this._visibleMatches = 0;
+        this._stashedQueryDetailsVisibility = undefined;
+        this._stashedReplaceVisibility = undefined;
         this.container = $$1('.search-view');
         this.viewletVisible = SearchContext.SearchViewVisibleKey.bindTo(this.contextKeyService);
         this.firstMatchFocused = SearchContext.FirstMatchFocusKey.bindTo(this.contextKeyService);
@@ -148,7 +150,7 @@ let SearchView = class SearchView extends ViewPane {
         this.inputPatternIncludesFocused = SearchContext.PatternIncludesFocusedKey.bindTo(this.contextKeyService);
         this.inputPatternExclusionsFocused = SearchContext.PatternExcludesFocusedKey.bindTo(this.contextKeyService);
         this.isEditableItem = SearchContext.IsEditableItemKey.bindTo(this.contextKeyService);
-        this.instantiationService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.contextKeyService]))));
+        this.instantiationService = this._register(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.contextKeyService])))));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('search.sortOrder')) {
                 if (this.searchConfig.sortOrder === SearchSortOrder.Modified) {
@@ -219,6 +221,24 @@ let SearchView = class SearchView extends ViewPane {
         if (visible === this.aiResultsVisible) {
             return;
         }
+        if (visible) {
+            this._stashedQueryDetailsVisibility = this._queryDetailsHidden();
+            this._stashedReplaceVisibility = this.searchWidget.isReplaceShown();
+            this.searchWidget.toggleReplace(false);
+            this.toggleQueryDetailsButton.style.display = 'none';
+            this.searchWidget.replaceButtonVisibility = false;
+            this.toggleQueryDetails(undefined, false);
+        }
+        else {
+            this.toggleQueryDetailsButton.style.display = '';
+            this.searchWidget.replaceButtonVisibility = true;
+            if (this._stashedReplaceVisibility) {
+                this.searchWidget.toggleReplace(this._stashedReplaceVisibility);
+            }
+            if (this._stashedQueryDetailsVisibility) {
+                this.toggleQueryDetails(undefined, this._stashedQueryDetailsVisibility);
+            }
+        }
         this.aiResultsVisible = visible;
         if (this.viewModel.searchResult.isEmpty()) {
             return;
@@ -227,9 +247,6 @@ let SearchView = class SearchView extends ViewPane {
         if (visible) {
             await this.model.addAIResults();
         }
-        else {
-            this.searchWidget.toggleReplace(false);
-        }
         this.onSearchResultsChanged();
         this.onSearchComplete(() => { }, undefined, undefined, this.viewModel.searchResult.getCachedSearchComplete(visible));
     }
@@ -323,7 +340,7 @@ let SearchView = class SearchView extends ViewPane {
             this.viewletState['query.useExcludesAndIgnoreFiles'] : true;
         this.queryDetails = append(this.searchWidgetsContainerElement, $('.query-details'));
         this.toggleQueryDetailsButton = append(this.queryDetails, $('.more' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button' }));
-        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, ( localizeWithPath(_moduleId, 1, "Toggle Search Details"))));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, ( localizeWithPath(_moduleId, 1, "Toggle Search Details"))));
         this._register(addDisposableListener(this.toggleQueryDetailsButton, EventType.CLICK, e => {
             EventHelper.stop(e);
             this.toggleQueryDetails(!this.accessibilityService.isScreenReaderOptimized());
@@ -1295,6 +1312,9 @@ let SearchView = class SearchView extends ViewPane {
             this.reLayout();
         }
     }
+    _queryDetailsHidden() {
+        return this.queryDetails.classList.contains('more');
+    }
     searchInFolders(folderPaths = []) {
         this._searchWithIncludeOrExclude(true, folderPaths);
     }
@@ -1983,7 +2003,7 @@ class SearchLinkButton extends Disposable {
     constructor(label, handler, hoverService, tooltip) {
         super();
         this.element = $('a.pointer', { tabindex: 0 }, label);
-        this._register(hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.element, tooltip));
+        this._register(hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.element, tooltip));
         this.addEventHandlers(handler);
     }
     addEventHandlers(handler) {

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

@@ -1,4 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { append, $, trackFocus } from 'vscode/vscode/vs/base/browser/dom';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { Button } from 'vscode/vscode/vs/base/browser/ui/button/button';
@@ -9,7 +10,6 @@ import { Delayer } from 'vscode/vscode/vs/base/common/async';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { CONTEXT_FIND_WIDGET_NOT_VISIBLE } from 'vscode/vscode/vs/editor/contrib/find/browser/findModel';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -37,6 +37,7 @@ import { GroupModelChangeKind } from 'vscode/vscode/vs/workbench/common/editor';
 import { SearchFindInput } from './searchFindInput.js';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { NotebookFindScopeType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
 var SearchWidget_1;
 const _moduleId = "vs/workbench/contrib/search/browser/searchWidget";
@@ -128,8 +129,7 @@ let SearchWidget = class SearchWidget extends Widget {
             notebookOptions.isInNotebookMarkdownPreview,
             notebookOptions.isInNotebookCellInput,
             notebookOptions.isInNotebookCellOutput,
-            false,
-            []
+            { findScopeType: NotebookFindScopeType.None }
         ))));
         this._register(this._notebookFilters.onDidChange(() => {
             if (this.searchInput) {
@@ -248,6 +248,11 @@ let SearchWidget = class SearchWidget extends Widget {
     focusRegexAction() {
         this.searchInput?.focusOnRegex();
     }
+    set replaceButtonVisibility(val) {
+        if (this.toggleReplaceButton) {
+            this.toggleReplaceButton.element.style.display = val ? '' : 'none';
+        }
+    }
     render(container, options) {
         this.domNode = append(container, $('.search-widget'));
         this.domNode.style.position = 'relative';
@@ -400,7 +405,7 @@ let SearchWidget = class SearchWidget extends Widget {
                 }
             }
         }));
-        this.replaceInput.onKeyDown((keyboardEvent) => this.onReplaceInputKeyDown(keyboardEvent));
+        this._register(this.replaceInput.onKeyDown((keyboardEvent) => this.onReplaceInputKeyDown(keyboardEvent)));
         this.replaceInput.setValue(options.replaceValue || '');
         this._register(this.replaceInput.inputBox.onDidChange(() => this._onReplaceValueChanged.fire()));
         this._register(this.replaceInput.inputBox.onDidHeightChange(() => this._onDidHeightChange.fire()));
@@ -519,6 +524,23 @@ let SearchWidget = class SearchWidget extends Widget {
         else if (keyboardEvent.equals(KeyCode.DownArrow)) {
             stopPropagationForMultiLineDownwards(keyboardEvent, this.searchInput?.getValue() ?? '', this.searchInput?.domNode.querySelector('textarea') ?? null);
         }
+        else if (keyboardEvent.equals(KeyCode.PageUp)) {
+            const inputElement = this.searchInput?.inputBox.inputElement;
+            if (inputElement) {
+                inputElement.setSelectionRange(0, 0);
+                inputElement.focus();
+                keyboardEvent.preventDefault();
+            }
+        }
+        else if (keyboardEvent.equals(KeyCode.PageDown)) {
+            const inputElement = this.searchInput?.inputBox.inputElement;
+            if (inputElement) {
+                const endOfText = inputElement.value.length;
+                inputElement.setSelectionRange(endOfText, endOfText);
+                inputElement.focus();
+                keyboardEvent.preventDefault();
+            }
+        }
     }
     onCaseSensitiveKeyDown(keyboardEvent) {
         if (keyboardEvent.equals(KeyMod.Shift | KeyCode.Tab)) {

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

@@ -104,7 +104,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         this.registerEditorListeners();
         const scopedContextKeyService = assertIsDefined(this.scopedContextKeyService);
         InSearchEditor.bindTo(scopedContextKeyService).set(true);
-        this.createQueryEditor(this.queryEditorContainer, this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, scopedContextKeyService])))), SearchContext.InputBoxFocusedKey.bindTo(scopedContextKeyService));
+        this.createQueryEditor(this.queryEditorContainer, this._register(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, scopedContextKeyService]))))), SearchContext.InputBoxFocusedKey.bindTo(scopedContextKeyService));
     }
     createQueryEditor(container, scopedInstantiationService, inputBoxFocusedContextKey) {
         const searchEditorInputboxStyles = getInputBoxStyle({ inputBorder: searchEditorTextInputBorder });
@@ -121,7 +121,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         this._register(this.queryEditorWidget.onDidToggleContext(() => this.triggerSearch({ resetCursor: false })));
         this.includesExcludesContainer = append(container, $('.includes-excludes'));
         this.toggleQueryDetailsButton = append(this.includesExcludesContainer, $('.expand' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button' }));
-        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, ( localizeWithPath(_moduleId, 0, "Toggle Search Details"))));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, ( localizeWithPath(_moduleId, 0, "Toggle Search Details"))));
         this._register(addDisposableListener(this.toggleQueryDetailsButton, EventType.CLICK, e => {
             EventHelper.stop(e);
             this.toggleIncludesExcludes();
@@ -713,7 +713,7 @@ SearchEditor = SearchEditor_1 = ( (__decorate([
     ( (__param(18, ILogService))),
     ( (__param(19, IHoverService)))
 ], SearchEditor)));
-const searchEditorTextInputBorder = registerColor('searchEditor.textInputBorder', { dark: inputBorder, light: inputBorder, hcDark: inputBorder, hcLight: inputBorder }, ( localizeWithPath(_moduleId, 8, "Search editor text input box border.")));
+const searchEditorTextInputBorder = registerColor('searchEditor.textInputBorder', inputBorder, ( localizeWithPath(_moduleId, 8, "Search editor text input box border.")));
 function findNextRange(matchRanges, currentPosition) {
     for (const matchRange of matchRanges) {
         if (Position.isBefore(currentPosition, matchRange.getStartPosition())) {

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

@@ -15,7 +15,7 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/commo
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { SearchProviderType, isFileMatch, isProgressMessage, QueryType, deserializeSearchError, SearchErrorCode, SEARCH_RESULT_LANGUAGE_ID, FileMatch, pathIncludedInQuery } from 'vscode/vscode/vs/workbench/services/search/common/search';
+import { SearchProviderType, isFileMatch, isProgressMessage, QueryType, deserializeSearchError, SearchErrorCode, SEARCH_RESULT_LANGUAGE_ID, DEFAULT_MAX_SEARCH_RESULTS, FileMatch, pathIncludedInQuery } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { editorMatchesToTextSearchResults, getTextSearchMatchWithModelContext } from 'vscode/vscode/vs/workbench/services/search/common/searchHelpers';
 
 let SearchService = class SearchService extends Disposable {
@@ -372,7 +372,7 @@ let SearchService = class SearchService extends Disposable {
                 if (!this.matches(originalResource, query)) {
                     return;
                 }
-                const askMax = isNumber(query.maxResults) ? query.maxResults + 1 : Number.MAX_SAFE_INTEGER;
+                const askMax = (isNumber(query.maxResults) ? query.maxResults : DEFAULT_MAX_SEARCH_RESULTS) + 1;
                 let matches = model.findMatches(query.contentPattern.pattern, false, !!query.contentPattern.isRegExp, !!query.contentPattern.isCaseSensitive, query.contentPattern.isWordMatch ? query.contentPattern.wordSeparators : null, false, askMax);
                 if (matches.length) {
                     if (askMax && matches.length >= askMax) {