@codingame/monaco-vscode-api 1.81.8-next.2 → 1.82.0-next.0

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

@@ -17,6 +17,7 @@ import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/com
 import { ServiceCollection } from 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
 import { MatchFocusKey, FileFocusKey, FolderFocusKey, IsEditableItemKey } from '../common/constants.js';
 import { defaultCountBadgeStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+var FolderMatchRenderer_1, FileMatchRenderer_1, MatchRenderer_1;
 class SearchDelegate {
     static { this.ITEM_HEIGHT = 22; }
     getHeight(element) {
@@ -37,6 +38,7 @@ class SearchDelegate {
     }
 }
 let FolderMatchRenderer = class FolderMatchRenderer extends Disposable {
+    static { FolderMatchRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'folderMatch'; }
     constructor(searchView, labels, contextService, labelService, instantiationService, contextKeyService) {
         super();
@@ -46,7 +48,7 @@ let FolderMatchRenderer = class FolderMatchRenderer extends Disposable {
         this.labelService = labelService;
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
-        this.templateId = FolderMatchRenderer.TEMPLATE_ID;
+        this.templateId = FolderMatchRenderer_1.TEMPLATE_ID;
     }
     renderCompressedElements(node, index, templateData, height) {
         const compressed = node.element;
@@ -136,13 +138,14 @@ let FolderMatchRenderer = class FolderMatchRenderer extends Disposable {
         templateData.actions.context = { viewer: this.searchView.getControl(), element: folder };
     }
 };
-FolderMatchRenderer = ( __decorate([
+FolderMatchRenderer = FolderMatchRenderer_1 = ( __decorate([
     ( __param(2, IWorkspaceContextService)),
     ( __param(3, ILabelService)),
     ( __param(4, IInstantiationService)),
     ( __param(5, IContextKeyService))
 ], FolderMatchRenderer));
 let FileMatchRenderer = class FileMatchRenderer extends Disposable {
+    static { FileMatchRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'fileMatch'; }
     constructor(searchView, labels, contextService, configurationService, instantiationService, contextKeyService) {
         super();
@@ -152,7 +155,7 @@ let FileMatchRenderer = class FileMatchRenderer extends Disposable {
         this.configurationService = configurationService;
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
-        this.templateId = FileMatchRenderer.TEMPLATE_ID;
+        this.templateId = FileMatchRenderer_1.TEMPLATE_ID;
     }
     renderCompressedElements(node, index, templateData, height) {
         throw new Error('Should never happen since node is incompressible.');
@@ -213,13 +216,14 @@ let FileMatchRenderer = class FileMatchRenderer extends Disposable {
         templateData.disposables.dispose();
     }
 };
-FileMatchRenderer = ( __decorate([
+FileMatchRenderer = FileMatchRenderer_1 = ( __decorate([
     ( __param(2, IWorkspaceContextService)),
     ( __param(3, IConfigurationService)),
     ( __param(4, IInstantiationService)),
     ( __param(5, IContextKeyService))
 ], FileMatchRenderer));
 let MatchRenderer = class MatchRenderer extends Disposable {
+    static { MatchRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'match'; }
     constructor(searchModel, searchView, contextService, configurationService, instantiationService, contextKeyService) {
         super();
@@ -229,7 +233,7 @@ let MatchRenderer = class MatchRenderer extends Disposable {
         this.configurationService = configurationService;
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
-        this.templateId = MatchRenderer.TEMPLATE_ID;
+        this.templateId = MatchRenderer_1.TEMPLATE_ID;
     }
     renderCompressedElements(node, index, templateData, height) {
         throw new Error('Should never happen since node is incompressible.');
@@ -305,7 +309,7 @@ let MatchRenderer = class MatchRenderer extends Disposable {
         return lineNumStr + numLinesStr;
     }
 };
-MatchRenderer = ( __decorate([
+MatchRenderer = MatchRenderer_1 = ( __decorate([
     ( __param(2, IWorkspaceContextService)),
     ( __param(3, IConfigurationService)),
     ( __param(4, IInstantiationService)),

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

@@ -10,7 +10,6 @@ import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
 import { DisposableStore, Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
 import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.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';
@@ -59,7 +58,7 @@ import { SearchViewVisibleKey, FirstMatchFocusKey, FileMatchOrMatchFocusKey, Fil
 import { IReplaceService } from './replace.js';
 import { SearchStateKey, SearchUIState, getOutOfWorkspaceEditorResources } from '../common/search.js';
 import { SearchHistoryService, ISearchHistoryService } from '../common/searchHistoryService.js';
-import { searchMatchComparer, FileMatch, SearchResult, FolderMatch, Match, FolderMatchWithResource, MatchInNotebook, ISearchWorkbenchService } from './searchModel.js';
+import { searchMatchComparer, FileMatch, SearchResult, FolderMatch, Match, FolderMatchWithResource, MatchInNotebook, ISearchViewModelWorkbenchService } from './searchModel.js';
 import { createEditorFromSearchResult } from '../../searchEditor/browser/searchEditorActions.js';
 import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
@@ -70,6 +69,7 @@ import { INotebookService } from '../../notebook/common/notebookService.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import { TextSearchCompleteMessageType } from '../../../services/search/common/searchExtTypes.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+var SearchView_1;
 const $ = dom.$;
 const SEARCH_CANCELLED_MESSAGE = ( nls.localize(
     'searchCanceled',
@@ -77,8 +77,9 @@ const SEARCH_CANCELLED_MESSAGE = ( nls.localize(
 ));
 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, searchWorkbenchService, 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) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
         this.fileService = fileService;
         this.editorService = editorService;
@@ -89,7 +90,7 @@ let SearchView = class SearchView extends ViewPane {
         this.commandService = commandService;
         this.contextViewService = contextViewService;
         this.contextService = contextService;
-        this.searchWorkbenchService = searchWorkbenchService;
+        this.searchViewModelWorkbenchService = searchViewModelWorkbenchService;
         this.replaceService = replaceService;
         this.textFileService = textFileService;
         this.preferencesService = preferencesService;
@@ -137,7 +138,7 @@ let SearchView = class SearchView extends ViewPane {
                 this.refreshTree();
             }
         });
-        this.viewModel = this._register(this.searchWorkbenchService.searchModel);
+        this.viewModel = this._register(this.searchViewModelWorkbenchService.searchModel);
         this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
         this.memento = ( new Memento(this.id, storageService));
         this.viewletState = this.memento.getMemento(1 , 1 );
@@ -156,21 +157,19 @@ let SearchView = class SearchView extends ViewPane {
         this._register(this.storageService.onWillSaveState(() => {
             this._saveSearchHistoryService();
         }));
-        this._register(this.storageService.onDidChangeValue((v) => {
-            if (v.key === SearchHistoryService.SEARCH_HISTORY_KEY) {
-                const restoredHistory = this.searchHistoryService.load();
-                if (restoredHistory.include) {
-                    this.inputPatternIncludes.prependHistory(restoredHistory.include);
-                }
-                if (restoredHistory.exclude) {
-                    this.inputPatternExcludes.prependHistory(restoredHistory.exclude);
-                }
-                if (restoredHistory.search) {
-                    this.searchWidget.prependSearchHistory(restoredHistory.search);
-                }
-                if (restoredHistory.replace) {
-                    this.searchWidget.prependReplaceHistory(restoredHistory.replace);
-                }
+        this._register(this.storageService.onDidChangeValue(1 , SearchHistoryService.SEARCH_HISTORY_KEY, this._register(( new DisposableStore())))(() => {
+            const restoredHistory = this.searchHistoryService.load();
+            if (restoredHistory.include) {
+                this.inputPatternIncludes.prependHistory(restoredHistory.include);
+            }
+            if (restoredHistory.exclude) {
+                this.inputPatternExcludes.prependHistory(restoredHistory.exclude);
+            }
+            if (restoredHistory.search) {
+                this.searchWidget.prependSearchHistory(restoredHistory.search);
+            }
+            if (restoredHistory.replace) {
+                this.searchWidget.prependReplaceHistory(restoredHistory.replace);
             }
         }));
     }
@@ -205,6 +204,29 @@ let SearchView = class SearchView extends ViewPane {
             dom.hide(this.searchWithoutFolderMessageElement);
         }
     }
+    refreshInputs() {
+        this.pauseSearching = true;
+        this.searchWidget.setValue(this.viewModel.searchResult.query?.contentPattern.pattern ?? '');
+        this.searchWidget.setReplaceAllActionState(false);
+        this.searchWidget.toggleReplace(true);
+        this.inputPatternIncludes.setOnlySearchInOpenEditors(this.viewModel.searchResult.query?.onlyOpenEditors || false);
+        this.inputPatternExcludes.setUseExcludesAndIgnoreFiles(!this.viewModel.searchResult.query?.userDisabledExcludesAndIgnoreFiles || true);
+        this.searchIncludePattern.setValue('');
+        this.searchExcludePattern.setValue('');
+        this.pauseSearching = false;
+    }
+    async importSearchResult(searchModel) {
+        searchModel.transferSearchResult(this.viewModel);
+        this.onSearchResultsChanged();
+        this.refreshInputs();
+        const collapseResults = this.searchConfig.collapseResults;
+        if (collapseResults !== 'alwaysCollapse' && this.viewModel.searchResult.matches().length === 1) {
+            const onlyMatch = this.viewModel.searchResult.matches()[0];
+            if (onlyMatch.count() < 50) {
+                this.tree.expand(onlyMatch);
+            }
+        }
+    }
     renderBody(parent) {
         super.renderBody(parent);
         this.container = dom.append(parent, dom.$('.search-view'));
@@ -293,7 +315,7 @@ let SearchView = class SearchView extends ViewPane {
         if (filePatterns !== '' || patternExclusions !== '' || patternIncludes !== '' || queryDetailsExpanded !== '' || !useExcludesAndIgnoreFiles) {
             this.toggleQueryDetails(true, true, true);
         }
-        this._register(this.viewModel.searchResult.onChange((event) => this.onSearchResultsChanged(event)));
+        this._register(this.viewModel.onSearchResultChanged((event) => this.onSearchResultsChanged(event)));
         this._register(this.onDidChangeBodyVisibility(visible => this.onVisibilityChanged(visible)));
         this.updateIndentStyles(this.themeService.getFileIconTheme());
         this._register(this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this));
@@ -709,12 +731,12 @@ let SearchView = class SearchView extends ViewPane {
             overrideStyles: {
                 listBackground: this.getBackgroundColor()
             },
-            additionalScrollHeight: SearchDelegate.ITEM_HEIGHT
+            paddingBottom: SearchDelegate.ITEM_HEIGHT
         }));
         this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
         const updateHasSomeCollapsible = () => this.toggleCollapseStateDelayer.trigger(() => this.hasSomeCollapsibleResultKey.set(this.hasSomeCollapsible()));
         updateHasSomeCollapsible();
-        this._register(this.viewModel.searchResult.onChange(() => updateHasSomeCollapsible()));
+        this._register(this.viewModel.onSearchResultChanged(() => updateHasSomeCollapsible()));
         this._register(this.tree.onDidChangeCollapseState(() => updateHasSomeCollapsible()));
         this._register(Event.debounce(this.tree.onDidOpen, (last, event) => event, DEBOUNCE_DELAY, true)(options => {
             if (options.element instanceof Match) {
@@ -746,8 +768,8 @@ let SearchView = class SearchView extends ViewPane {
                 this.lastFocusState = 'tree';
             }
             let editable = false;
-            if (focus instanceof MatchInNotebook) {
-                editable = !focus.isWebviewMatch();
+            if (focus instanceof Match) {
+                editable = (focus instanceof MatchInNotebook) ? !focus.isWebviewMatch() : true;
             }
             else if (focus instanceof FileMatch) {
                 editable = !focus.hasOnlyReadOnlyMatches();
@@ -992,7 +1014,7 @@ let SearchView = class SearchView extends ViewPane {
             return;
         }
         const actionsPosition = this.searchConfig.actionsPosition;
-        this.getContainer().classList.toggle(SearchView.ACTIONS_RIGHT_CLASS_NAME, actionsPosition === 'right');
+        this.getContainer().classList.toggle(SearchView_1.ACTIONS_RIGHT_CLASS_NAME, actionsPosition === 'right');
         this.searchWidget.setWidth(this.size.width - 28 );
         this.inputPatternExcludes.setWidth(this.size.width - 28 );
         this.inputPatternIncludes.setWidth(this.size.width - 28 );
@@ -1218,9 +1240,10 @@ let SearchView = class SearchView extends ViewPane {
             return;
         }
         if (!this.pauseSearching) {
+            const delay = options.triggeredOnType ? options.delay : 0;
             this.triggerQueryDelayer.trigger(() => {
                 this._onQueryChanged(options.preserveFocus, options.triggeredOnType);
-            }, options.delay);
+            }, delay);
         }
     }
     _onQueryChanged(preserveFocus, triggeredOnType = false) {
@@ -1262,7 +1285,7 @@ let SearchView = class SearchView extends ViewPane {
         const options = {
             _reason: 'searchView',
             extraFileResources: this.instantiationService.invokeFunction(getOutOfWorkspaceEditorResources),
-            maxResults: withNullAsUndefined(this.searchConfig.maxResults),
+            maxResults: this.searchConfig.maxResults ?? undefined,
             disregardIgnoreFiles: !useExcludesAndIgnoreFiles || undefined,
             disregardExcludeSettings: !useExcludesAndIgnoreFiles || undefined,
             onlyOpenEditors: onlySearchInOpenEditors,
@@ -1494,8 +1517,8 @@ let SearchView = class SearchView extends ViewPane {
         this.searchWidget.setReplaceAllActionState(false);
         this.tree.setSelection([]);
         this.tree.setFocus([]);
-        return this.viewModel.search(query)
-            .then(onComplete, onError);
+        const result = this.viewModel.search(query);
+        return result.asyncResults.then(onComplete, onError);
     }
     onOpenSettings(e) {
         dom.EventHelper.stop(e, false);
@@ -1614,7 +1637,7 @@ let SearchView = class SearchView extends ViewPane {
             this.open(lineMatch, preserveFocus, sideBySide, pinned, resource);
     }
     async open(element, preserveFocus, sideBySide, pinned, resourceInput) {
-        const selection = this.getSelectionFrom(element);
+        const selection = getEditorSelectionFromMatch(element, this.viewModel);
         const oldParentMatches = element instanceof Match ? element.parent().matches() : [];
         const resource = resourceInput ?? (element instanceof Match ? element.parent().resource : element.resource);
         let editor;
@@ -1623,7 +1646,6 @@ let SearchView = class SearchView extends ViewPane {
             pinned,
             selection,
             revealIfVisible: true,
-            indexedCellOptions: element instanceof MatchInNotebook ? { cellIndex: element.cellIndex, selection: element.range } : undefined,
         };
         try {
             editor = await this.editorService.openEditor({
@@ -1703,29 +1725,6 @@ let SearchView = class SearchView extends ViewPane {
             this.viewModel.searchResult.rangeHighlightDecorations.removeHighlightRange();
         }, errors.onUnexpectedError);
     }
-    getSelectionFrom(element) {
-        let match = null;
-        if (element instanceof Match) {
-            match = element;
-        }
-        if (element instanceof FileMatch && element.count() > 0) {
-            match = element.matches()[element.matches().length - 1];
-        }
-        if (match) {
-            const range = match.range();
-            if (this.viewModel.isReplaceActive() && !!this.viewModel.replaceString) {
-                const replaceString = match.replaceString;
-                return {
-                    startLineNumber: range.startLineNumber,
-                    startColumn: range.startColumn,
-                    endLineNumber: range.startLineNumber,
-                    endColumn: range.startColumn + replaceString.length
-                };
-            }
-            return range;
-        }
-        return undefined;
-    }
     onUntitledDidDispose(resource) {
         if (!this.viewModel) {
             return;
@@ -1840,7 +1839,7 @@ let SearchView = class SearchView extends ViewPane {
         super.dispose();
     }
 };
-SearchView = ( __decorate([
+SearchView = SearchView_1 = ( __decorate([
     ( __param(1, IFileService)),
     ( __param(2, IEditorService)),
     ( __param(3, ICodeEditorService)),
@@ -1853,7 +1852,7 @@ SearchView = ( __decorate([
     ( __param(10, IViewDescriptorService)),
     ( __param(11, IConfigurationService)),
     ( __param(12, IWorkspaceContextService)),
-    ( __param(13, ISearchWorkbenchService)),
+    ( __param(13, ISearchViewModelWorkbenchService)),
     ( __param(14, IContextKeyService)),
     ( __param(15, IReplaceService)),
     ( __param(16, ITextFileService)),
@@ -1891,4 +1890,27 @@ class SearchLinkButton extends Disposable {
         }));
     }
 }
-export { SearchView };
+function getEditorSelectionFromMatch(element, viewModel) {
+    let match = null;
+    if (element instanceof Match) {
+        match = element;
+    }
+    if (element instanceof FileMatch && element.count() > 0) {
+        match = element.matches()[element.matches().length - 1];
+    }
+    if (match) {
+        const range = match.range();
+        if (viewModel.isReplaceActive() && !!viewModel.replaceString) {
+            const replaceString = match.replaceString;
+            return {
+                startLineNumber: range.startLineNumber,
+                startColumn: range.startColumn,
+                endLineNumber: range.startLineNumber,
+                endColumn: range.startColumn + replaceString.length
+            };
+        }
+        return range;
+    }
+    return undefined;
+}
+export { SearchView, getEditorSelectionFromMatch };

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

@@ -32,6 +32,7 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { NotebookEditorInput } from '../../../../../../../override/vs/workbench/contrib/notebook/common/notebookEditorInput.js';
 import { SearchFindInput } from './searchFindInput.js';
+var SearchWidget_1;
 const SingleLineInputHeight = 26;
 class ReplaceAllAction extends Action {
     static { this.ID = 'search.action.replaceAll'; }
@@ -65,6 +66,7 @@ function stopPropagationForMultiLineDownwards(event, value, textarea) {
     }
 }
 let SearchWidget = class SearchWidget extends Widget {
+    static { SearchWidget_1 = this; }
     static { this.INPUT_MAX_HEIGHT = 134; }
     static { this.REPLACE_ALL_DISABLED_LABEL = ( nls.localize(
         'search.action.replaceAll.disabled.label',
@@ -278,7 +280,7 @@ let SearchWidget = class SearchWidget extends Widget {
             history: options.searchHistory,
             showHistoryHint: () => showHistoryKeybindingHint(this.keybindingService),
             flexibleHeight: true,
-            flexibleMaxHeight: SearchWidget.INPUT_MAX_HEIGHT,
+            flexibleMaxHeight: SearchWidget_1.INPUT_MAX_HEIGHT,
             showCommonFindToggles: true,
             inputBoxStyles: options.inputBoxStyles,
             toggleStyles: options.toggleStyles
@@ -375,7 +377,7 @@ let SearchWidget = class SearchWidget extends Widget {
             history: options.replaceHistory,
             showHistoryHint: () => showHistoryKeybindingHint(this.keybindingService),
             flexibleHeight: true,
-            flexibleMaxHeight: SearchWidget.INPUT_MAX_HEIGHT,
+            flexibleMaxHeight: SearchWidget_1.INPUT_MAX_HEIGHT,
             inputBoxStyles: options.inputBoxStyles,
             toggleStyles: options.toggleStyles
         }, this.contextKeyService, true)));
@@ -391,7 +393,7 @@ let SearchWidget = class SearchWidget extends Widget {
         this._register(this.replaceInput.inputBox.onDidChange(() => this._onReplaceValueChanged.fire()));
         this._register(this.replaceInput.inputBox.onDidHeightChange(() => this._onDidHeightChange.fire()));
         this.replaceAllAction = ( new ReplaceAllAction(this));
-        this.replaceAllAction.label = SearchWidget.REPLACE_ALL_DISABLED_LABEL;
+        this.replaceAllAction.label = SearchWidget_1.REPLACE_ALL_DISABLED_LABEL;
         this.replaceActionBar = this._register(( new ActionBar(this.replaceContainer)));
         this.replaceActionBar.push([this.replaceAllAction], { icon: true, label: false });
         this.onkeydown(this.replaceActionBar.domNode, (keyboardEvent) => this.onReplaceActionbarKeyDown(keyboardEvent));
@@ -424,7 +426,7 @@ let SearchWidget = class SearchWidget extends Widget {
     setReplaceAllActionState(enabled) {
         if (this.replaceAllAction && (this.replaceAllAction.enabled !== enabled)) {
             this.replaceAllAction.enabled = enabled;
-            this.replaceAllAction.label = enabled ? SearchWidget.REPLACE_ALL_ENABLED_LABEL(this.keybindingService) : SearchWidget.REPLACE_ALL_DISABLED_LABEL;
+            this.replaceAllAction.label = enabled ? SearchWidget_1.REPLACE_ALL_ENABLED_LABEL(this.keybindingService) : SearchWidget_1.REPLACE_ALL_DISABLED_LABEL;
             this.updateReplaceActiveState();
         }
     }
@@ -599,7 +601,7 @@ let SearchWidget = class SearchWidget extends Widget {
         return this.configurationService.getValue('search');
     }
 };
-SearchWidget = ( __decorate([
+SearchWidget = SearchWidget_1 = ( __decorate([
     ( __param(2, IContextViewService)),
     ( __param(3, IContextKeyService)),
     ( __param(4, IKeybindingService)),

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

@@ -12,11 +12,12 @@ import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
 import { getSelectionSearchString } from 'monaco-editor/esm/vs/editor/contrib/find/browser/findController.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { prepareQuery, pieceToQuery, scoreFuzzy2 } from 'monaco-editor/esm/vs/base/common/fuzzyScorer.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+var SymbolsQuickAccessProvider_1;
 let SymbolsQuickAccessProvider = class SymbolsQuickAccessProvider extends PickerQuickAccessProvider {
+    static { SymbolsQuickAccessProvider_1 = this; }
     static { this.PREFIX = '#'; }
     static { this.TYPING_SEARCH_DELAY = 200; }
     static { this.TREAT_AS_GLOBAL_SYMBOL_TYPES = ( new Set([
@@ -31,12 +32,12 @@ let SymbolsQuickAccessProvider = class SymbolsQuickAccessProvider extends Picker
     get defaultFilterValue() {
         const editor = this.codeEditorService.getFocusedCodeEditor();
         if (editor) {
-            return withNullAsUndefined(getSelectionSearchString(editor));
+            return getSelectionSearchString(editor) ?? undefined;
         }
         return undefined;
     }
     constructor(labelService, openerService, editorService, configurationService, codeEditorService) {
-        super(SymbolsQuickAccessProvider.PREFIX, {
+        super(SymbolsQuickAccessProvider_1.PREFIX, {
             canAcceptInBackground: true,
             noResultsPick: {
                 label: ( localize('noSymbolResults', "No matching workspace symbols"))
@@ -47,7 +48,7 @@ let SymbolsQuickAccessProvider = class SymbolsQuickAccessProvider extends Picker
         this.editorService = editorService;
         this.configurationService = configurationService;
         this.codeEditorService = codeEditorService;
-        this.delayer = this._register(( new ThrottledDelayer(SymbolsQuickAccessProvider.TYPING_SEARCH_DELAY)));
+        this.delayer = this._register(( new ThrottledDelayer(SymbolsQuickAccessProvider_1.TYPING_SEARCH_DELAY)));
     }
     get configuration() {
         const editorConfig = this.configurationService.getValue().workbench?.editor;
@@ -84,7 +85,7 @@ let SymbolsQuickAccessProvider = class SymbolsQuickAccessProvider extends Picker
         const symbolPicks = [];
         const openSideBySideDirection = this.configuration.openSideBySideDirection;
         for (const { symbol, provider } of workspaceSymbols) {
-            if (options?.skipLocal && !( SymbolsQuickAccessProvider.TREAT_AS_GLOBAL_SYMBOL_TYPES.has(symbol.kind)) && !!symbol.containerName) {
+            if (options?.skipLocal && !( SymbolsQuickAccessProvider_1.TREAT_AS_GLOBAL_SYMBOL_TYPES.has(symbol.kind)) && !!symbol.containerName) {
                 continue;
             }
             const symbolLabel = symbol.name;
@@ -209,7 +210,7 @@ let SymbolsQuickAccessProvider = class SymbolsQuickAccessProvider extends Picker
         return 0;
     }
 };
-SymbolsQuickAccessProvider = ( __decorate([
+SymbolsQuickAccessProvider = SymbolsQuickAccessProvider_1 = ( __decorate([
     ( __param(0, ILabelService)),
     ( __param(1, IOpenerService)),
     ( __param(2, IEditorService)),

package/vscode/src/vs/workbench/contrib/search/common/constants.js

@@ -22,6 +22,7 @@ const AddCursorsAtSearchResults = 'addCursorsAtSearchResults';
 const RevealInSideBarForSearchResults = 'search.action.revealInSideBar';
 const ReplaceInFilesActionId = 'workbench.action.replaceInFiles';
 const ShowAllSymbolsActionId = 'workbench.action.showAllSymbols';
+const QuickTextSearchActionId = 'workbench.action.experimental.quickTextSearch';
 const CancelSearchActionId = 'search.action.cancel';
 const RefreshSearchResultsActionId = 'search.action.refreshSearchResults';
 const FocusNextSearchResultActionId = 'search.action.focusNextSearchResult';
@@ -62,4 +63,4 @@ const ViewHasReplacePatternKey = ( new RawContextKey('viewHasReplacePattern', fa
 const ViewHasFilePatternKey = ( new RawContextKey('viewHasFilePattern', false));
 const ViewHasSomeCollapsibleKey = ( new RawContextKey('viewHasSomeCollapsibleResult', false));
 const InTreeViewKey = ( new RawContextKey('inTreeView', false));
-export { AddCursorsAtSearchResults, CancelSearchActionId, ClearSearchHistoryCommandId, ClearSearchResultsActionId, CloseReplaceWidgetActionId, CollapseSearchResultsActionId, CopyAllCommandId, CopyMatchCommandId, CopyPathCommandId, ExcludeFolderFromSearchId, ExpandSearchResultsActionId, FileFocusKey, FileMatchOrFolderMatchFocusKey, FileMatchOrFolderMatchWithResourceFocusKey, FileMatchOrMatchFocusKey, FindInFilesActionId, FindInFolderId, FindInWorkspaceId, FirstMatchFocusKey, FocusNextInputActionId, FocusNextSearchResultActionId, FocusPreviousInputActionId, FocusPreviousSearchResultActionId, FocusSearchFromResults, FocusSearchListCommandID, FolderFocusKey, HasSearchResults, InTreeViewKey, InputBoxFocusedKey, IsEditableItemKey, MatchFocusKey, OpenInEditorCommandId, OpenMatch, OpenMatchToSide, PatternExcludesFocusedKey, PatternIncludesFocusedKey, RefreshSearchResultsActionId, RemoveActionId, ReplaceActionId, ReplaceActiveKey, ReplaceAllInFileActionId, ReplaceAllInFolderActionId, ReplaceInFilesActionId, ReplaceInputBoxFocusedKey, ResourceFolderFocusKey, RestrictSearchToFolderId, RevealInSideBarForSearchResults, SearchInputBoxFocusedKey, SearchViewFocusedKey, SearchViewVisibleKey, ShowAllSymbolsActionId, ToggleCaseSensitiveCommandId, TogglePreserveCaseId, ToggleQueryDetailsActionId, ToggleRegexCommandId, ToggleSearchOnTypeActionId, ToggleWholeWordCommandId, ViewAsListActionId, ViewAsTreeActionId, ViewHasFilePatternKey, ViewHasReplacePatternKey, ViewHasSearchPatternKey, ViewHasSomeCollapsibleKey };
+export { AddCursorsAtSearchResults, CancelSearchActionId, ClearSearchHistoryCommandId, ClearSearchResultsActionId, CloseReplaceWidgetActionId, CollapseSearchResultsActionId, CopyAllCommandId, CopyMatchCommandId, CopyPathCommandId, ExcludeFolderFromSearchId, ExpandSearchResultsActionId, FileFocusKey, FileMatchOrFolderMatchFocusKey, FileMatchOrFolderMatchWithResourceFocusKey, FileMatchOrMatchFocusKey, FindInFilesActionId, FindInFolderId, FindInWorkspaceId, FirstMatchFocusKey, FocusNextInputActionId, FocusNextSearchResultActionId, FocusPreviousInputActionId, FocusPreviousSearchResultActionId, FocusSearchFromResults, FocusSearchListCommandID, FolderFocusKey, HasSearchResults, InTreeViewKey, InputBoxFocusedKey, IsEditableItemKey, MatchFocusKey, OpenInEditorCommandId, OpenMatch, OpenMatchToSide, PatternExcludesFocusedKey, PatternIncludesFocusedKey, QuickTextSearchActionId, RefreshSearchResultsActionId, RemoveActionId, ReplaceActionId, ReplaceActiveKey, ReplaceAllInFileActionId, ReplaceAllInFolderActionId, ReplaceInFilesActionId, ReplaceInputBoxFocusedKey, ResourceFolderFocusKey, RestrictSearchToFolderId, RevealInSideBarForSearchResults, SearchInputBoxFocusedKey, SearchViewFocusedKey, SearchViewVisibleKey, ShowAllSymbolsActionId, ToggleCaseSensitiveCommandId, TogglePreserveCaseId, ToggleQueryDetailsActionId, ToggleRegexCommandId, ToggleSearchOnTypeActionId, ToggleWholeWordCommandId, ViewAsListActionId, ViewAsTreeActionId, ViewHasFilePatternKey, ViewHasReplacePatternKey, ViewHasSearchPatternKey, ViewHasSomeCollapsibleKey };

package/vscode/src/vs/workbench/contrib/search/common/searchHistoryService.js

@@ -3,8 +3,10 @@ import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
 import { isEmptyObject } from 'monaco-editor/esm/vs/base/common/types.js';
 import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+var SearchHistoryService_1;
 const ISearchHistoryService = ( createDecorator('searchHistoryService'));
 let SearchHistoryService = class SearchHistoryService {
+    static { SearchHistoryService_1 = this; }
     static { this.SEARCH_HISTORY_KEY = 'workbench.search.history'; }
     constructor(storageService) {
         this.storageService = storageService;
@@ -12,12 +14,12 @@ let SearchHistoryService = class SearchHistoryService {
         this.onDidClearHistory = this._onDidClearHistory.event;
     }
     clearHistory() {
-        this.storageService.remove(SearchHistoryService.SEARCH_HISTORY_KEY, 1 );
+        this.storageService.remove(SearchHistoryService_1.SEARCH_HISTORY_KEY, 1 );
         this._onDidClearHistory.fire();
     }
     load() {
         let result;
-        const raw = this.storageService.get(SearchHistoryService.SEARCH_HISTORY_KEY, 1 );
+        const raw = this.storageService.get(SearchHistoryService_1.SEARCH_HISTORY_KEY, 1 );
         if (raw) {
             try {
                 result = JSON.parse(raw);
@@ -29,14 +31,14 @@ let SearchHistoryService = class SearchHistoryService {
     }
     save(history) {
         if (isEmptyObject(history)) {
-            this.storageService.remove(SearchHistoryService.SEARCH_HISTORY_KEY, 1 );
+            this.storageService.remove(SearchHistoryService_1.SEARCH_HISTORY_KEY, 1 );
         }
         else {
-            this.storageService.store(SearchHistoryService.SEARCH_HISTORY_KEY, JSON.stringify(history), 1 , 0 );
+            this.storageService.store(SearchHistoryService_1.SEARCH_HISTORY_KEY, JSON.stringify(history), 1 , 0 );
         }
     }
 };
-SearchHistoryService = ( __decorate([
+SearchHistoryService = SearchHistoryService_1 = ( __decorate([
     ( __param(0, IStorageService))
 ], SearchHistoryService));
 export { ISearchHistoryService, SearchHistoryService };

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

@@ -4,7 +4,7 @@ import { StandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboar
 import { alert } from 'monaco-editor/esm/vs/base/browser/ui/aria/aria.js';
 import { Delayer } from 'monaco-editor/esm/vs/base/common/async.js';
 import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { assertIsDefined, withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
+import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import './media/searchEditor.css.js';
 import { Position } from 'monaco-editor/esm/vs/editor/common/core/position.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
@@ -47,14 +47,16 @@ import { EditorExtensionsRegistry } from 'monaco-editor/esm/vs/editor/browser/ed
 import { UnusualLineTerminatorsDetector } from 'monaco-editor/esm/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js';
 import { getInputBoxStyle, defaultToggleStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+var SearchEditor_1;
 const RESULT_LINE_REGEX = /^(\s+)(\d+)(: |  )(\s*)(.*)$/;
 const FILE_LINE_REGEX = /^(\S.*):$/;
 let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
+    static { SearchEditor_1 = this; }
     static { this.ID = SearchEditorID; }
     static { this.SEARCH_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'searchEditorViewState'; }
     get searchResultEditor() { return this.editorControl; }
     constructor(telemetryService, themeService, storageService, modelService, contextService, labelService, instantiationService, contextViewService, commandService, openerService, notificationService, progressService, textResourceService, editorGroupService, editorService, configurationService, fileService, logService) {
-        super(SearchEditor.ID, telemetryService, instantiationService, storageService, textResourceService, themeService, editorService, editorGroupService, fileService);
+        super(SearchEditor_1.ID, telemetryService, instantiationService, storageService, textResourceService, themeService, editorService, editorGroupService, fileService);
         this.modelService = modelService;
         this.contextService = contextService;
         this.labelService = labelService;
@@ -273,8 +275,8 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
     modifyContextLines(increase) {
         this.queryEditorWidget.modifyContextLines(increase);
     }
-    toggleQueryDetails() {
-        this.toggleIncludesExcludes();
+    toggleQueryDetails(shouldShow) {
+        this.toggleIncludesExcludes(shouldShow);
     }
     deleteResultBlock() {
         const linesToDelete = ( new Set());
@@ -437,7 +439,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         const options = {
             _reason: 'searchEditor',
             extraFileResources: this.instantiationService.invokeFunction(getOutOfWorkspaceEditorResources),
-            maxResults: withNullAsUndefined(this.searchConfig.maxResults),
+            maxResults: this.searchConfig.maxResults ?? undefined,
             disregardIgnoreFiles: !config.useExcludeSettingsAndIgnoreFiles || undefined,
             disregardExcludeSettings: !config.useExcludeSettingsAndIgnoreFiles || undefined,
             excludePattern: config.filesToExclude,
@@ -471,7 +473,8 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         this.ongoingOperations++;
         const { configurationModel } = await startInput.resolveModels();
         configurationModel.updateConfig(config);
-        startInput.ongoingSearchOperation = this.searchModel.search(query).finally(() => {
+        const result = this.searchModel.search(query);
+        startInput.ongoingSearchOperation = result.asyncResults.finally(() => {
             this.ongoingOperations--;
             if (this.ongoingOperations === 0) {
                 this.searchOperation.stop();
@@ -654,7 +657,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         return this.getInput()?.getName() ?? ( localize('searchEditor', "Search"));
     }
 };
-SearchEditor = ( __decorate([
+SearchEditor = SearchEditor_1 = ( __decorate([
     ( __param(0, ITelemetryService)),
     ( __param(1, IThemeService)),
     ( __param(2, IStorageService)),

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

@@ -1,5 +1,4 @@
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import './media/searchEditor.css.js';
 import { isDiffEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
@@ -87,7 +86,7 @@ const openNewSearchEditor = async (accessor, _args = {}, toSide = false) => {
     const workspaceContextService = accessor.get(IWorkspaceContextService);
     const historyService = accessor.get(IHistoryService);
     const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot(Schemas.file);
-    const lastActiveWorkspaceRoot = activeWorkspaceRootUri ? withNullAsUndefined(workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri)) : undefined;
+    const lastActiveWorkspaceRoot = activeWorkspaceRootUri ? workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri) ?? undefined : undefined;
     const activeEditorControl = editorService.activeTextEditorControl;
     let activeModel;
     let selected = '';