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

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.js

@@ -31,6 +31,7 @@ import { IUserDataProfileService } from '../../../services/userDataProfile/commo
 import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
 import { APPLY_ALL_PROFILES_SETTING, IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
+var WorkspaceConfigurationRenderer_1;
 let UserSettingsRenderer = class UserSettingsRenderer extends Disposable {
     constructor(editor, preferencesModel, preferencesService, configurationService, instantiationService) {
         super();
@@ -683,6 +684,7 @@ UnsupportedSettingsRenderer = ( __decorate([
     ( __param(9, IUserDataProfilesService))
 ], UnsupportedSettingsRenderer));
 let WorkspaceConfigurationRenderer = class WorkspaceConfigurationRenderer extends Disposable {
+    static { WorkspaceConfigurationRenderer_1 = this; }
     static { this.supportedKeys = ['folders', 'tasks', 'launch', 'extensions', 'settings', 'remoteAuthority', 'transient']; }
     constructor(editor, workspaceSettingsEditorModel, workspaceContextService, markerService) {
         super();
@@ -701,7 +703,7 @@ let WorkspaceConfigurationRenderer = class WorkspaceConfigurationRenderer extend
             for (const settingsGroup of this.workspaceSettingsEditorModel.configurationGroups) {
                 for (const section of settingsGroup.sections) {
                     for (const setting of section.settings) {
-                        if (!WorkspaceConfigurationRenderer.supportedKeys.includes(setting.key)) {
+                        if (!WorkspaceConfigurationRenderer_1.supportedKeys.includes(setting.key)) {
                             markerData.push({
                                 severity: MarkerSeverity.Hint,
                                 tags: [1 ],
@@ -729,7 +731,7 @@ let WorkspaceConfigurationRenderer = class WorkspaceConfigurationRenderer extend
     createDecoration(range) {
         return {
             range,
-            options: WorkspaceConfigurationRenderer._DIM_CONFIGURATION_
+            options: WorkspaceConfigurationRenderer_1._DIM_CONFIGURATION_
         };
     }
     dispose() {
@@ -738,7 +740,7 @@ let WorkspaceConfigurationRenderer = class WorkspaceConfigurationRenderer extend
         super.dispose();
     }
 };
-WorkspaceConfigurationRenderer = ( __decorate([
+WorkspaceConfigurationRenderer = WorkspaceConfigurationRenderer_1 = ( __decorate([
     ( __param(2, IWorkspaceContextService)),
     ( __param(3, IMarkerService))
 ], WorkspaceConfigurationRenderer));

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesSearch.js

@@ -9,14 +9,15 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { RelatedInformationType, IAiRelatedInformationService } from '../../../services/aiRelatedInformation/common/aiRelatedInformation.js';
+var LocalSearchProvider_1, SettingMatches_1, RemoteSearchProvider_1;
 let PreferencesSearchService = class PreferencesSearchService extends Disposable {
-    constructor(instantiationService, configurationService, productService, extensionManagementService, extensionEnablementService) {
+    constructor(instantiationService, configurationService, extensionManagementService, extensionEnablementService) {
         super();
         this.instantiationService = instantiationService;
         this.configurationService = configurationService;
-        this.productService = productService;
         this.extensionManagementService = extensionManagementService;
         this.extensionEnablementService = extensionEnablementService;
         this._installedExtensions = this.extensionManagementService.getInstalled(1 ).then(exts => {
@@ -28,27 +29,17 @@ let PreferencesSearchService = class PreferencesSearchService extends Disposable
     }
     get remoteSearchAllowed() {
         const workbenchSettings = this.configurationService.getValue().workbench.settings;
-        if (!workbenchSettings.enableNaturalLanguageSearch) {
-            return false;
-        }
-        return !!this._endpoint.urlBase;
+        return workbenchSettings.enableNaturalLanguageSearch;
     }
-    get _endpoint() {
-        const workbenchSettings = this.configurationService.getValue().workbench.settings;
-        if (workbenchSettings.naturalLanguageSearchEndpoint) {
-            return {
-                urlBase: workbenchSettings.naturalLanguageSearchEndpoint,
-                key: workbenchSettings.naturalLanguageSearchKey
-            };
+    getRemoteSearchProvider(filter, newExtensionsOnly = false) {
+        if (!this.remoteSearchAllowed) {
+            return undefined;
         }
-        else {
-            return {
-                urlBase: this.productService.settingsSearchUrl
-            };
+        if (!this._remoteSearchProvider) {
+            this._remoteSearchProvider = this.instantiationService.createInstance(RemoteSearchProvider);
         }
-    }
-    getRemoteSearchProvider(filter, newExtensionsOnly = false) {
-        return undefined;
+        this._remoteSearchProvider.setFilter(filter);
+        return this._remoteSearchProvider;
     }
     getLocalSearchProvider(filter) {
         return this.instantiationService.createInstance(LocalSearchProvider, filter);
@@ -57,26 +48,29 @@ let PreferencesSearchService = class PreferencesSearchService extends Disposable
 PreferencesSearchService = ( __decorate([
     ( __param(0, IInstantiationService)),
     ( __param(1, IConfigurationService)),
-    ( __param(2, IProductService)),
-    ( __param(3, IExtensionManagementService)),
-    ( __param(4, IWorkbenchExtensionEnablementService))
+    ( __param(2, IExtensionManagementService)),
+    ( __param(3, IWorkbenchExtensionEnablementService))
 ], PreferencesSearchService));
+function cleanFilter(filter) {
+    return filter
+        .replace(/[":]/g, ' ')
+        .replace(/  /g, ' ')
+        .trim();
+}
 let LocalSearchProvider = class LocalSearchProvider {
+    static { LocalSearchProvider_1 = this; }
     static { this.EXACT_MATCH_SCORE = 10000; }
     static { this.START_SCORE = 1000; }
     constructor(_filter, configurationService) {
         this._filter = _filter;
         this.configurationService = configurationService;
-        this._filter = this._filter
-            .replace(/[":]/g, ' ')
-            .replace(/  /g, ' ')
-            .trim();
+        this._filter = cleanFilter(this._filter);
     }
     searchModel(preferencesModel, token) {
         if (!this._filter) {
             return Promise.resolve(null);
         }
-        let orderedScore = LocalSearchProvider.START_SCORE;
+        let orderedScore = LocalSearchProvider_1.START_SCORE;
         const settingMatcher = (setting) => {
             const { matches, matchType } = ( new SettingMatches(
                 this._filter,
@@ -87,7 +81,7 @@ let LocalSearchProvider = class LocalSearchProvider {
                 this.configurationService
             ));
             const score = this._filter === setting.key ?
-                LocalSearchProvider.EXACT_MATCH_SCORE :
+                LocalSearchProvider_1.EXACT_MATCH_SCORE :
                 orderedScore--;
             return matches && matches.length ?
                 {
@@ -98,7 +92,7 @@ let LocalSearchProvider = class LocalSearchProvider {
                 null;
         };
         const filterMatches = preferencesModel.filterSettings(this._filter, this.getGroupFilter(this._filter), settingMatcher);
-        if (filterMatches[0] && filterMatches[0].score === LocalSearchProvider.EXACT_MATCH_SCORE) {
+        if (filterMatches[0] && filterMatches[0].score === LocalSearchProvider_1.EXACT_MATCH_SCORE) {
             return Promise.resolve({
                 filterMatches: filterMatches.slice(0, 1),
                 exactMatch: true
@@ -117,10 +111,10 @@ let LocalSearchProvider = class LocalSearchProvider {
         };
     }
 };
-LocalSearchProvider = ( __decorate([
+LocalSearchProvider = LocalSearchProvider_1 = ( __decorate([
     ( __param(1, IConfigurationService))
 ], LocalSearchProvider));
-let SettingMatches = class SettingMatches {
+let SettingMatches = SettingMatches_1 = class SettingMatches {
     constructor(searchString, setting, requireFullQueryMatch, searchDescription, valuesMatcher, configurationService) {
         this.requireFullQueryMatch = requireFullQueryMatch;
         this.searchDescription = searchDescription;
@@ -136,7 +130,7 @@ let SettingMatches = class SettingMatches {
         const result = this._doFindMatchesInSetting(searchString, setting);
         if (setting.overrides && setting.overrides.length) {
             for (const subSetting of setting.overrides) {
-                const subSettingMatches = ( new SettingMatches(
+                const subSettingMatches = ( new SettingMatches_1(
                     searchString,
                     subSetting,
                     this.requireFullQueryMatch,
@@ -265,7 +259,91 @@ let SettingMatches = class SettingMatches {
         };
     }
 };
-SettingMatches = ( __decorate([
+SettingMatches = SettingMatches_1 = ( __decorate([
     ( __param(5, IConfigurationService))
 ], SettingMatches));
-export { LocalSearchProvider, PreferencesSearchService, SettingMatches };
+class RemoteSearchKeysProvider {
+    constructor(aiRelatedInformationService) {
+        this.aiRelatedInformationService = aiRelatedInformationService;
+        this.settingKeys = [];
+        this.settingsRecord = {};
+    }
+    updateModel(preferencesModel) {
+        if (preferencesModel === this.currentPreferencesModel) {
+            return;
+        }
+        this.currentPreferencesModel = preferencesModel;
+        this.refresh();
+    }
+    refresh() {
+        this.settingKeys = [];
+        this.settingsRecord = {};
+        if (!this.currentPreferencesModel ||
+            !this.aiRelatedInformationService.isEnabled()) {
+            return;
+        }
+        for (const group of this.currentPreferencesModel.settingsGroups) {
+            if (group.id === 'mostCommonlyUsed') {
+                continue;
+            }
+            for (const section of group.sections) {
+                for (const setting of section.settings) {
+                    this.settingKeys.push(setting.key);
+                    this.settingsRecord[setting.key] = setting;
+                }
+            }
+        }
+    }
+    getSettingKeys() {
+        return this.settingKeys;
+    }
+    getSettingsRecord() {
+        return this.settingsRecord;
+    }
+}
+let RemoteSearchProvider = class RemoteSearchProvider {
+    static { RemoteSearchProvider_1 = this; }
+    static { this.AI_RELATED_INFORMATION_THRESHOLD = 0.73; }
+    static { this.AI_RELATED_INFORMATION_MAX_PICKS = 15; }
+    constructor(aiRelatedInformationService) {
+        this.aiRelatedInformationService = aiRelatedInformationService;
+        this._filter = '';
+        this._keysProvider = ( new RemoteSearchKeysProvider(aiRelatedInformationService));
+    }
+    setFilter(filter) {
+        this._filter = cleanFilter(filter);
+    }
+    async searchModel(preferencesModel, token) {
+        if (!this._filter ||
+            !this.aiRelatedInformationService.isEnabled()) {
+            return null;
+        }
+        this._keysProvider.updateModel(preferencesModel);
+        return {
+            filterMatches: await this.getAiRelatedInformationItems(token)
+        };
+    }
+    async getAiRelatedInformationItems(token) {
+        const settingsRecord = this._keysProvider.getSettingsRecord();
+        const filterMatches = [];
+        const relatedInformation = await this.aiRelatedInformationService.getRelatedInformation(this._filter, [RelatedInformationType.SettingInformation], token ?? CancellationToken.None);
+        relatedInformation.sort((a, b) => b.weight - a.weight);
+        for (const info of relatedInformation) {
+            if (info.weight < RemoteSearchProvider_1.AI_RELATED_INFORMATION_THRESHOLD || filterMatches.length === RemoteSearchProvider_1.AI_RELATED_INFORMATION_MAX_PICKS) {
+                break;
+            }
+            const pick = info.setting;
+            filterMatches.push({
+                setting: settingsRecord[pick],
+                matches: [settingsRecord[pick].range],
+                matchType: SettingMatchType.RemoteMatch,
+                score: info.weight
+            });
+        }
+        return filterMatches;
+    }
+};
+RemoteSearchProvider = RemoteSearchProvider_1 = ( __decorate([
+    ( __param(0, IAiRelatedInformationService))
+], RemoteSearchProvider));
+export { LocalSearchProvider, PreferencesSearchService, RemoteSearchProvider, SettingMatches };

package/vscode/src/vs/workbench/contrib/preferences/browser/settingsEditor2.js

@@ -13,7 +13,6 @@ import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
 import { DisposableStore, dispose, Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
-import { withUndefinedAsNull, withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import './media/settingsEditor2.css.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
@@ -56,6 +55,9 @@ import { defaultButtonStyles } from 'monaco-editor/esm/vs/platform/theme/browser
 import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
 import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
 import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+import { IEditorProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
+var SettingsEditor2_1;
 function createGroupIterator(group) {
     return ( Iterable.map(group.children, g => {
         return {
@@ -70,6 +72,7 @@ const $ = dom.$;
 const searchBoxLabel = ( localize('SearchSettings.AriaLabel', "Search settings"));
 const SETTINGS_EDITOR_STATE_KEY = 'settingsEditorState';
 let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
+    static { SettingsEditor2_1 = this; }
     static { this.ID = 'workbench.editor.settings2'; }
     static { this.NUM_INSTANCES = 0; }
     static { this.SEARCH_DEBOUNCE = 200; }
@@ -79,7 +82,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
     static { this.TOC_MIN_WIDTH = 100; }
     static { this.TOC_RESET_WIDTH = 200; }
     static { this.EDITOR_MIN_WIDTH = 500; }
-    static { this.NARROW_TOTAL_WIDTH = SettingsEditor2.TOC_RESET_WIDTH + SettingsEditor2.EDITOR_MIN_WIDTH; }
+    static { this.NARROW_TOTAL_WIDTH = SettingsEditor2_1.TOC_RESET_WIDTH + SettingsEditor2_1.EDITOR_MIN_WIDTH; }
     static { this.SUGGESTIONS = [
         `@${MODIFIED_SETTING_TAG}`,
         '@tag:notebookLayout',
@@ -120,8 +123,8 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
             type === SettingValueType.Exclude ||
             type === SettingValueType.Include;
     }
-    constructor(telemetryService, configurationService, textResourceConfigurationService, themeService, preferencesService, instantiationService, preferencesSearchService, logService, contextKeyService, storageService, editorGroupService, userDataSyncWorkbenchService, userDataSyncEnablementService, workspaceTrustManagementService, extensionService, languageService, extensionManagementService, workbenchAssignmentService, productService, environmentService, extensionGalleryService) {
-        super(SettingsEditor2.ID, telemetryService, themeService, storageService);
+    constructor(telemetryService, configurationService, textResourceConfigurationService, themeService, preferencesService, instantiationService, preferencesSearchService, logService, contextKeyService, storageService, editorGroupService, userDataSyncWorkbenchService, userDataSyncEnablementService, workspaceTrustManagementService, extensionService, languageService, extensionManagementService, workbenchAssignmentService, productService, environmentService, extensionGalleryService, editorProgressService) {
+        super(SettingsEditor2_1.ID, telemetryService, themeService, storageService);
         this.configurationService = configurationService;
         this.preferencesService = preferencesService;
         this.instantiationService = instantiationService;
@@ -138,6 +141,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
         this.productService = productService;
         this.environmentService = environmentService;
         this.extensionGalleryService = extensionGalleryService;
+        this.editorProgressService = editorProgressService;
         this.searchInProgress = null;
         this.pendingSettingUpdate = null;
         this._searchResultModel = null;
@@ -153,10 +157,10 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
         this.localSearchDelayer = ( new Delayer(300));
         this.remoteSearchThrottle = ( new ThrottledDelayer(200));
         this.viewState = { settingsTarget: 3  };
-        this.settingFastUpdateDelayer = ( new Delayer(SettingsEditor2.SETTING_UPDATE_FAST_DEBOUNCE));
-        this.settingSlowUpdateDelayer = ( new Delayer(SettingsEditor2.SETTING_UPDATE_SLOW_DEBOUNCE));
-        this.searchInputDelayer = ( new Delayer(SettingsEditor2.SEARCH_DEBOUNCE));
-        this.updatedConfigSchemaDelayer = ( new Delayer(SettingsEditor2.CONFIG_SCHEMA_UPDATE_DELAYER));
+        this.settingFastUpdateDelayer = ( new Delayer(SettingsEditor2_1.SETTING_UPDATE_FAST_DEBOUNCE));
+        this.settingSlowUpdateDelayer = ( new Delayer(SettingsEditor2_1.SETTING_UPDATE_SLOW_DEBOUNCE));
+        this.searchInputDelayer = ( new Delayer(SettingsEditor2_1.SEARCH_DEBOUNCE));
+        this.updatedConfigSchemaDelayer = ( new Delayer(SettingsEditor2_1.CONFIG_SCHEMA_UPDATE_DELAYER));
         this.inSettingsEditorContextKey = CONTEXT_SETTINGS_EDITOR.bindTo(contextKeyService);
         this.searchFocusContextKey = CONTEXT_SETTINGS_SEARCH_FOCUS.bindTo(contextKeyService);
         this.tocRowFocused = CONTEXT_TOC_ROW_FOCUS.bindTo(contextKeyService);
@@ -181,8 +185,8 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
             }
         }));
         this.modelDisposables = this._register(( new DisposableStore()));
-        if (!SettingsEditor2.SUGGESTIONS.includes(`@${LANGUAGE_SETTING_TAG}`)) {
-            SettingsEditor2.SUGGESTIONS.push(`@${LANGUAGE_SETTING_TAG}`);
+        if (!SettingsEditor2_1.SUGGESTIONS.includes(`@${LANGUAGE_SETTING_TAG}`)) {
+            SettingsEditor2_1.SUGGESTIONS.push(`@${LANGUAGE_SETTING_TAG}`);
         }
         extensionManagementService.getInstalled().then(extensions => {
             this.installedExtensionIds = ( extensions
@@ -190,7 +194,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
                 .map(ext => ext.identifier.id));
         });
     }
-    get minimumWidth() { return SettingsEditor2.EDITOR_MIN_WIDTH; }
+    get minimumWidth() { return SettingsEditor2_1.EDITOR_MIN_WIDTH; }
     get maximumWidth() { return Number.POSITIVE_INFINITY; }
     get minimumHeight() { return 180; }
     set minimumWidth(value) { }
@@ -222,6 +226,19 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
         this.createBody(this.rootElement);
         this.addCtrlAInterceptor(this.rootElement);
         this.updateStyles();
+        this._register(registerNavigableContainer({
+            focusNotifiers: [this],
+            focusNextWidget: () => {
+                if (this.searchWidget.inputWidget.hasWidgetFocus()) {
+                    this.focusTOC();
+                }
+            },
+            focusPreviousWidget: () => {
+                if (!this.searchWidget.inputWidget.hasWidgetFocus()) {
+                    this.focusSearch();
+                }
+            }
+        }));
     }
     async setInput(input, options, context, token) {
         this.inSettingsEditorContextKey.set(true);
@@ -270,7 +287,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
         if (this.input) {
             this.editorMemento.clearEditorState(this.input, this.group);
         }
-        return withUndefinedAsNull(cachedState);
+        return cachedState ?? null;
     }
     getViewState() {
         return this.viewState;
@@ -311,7 +328,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
         const innerWidth = Math.min(this.headerContainer.clientWidth, dimension.width) - 24 * 2;
         const monacoWidth = innerWidth - 10 - this.countElement.clientWidth - this.controlsElement.clientWidth - 12;
         this.searchWidget.layout(new dom.Dimension(monacoWidth, 20));
-        this.rootElement.classList.toggle('narrow-width', dimension.width < SettingsEditor2.NARROW_TOTAL_WIDTH);
+        this.rootElement.classList.toggle('narrow-width', dimension.width < SettingsEditor2_1.NARROW_TOTAL_WIDTH);
     }
     focus() {
         if (this._currentFocusContext === 0 ) {
@@ -380,7 +397,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
     clearSearchFilters() {
         const query = this.searchWidget.getValue();
         const splitQuery = query.split(' ').filter(word => {
-            return word.length && !( SettingsEditor2.SUGGESTIONS.some(suggestion => word.startsWith(suggestion)));
+            return word.length && !( SettingsEditor2_1.SUGGESTIONS.some(suggestion => word.startsWith(suggestion)));
         });
         this.searchWidget.setValue(splitQuery.join(' '));
     }
@@ -399,7 +416,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
         const searchContainer = dom.append(this.headerContainer, $('.search-container'));
         const clearInputAction = ( new Action(SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, ( localize('clearInput', "Clear Settings Search Input")), ThemeIcon.asClassName(preferencesClearInputIcon), false, async () => this.clearSearchResults()));
         const filterAction = ( new Action(SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS, ( localize('filterInput', "Filter Settings")), ThemeIcon.asClassName(preferencesFilterIcon)));
-        this.searchWidget = this._register(this.instantiationService.createInstance(SuggestEnabledInput, `${SettingsEditor2.ID}.searchbox`, searchContainer, {
+        this.searchWidget = this._register(this.instantiationService.createInstance(SuggestEnabledInput, `${SettingsEditor2_1.ID}.searchbox`, searchContainer, {
             triggerCharacters: ['@', ':'],
             provideResults: (query) => {
                 const queryParts = query.split(/\s/g);
@@ -416,11 +433,11 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
                     return installedExtensionsTags.filter(extFilter => !query.includes(extFilter));
                 }
                 else if (queryParts[queryParts.length - 1].startsWith('@')) {
-                    return ( SettingsEditor2.SUGGESTIONS.filter(tag => !query.includes(tag)).map(tag => tag.endsWith(':') ? tag : tag + ' '));
+                    return ( SettingsEditor2_1.SUGGESTIONS.filter(tag => !query.includes(tag)).map(tag => tag.endsWith(':') ? tag : tag + ' '));
                 }
                 return [];
             }
-        }, searchBoxLabel, 'settingseditor:searchinput' + SettingsEditor2.NUM_INSTANCES++, {
+        }, searchBoxLabel, 'settingseditor:searchinput' + SettingsEditor2_1.NUM_INSTANCES++, {
             placeholderText: searchBoxLabel,
             focusContextKey: this.searchFocusContextKey,
             styleOverrides: {
@@ -566,11 +583,11 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
             orientation: 1 ,
             proportionalLayout: true
         }));
-        const startingWidth = this.storageService.getNumber('settingsEditor2.splitViewWidth', 0 , SettingsEditor2.TOC_RESET_WIDTH);
+        const startingWidth = this.storageService.getNumber('settingsEditor2.splitViewWidth', 0 , SettingsEditor2_1.TOC_RESET_WIDTH);
         this.splitView.addView({
             onDidChange: Event.None,
             element: this.tocTreeContainer,
-            minimumSize: SettingsEditor2.TOC_MIN_WIDTH,
+            minimumSize: SettingsEditor2_1.TOC_MIN_WIDTH,
             maximumSize: Number.POSITIVE_INFINITY,
             layout: (width, _, height) => {
                 this.tocTreeContainer.style.width = `${width}px`;
@@ -580,7 +597,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
         this.splitView.addView({
             onDidChange: Event.None,
             element: this.settingsTreeContainer,
-            minimumSize: SettingsEditor2.EDITOR_MIN_WIDTH,
+            minimumSize: SettingsEditor2_1.EDITOR_MIN_WIDTH,
             maximumSize: Number.POSITIVE_INFINITY,
             layout: (width, _, height) => {
                 this.settingsTreeContainer.style.width = `${width}px`;
@@ -589,8 +606,8 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
         }, Sizing.Distribute, undefined, true);
         this._register(this.splitView.onDidSashReset(() => {
             const totalSize = this.splitView.getViewSize(0) + this.splitView.getViewSize(1);
-            this.splitView.resizeView(0, SettingsEditor2.TOC_RESET_WIDTH);
-            this.splitView.resizeView(1, totalSize - SettingsEditor2.TOC_RESET_WIDTH);
+            this.splitView.resizeView(0, SettingsEditor2_1.TOC_RESET_WIDTH);
+            this.splitView.resizeView(1, totalSize - SettingsEditor2_1.TOC_RESET_WIDTH);
         }));
         this._register(this.splitView.onDidSashChange(() => {
             const width = this.splitView.getViewSize(0);
@@ -620,7 +637,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
             this._currentFocusContext = 1 ;
         }));
         this._register(this.tocTree.onDidChangeFocus(e => {
-            const element = withUndefinedAsNull(e.elements?.[0]);
+            const element = e.elements?.[0] ?? null;
             if (this.tocFocusedElement === element) {
                 return;
             }
@@ -628,7 +645,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
             this.tocTree.setSelection(element ? [element] : []);
             if (this.searchResultModel) {
                 if (this.viewState.filterToCategory !== element) {
-                    this.viewState.filterToCategory = withNullAsUndefined(element);
+                    this.viewState.filterToCategory = element ?? undefined;
                     this.renderTree(undefined, true);
                     this.settingsTree.scrollTop = 0;
                 }
@@ -710,7 +727,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
             if (classList && classList.contains('monaco-list') && classList.contains('settings-editor-tree')) {
                 this._currentFocusContext = 2 ;
                 this.settingRowFocused.set(true);
-                this.treeFocusedElement ??= withUndefinedAsNull(this.settingsTree.firstVisibleElement);
+                this.treeFocusedElement ??= this.settingsTree.firstVisibleElement ?? null;
                 if (this.treeFocusedElement) {
                     this.treeFocusedElement.tabbable = true;
                 }
@@ -742,7 +759,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
             this.updateChangedSetting(key, value, manualReset, languageFilter, scope);
         }
         this.pendingSettingUpdate = { key, value, languageFilter };
-        if (SettingsEditor2.shouldSettingUpdateFast(type)) {
+        if (SettingsEditor2_1.shouldSettingUpdateFast(type)) {
             this.settingFastUpdateDelayer.trigger(() => this.updateChangedSetting(key, value, manualReset, languageFilter, scope));
         }
         else {
@@ -950,9 +967,9 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
         const toggleData = await getExperimentalExtensionToggleData(this.workbenchAssignmentService, this.environmentService, this.productService);
         if (toggleData && groups.filter(g => g.extensionInfo).length) {
             for (const key in toggleData.settingsEditorRecommendedExtensions) {
-                const prerelease = toggleData.settingsEditorRecommendedExtensions[key].onSettingsEditorOpen.prerelease;
-                const extensionId = (typeof prerelease === 'string' && this.productService.quality !== 'stable') ? prerelease : key;
-                const [extension] = await this.extensionGalleryService.getExtensions([{ id: extensionId }], CancellationToken.None);
+                const extensionId = key;
+                const isStable = this.productService.quality === 'stable';
+                const [extension] = await this.extensionGalleryService.getExtensions([{ id: extensionId, preRelease: !isStable }], CancellationToken.None);
                 if (!extension) {
                     continue;
                 }
@@ -980,8 +997,8 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
                     scope: 3 ,
                     type: 'null',
                     displayExtensionId: extensionId,
+                    prereleaseExtensionId: key,
                     stableExtensionId: key,
-                    prereleaseExtensionId: typeof prerelease === 'string' ? prerelease : key,
                     extensionGroupTitle: groupTitle ?? extensionName
                 };
                 const additionalGroup = this.addOrRemoveManageExtensionSetting(setting, extension, groups);
@@ -1230,20 +1247,21 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
             this.searchInProgress = null;
         }
         const searchInProgress = this.searchInProgress = ( new CancellationTokenSource());
-        return this.localSearchDelayer.trigger(() => {
+        return this.localSearchDelayer.trigger(async () => {
             if (searchInProgress && !searchInProgress.token.isCancellationRequested) {
-                return this.localFilterPreferences(query).then(result => {
-                    if (result && !result.exactMatch) {
-                        this.remoteSearchThrottle.trigger(() => {
-                            return searchInProgress && !searchInProgress.token.isCancellationRequested ?
-                                this.remoteSearchPreferences(query, this.searchInProgress.token) :
-                                Promise.resolve();
-                        });
-                    }
-                });
-            }
-            else {
-                return Promise.resolve();
+                const progressRunner = this.editorProgressService.show(true);
+                const result = await this.localFilterPreferences(query);
+                if (result && !result.exactMatch) {
+                    this.remoteSearchThrottle.trigger(async () => {
+                        if (searchInProgress && !searchInProgress.token.isCancellationRequested) {
+                            await this.remoteSearchPreferences(query, this.searchInProgress.token);
+                        }
+                        progressRunner.done();
+                    });
+                }
+                else {
+                    progressRunner.done();
+                }
             }
         });
     }
@@ -1259,31 +1277,30 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
             this.filterOrSearchPreferences(query, 2 , newExtSearchProvider, token)
         ]).then(() => { });
     }
-    filterOrSearchPreferences(query, type, searchProvider, token) {
-        return this._filterOrSearchPreferencesModel(query, this.defaultSettingsEditorModel, searchProvider, token).then(result => {
-            if (token && token.isCancellationRequested) {
-                return null;
-            }
-            if (!this.searchResultModel) {
-                this.searchResultModel = this.instantiationService.createInstance(SearchResultModel, this.viewState, this.workspaceTrustManagementService.isWorkspaceTrusted());
-                this.searchResultModel.setResult(type, result);
-                this.tocTreeModel.currentSearchModel = this.searchResultModel;
-                this.onSearchModeToggled();
-            }
-            else {
-                this.searchResultModel.setResult(type, result);
-                this.tocTreeModel.update();
-            }
-            if (type === 0 ) {
-                this.tocTree.setFocus([]);
-                this.viewState.filterToCategory = undefined;
-                this.tocTree.expandAll();
-            }
-            this.settingsTree.scrollTop = 0;
-            this.refreshTOCTree();
-            this.renderTree(undefined, true);
-            return result;
-        });
+    async filterOrSearchPreferences(query, type, searchProvider, token) {
+        const result = await this._filterOrSearchPreferencesModel(query, this.defaultSettingsEditorModel, searchProvider, token);
+        if (token?.isCancellationRequested) {
+            return null;
+        }
+        if (!this.searchResultModel) {
+            this.searchResultModel = this.instantiationService.createInstance(SearchResultModel, this.viewState, this.workspaceTrustManagementService.isWorkspaceTrusted());
+            this.searchResultModel.setResult(type, result);
+            this.tocTreeModel.currentSearchModel = this.searchResultModel;
+            this.onSearchModeToggled();
+        }
+        else {
+            this.searchResultModel.setResult(type, result);
+            this.tocTreeModel.update();
+        }
+        if (type === 0 ) {
+            this.tocTree.setFocus([]);
+            this.viewState.filterToCategory = undefined;
+            this.tocTree.expandAll();
+        }
+        this.settingsTree.scrollTop = 0;
+        this.refreshTOCTree();
+        this.renderTree(undefined, true);
+        return result;
     }
     renderResultCountMessages() {
         if (!this.currentSettingsModel) {
@@ -1297,6 +1314,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
                 this.searchResultLabel = null;
                 this.updateInputAriaLabel();
                 this.countElement.style.display = 'none';
+                this.countElement.innerText = '';
                 this.layout(this.dimension);
             }
             this.rootElement.classList.remove('no-results');
@@ -1344,10 +1362,10 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
         this.splitView.el.style.height = `${listHeight}px`;
         this.splitView.layout(this.bodyContainer.clientWidth, listHeight);
         const firstViewWasVisible = this.splitView.isViewVisible(0);
-        const firstViewVisible = this.bodyContainer.clientWidth >= SettingsEditor2.NARROW_TOTAL_WIDTH;
+        const firstViewVisible = this.bodyContainer.clientWidth >= SettingsEditor2_1.NARROW_TOTAL_WIDTH;
         this.splitView.setViewVisible(0, firstViewVisible);
-        if (!firstViewWasVisible && firstViewVisible && this.bodyContainer.clientWidth >= SettingsEditor2.EDITOR_MIN_WIDTH + SettingsEditor2.TOC_RESET_WIDTH) {
-            this.splitView.resizeView(0, SettingsEditor2.TOC_RESET_WIDTH);
+        if (!firstViewWasVisible && firstViewVisible && this.bodyContainer.clientWidth >= SettingsEditor2_1.EDITOR_MIN_WIDTH + SettingsEditor2_1.TOC_RESET_WIDTH) {
+            this.splitView.resizeView(0, SettingsEditor2_1.TOC_RESET_WIDTH);
         }
         this.splitView.style({
             separatorBorder: firstViewVisible ? this.theme.getColor(settingsSashBorder) : Color.transparent
@@ -1367,7 +1385,7 @@ let SettingsEditor2 = class SettingsEditor2 extends EditorPane {
         super.saveState();
     }
 };
-SettingsEditor2 = ( __decorate([
+SettingsEditor2 = SettingsEditor2_1 = ( __decorate([
     ( __param(0, ITelemetryService)),
     ( __param(1, IWorkbenchConfigurationService)),
     ( __param(2, ITextResourceConfigurationService)),
@@ -1388,7 +1406,8 @@ SettingsEditor2 = ( __decorate([
     ( __param(17, IWorkbenchAssignmentService)),
     ( __param(18, IProductService)),
     ( __param(19, IEnvironmentService)),
-    ( __param(20, IExtensionGalleryService))
+    ( __param(20, IExtensionGalleryService)),
+    ( __param(21, IEditorProgressService))
 ], SettingsEditor2));
 let SyncControls = class SyncControls extends Disposable {
     constructor(container, commandService, userDataSyncService, userDataSyncEnablementService) {