@codingame/monaco-vscode-quickaccess-service-override 22.1.9 → 23.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-service-override",
-  "version": "22.1.9",
+  "version": "23.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - quickaccess service-override",
   "keywords": [],
@@ -15,14 +15,14 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "22.1.9",
-    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "22.1.9",
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "22.1.9",
-    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "22.1.9",
-    "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common": "22.1.9",
-    "@codingame/monaco-vscode-api": "22.1.9",
-    "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "22.1.9",
-    "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common": "22.1.9"
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "23.0.1",
+    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.0.1",
+    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "23.0.1",
+    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "23.0.1",
+    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "23.0.1",
+    "@codingame/monaco-vscode-api": "23.0.1",
+    "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "23.0.1",
+    "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common": "23.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/base/common/normalization.d.ts

@@ -0,0 +1,3 @@
+export declare function normalizeNFC(str: string): string;
+export declare function normalizeNFD(str: string): string;
+export declare const removeAccents: (str: string) => string;

package/vscode/src/vs/base/common/normalization.js

@@ -0,0 +1,34 @@
+
+import { LRUCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+
+const nfdCache = ( new LRUCache(10000));
+function normalizeNFD(str) {
+    return normalize(str, 'NFD', nfdCache);
+}
+const nonAsciiCharactersPattern = /[^\u0000-\u0080]/;
+function normalize(str, form, normalizedCache) {
+    if (!str) {
+        return str;
+    }
+    const cached = normalizedCache.get(str);
+    if (cached) {
+        return cached;
+    }
+    let res;
+    if (nonAsciiCharactersPattern.test(str)) {
+        res = str.normalize(form);
+    }
+    else {
+        res = str;
+    }
+    normalizedCache.set(str, res);
+    return res;
+}
+const removeAccents = (function () {
+    const regex = /[\u0300-\u036f]/g;
+    return function (str) {
+        return normalizeNFD(str).replace(regex, '');
+    };
+})();
+
+export { normalizeNFD, removeAccents };

package/vscode/src/vs/platform/quickinput/browser/commandsQuickAccess.d.ts

@@ -7,7 +7,7 @@ import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { FastAndSlowPicks, IPickerQuickAccessItem, IPickerQuickAccessProviderOptions, PickerQuickAccessProvider, Picks } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
+import { FastAndSlowPicks, IPickerQuickAccessItem, IPickerQuickAccessProviderOptions, PickerQuickAccessProvider, Picks } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
 import { IQuickAccessProviderRunOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickAccess";
 import { IQuickPickSeparator } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
@@ -17,8 +17,11 @@ export interface ICommandQuickPick extends IPickerQuickAccessItem {
     readonly commandWhen?: string;
     readonly commandAlias?: string;
     readonly commandDescription?: ILocalizedString;
+    readonly commandCategory?: string;
+    readonly args?: unknown[];
     tfIdfScore?: number;
-    readonly args?: any[];
+    labelNoAccents?: string;
+    aliasNoAccents?: string;
 }
 export interface ICommandsQuickAccessOptions extends IPickerQuickAccessProviderOptions<ICommandQuickPick> {
     readonly showAlias: boolean;
@@ -39,6 +42,11 @@ export declare abstract class AbstractCommandsQuickAccessProvider extends Picker
     protected _getPicks(filter: string, _disposables: DisposableStore, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): Promise<Picks<ICommandQuickPick> | FastAndSlowPicks<ICommandQuickPick>>;
     private toCommandPick;
     private getTfIdfChunk;
+    /**
+     * Normalizes a string for filtering by removing accents, but only if
+     * the result has the same length, otherwise returns the original string.
+     */
+    private normalizeForFiltering;
     protected abstract getCommandPicks(token: CancellationToken): Promise<Array<ICommandQuickPick>>;
     protected abstract hasAdditionalCommandPicks(filter: string, token: CancellationToken): boolean;
     protected abstract getAdditionalCommandPicks(allPicks: ICommandQuickPick[], picksSoFar: ICommandQuickPick[], filter: string, token: CancellationToken): Promise<Array<ICommandQuickPick | IQuickPickSeparator>>;

package/vscode/src/vs/platform/quickinput/browser/commandsQuickAccess.js

@@ -14,10 +14,12 @@ import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { PickerQuickAccessProvider } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { PickerQuickAccessProvider } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { WillSaveStateReason, StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { removeAccents } from '../../../base/common/normalization.js';
+import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 
 var AbstractCommandsQuickAccessProvider_1, CommandsHistory_1;
 let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvider extends PickerQuickAccessProvider {
@@ -51,10 +53,16 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 .filter(score => score.score > AbstractCommandsQuickAccessProvider_1.TFIDF_THRESHOLD)
                 .slice(0, AbstractCommandsQuickAccessProvider_1.TFIDF_MAX_RESULTS);
         });
+        const noAccentsFilter = this.normalizeForFiltering(filter);
         const filteredCommandPicks = [];
         for (const commandPick of allCommandPicks) {
-            const labelHighlights = AbstractCommandsQuickAccessProvider_1.WORD_FILTER(filter, commandPick.label) ?? undefined;
-            const aliasHighlights = commandPick.commandAlias ? AbstractCommandsQuickAccessProvider_1.WORD_FILTER(filter, commandPick.commandAlias) ?? undefined : undefined;
+            commandPick.labelNoAccents ??= this.normalizeForFiltering(commandPick.label);
+            const labelHighlights = AbstractCommandsQuickAccessProvider_1.WORD_FILTER(noAccentsFilter, commandPick.labelNoAccents) ?? undefined;
+            let aliasHighlights;
+            if (commandPick.commandAlias) {
+                commandPick.aliasNoAccents ??= this.normalizeForFiltering(commandPick.commandAlias);
+                aliasHighlights = AbstractCommandsQuickAccessProvider_1.WORD_FILTER(noAccentsFilter, commandPick.aliasNoAccents) ?? undefined;
+            }
             if (labelHighlights || aliasHighlights) {
                 commandPick.highlights = {
                     label: labelHighlights,
@@ -125,6 +133,14 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                     return 1;
                 }
             }
+            const isDeveloperA = commandPickA.commandCategory === Categories.Developer.value;
+            const isDeveloperB = commandPickB.commandCategory === Categories.Developer.value;
+            if (isDeveloperA && !isDeveloperB) {
+                return 1;
+            }
+            if (!isDeveloperA && isDeveloperB) {
+                return -1;
+            }
             return commandPickA.label.localeCompare(commandPickB.label);
         });
         const commandPicks = [];
@@ -134,20 +150,20 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         for (let i = 0; i < filteredCommandPicks.length; i++) {
             const commandPick = filteredCommandPicks[i];
             if (i === 0 && this.commandsHistory.peek(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localize(1979, "recently used")) });
+                commandPicks.push({ type: 'separator', label: ( localize(1988, "recently used")) });
                 addOtherSeparator = true;
             }
             if (addSuggestedSeparator && commandPick.tfIdfScore !== undefined) {
-                commandPicks.push({ type: 'separator', label: ( localize(1980, "similar commands")) });
+                commandPicks.push({ type: 'separator', label: ( localize(1989, "similar commands")) });
                 addSuggestedSeparator = false;
             }
             if (addCommonlyUsedSeparator && commandPick.tfIdfScore === undefined && !this.commandsHistory.peek(commandPick.commandId) && this.options.suggestedCommandIds?.has(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localize(1981, "commonly used")) });
+                commandPicks.push({ type: 'separator', label: ( localize(1990, "commonly used")) });
                 addOtherSeparator = true;
                 addCommonlyUsedSeparator = false;
             }
             if (addOtherSeparator && commandPick.tfIdfScore === undefined && !this.commandsHistory.peek(commandPick.commandId) && !this.options.suggestedCommandIds?.has(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localize(1982, "other commands")) });
+                commandPicks.push({ type: 'separator', label: ( localize(1991, "other commands")) });
                 addOtherSeparator = false;
             }
             commandPicks.push(this.toCommandPick(commandPick, runOptions));
@@ -164,7 +180,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 }
                 const commandPicks = ( additionalCommandPicks.map(commandPick => this.toCommandPick(commandPick, runOptions)));
                 if (addSuggestedSeparator && commandPicks[0]?.type !== 'separator') {
-                    commandPicks.unshift({ type: 'separator', label: ( localize(1980, "similar commands")) });
+                    commandPicks.unshift({ type: 'separator', label: ( localize(1989, "similar commands")) });
                 }
                 return commandPicks;
             })()
@@ -176,7 +192,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         }
         const keybinding = this.keybindingService.lookupKeybinding(commandPick.commandId);
         const ariaLabel = keybinding ?
-            ( localize(1983, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
+            ( localize(1992, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
             commandPick.label;
         return {
             ...commandPick,
@@ -196,7 +212,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 }
                 catch (error) {
                     if (!isCancellationError(error)) {
-                        this.dialogService.error(( localize(1984, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
+                        this.dialogService.error(( localize(1993, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
                     }
                 }
             }
@@ -212,6 +228,19 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         }
         return chunk;
     }
+    normalizeForFiltering(value) {
+        const withoutAccents = removeAccents(value);
+        if (withoutAccents.length !== value.length) {
+            this.telemetryService.publicLog2('QuickAccess:FilterLengthMismatch', {
+                originalLength: value.length,
+                normalizedLength: withoutAccents.length
+            });
+            return value;
+        }
+        else {
+            return withoutAccents;
+        }
+    }
 };
 AbstractCommandsQuickAccessProvider = AbstractCommandsQuickAccessProvider_1 = ( __decorate([
     ( __param(1, IInstantiationService)),

package/vscode/src/vs/platform/quickinput/browser/helpQuickAccess.js

@@ -48,7 +48,7 @@ let HelpQuickAccessProvider = class HelpQuickAccessProvider {
                 prefix,
                 label,
                 keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
-                ariaLabel: ( localize(1985, "{0}, {1}", label, helpEntry.description)),
+                ariaLabel: ( localize(1994, "{0}, {1}", label, helpEntry.description)),
                 description: helpEntry.description
             };
         }));

package/vscode/src/vs/workbench/browser/actions/quickAccessActions.js

@@ -105,7 +105,7 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpen',
-            title: ( localize2(2837, "Go to File...")),
+            title: ( localize2(2857, "Go to File...")),
             metadata: {
                 description: `Quick access`,
                 args: [{
@@ -133,7 +133,7 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpenWithModes',
-            title: ( localize(2838, "Quick Open")),
+            title: ( localize(2858, "Quick Open")),
             icon: Codicon.search,
             menu: {
                 id: MenuId.CommandCenterCenter,
@@ -174,17 +174,17 @@ class BaseQuickAccessNavigateAction extends Action2 {
 }
 class QuickAccessNavigateNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigateNext', ( localize2(2839, 'Navigate Next in Quick Open')), true, true);
+        super('workbench.action.quickOpenNavigateNext', ( localize2(2859, 'Navigate Next in Quick Open')), true, true);
     }
 }
 class QuickAccessNavigatePreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigatePrevious', ( localize2(2840, 'Navigate Previous in Quick Open')), false, true);
+        super('workbench.action.quickOpenNavigatePrevious', ( localize2(2860, 'Navigate Previous in Quick Open')), false, true);
     }
 }
 class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectNext', ( localize2(2841, 'Select Next in Quick Open')), true, false, {
+        super('workbench.action.quickOpenSelectNext', ( localize2(2861, 'Select Next in Quick Open')), true, false, {
             weight: KeybindingWeight.WorkbenchContrib + 50,
             when: inQuickPickContext,
             primary: 0,
@@ -194,7 +194,7 @@ class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
 }
 class QuickAccessSelectPreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectPrevious', ( localize2(2842, 'Select Previous in Quick Open')), false, false, {
+        super('workbench.action.quickOpenSelectPrevious', ( localize2(2862, 'Select Previous in Quick Open')), false, false, {
             weight: KeybindingWeight.WorkbenchContrib + 50,
             when: inQuickPickContext,
             primary: 0,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.d.ts

@@ -6,12 +6,14 @@ import { AbstractGotoLineQuickAccessProvider } from "@codingame/monaco-vscode-ed
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IQuickAccessTextEditorContext } from "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 export declare class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProvider {
     private readonly editorService;
     private readonly editorGroupService;
     private readonly configurationService;
+    protected readonly storageService: IStorageService;
     protected readonly onDidActiveTextEditorControlChange: Event<void>;
-    constructor(editorService: IEditorService, editorGroupService: IEditorGroupsService, configurationService: IConfigurationService);
+    constructor(editorService: IEditorService, editorGroupService: IEditorGroupsService, configurationService: IConfigurationService, storageService: IStorageService);
     private get configuration();
     protected get activeTextEditorControl(): import("@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon").IEditor | import("@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon").IDiffEditor | undefined;
     protected gotoLocation(context: IQuickAccessTextEditorContext, options: {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js

@@ -11,13 +11,15 @@ import { Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 
 let GotoLineQuickAccessProvider = class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProvider {
-    constructor(editorService, editorGroupService, configurationService) {
+    constructor(editorService, editorGroupService, configurationService, storageService) {
         super();
         this.editorService = editorService;
         this.editorGroupService = editorGroupService;
         this.configurationService = configurationService;
+        this.storageService = storageService;
         this.onDidActiveTextEditorControlChange = this.editorService.onDidActiveEditorChange;
     }
     get configuration() {
@@ -47,14 +49,15 @@ let GotoLineQuickAccessProvider = class GotoLineQuickAccessProvider extends Abst
 GotoLineQuickAccessProvider = ( __decorate([
     ( __param(0, IEditorService)),
     ( __param(1, IEditorGroupsService)),
-    ( __param(2, IConfigurationService))
+    ( __param(2, IConfigurationService)),
+    ( __param(3, IStorageService))
 ], GotoLineQuickAccessProvider));
 class GotoLineAction extends Action2 {
     static { this.ID = 'workbench.action.gotoLine'; }
     constructor() {
         super({
             id: GotoLineAction.ID,
-            title: ( localize2(5776, 'Go to Line/Column...')),
+            title: ( localize2(6019, 'Go to Line/Column...')),
             f1: true,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -73,10 +76,10 @@ registerAction2(GotoLineAction);
     ctor: GotoLineQuickAccessProvider,
     prefix: AbstractGotoLineQuickAccessProvider.PREFIX,
     placeholder: ( localize(
-        5777,
-        "Type the line number and optional column to go to (e.g. 42:5 for line 42 and column 5)."
+        6020,
+        "Type the line number and optional column to go to (e.g. :42:5 for line 42, column 5). Type :: to go to a character offset (e.g. ::1024 for character 1024 from the start of the file). Use negative values to navigate backwards."
     )),
-    helpEntries: [{ description: ( localize(5778, "Go to Line/Column")), commandId: GotoLineAction.ID }]
+    helpEntries: [{ description: ( localize(6021, "Go to Line/Column")), commandId: GotoLineAction.ID }]
 });
 
 export { GotoLineQuickAccessProvider };

package/vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js

@@ -20,7 +20,7 @@ import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { CommandsHistory } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
-import { TriggerAction } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { TriggerAction } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { DefaultQuickAccessFilterValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickAccess';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
@@ -52,7 +52,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         super({
             showAlias: !Language.isDefaultVariant(),
             noResultsPick: () => ({
-                label: ( localize(9754, "No matching commands")),
+                label: ( localize(10002, "No matching commands")),
                 commandId: ''
             }),
         }, instantiationService, keybindingService, commandService, telemetryService, dialogService);
@@ -73,6 +73,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         const commandPaletteConfig = this.configurationService.getValue().workbench.commandPalette;
         return {
             preserveInput: commandPaletteConfig.preserveInput,
+            showAskInChat: commandPaletteConfig.showAskInChat,
             experimental: commandPaletteConfig.experimental
         };
     }
@@ -99,7 +100,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
             ...picks,
             buttons: [{
                     iconClass: ThemeIcon.asClassName(Codicon.gear),
-                    tooltip: ( localize(9755, "Configure Keybinding")),
+                    tooltip: ( localize(10003, "Configure Keybinding")),
                 }],
             trigger: () => {
                 this.preferencesService.openGlobalKeybindingSettings(false, { query: createKeybindingCommandQuery(picks.commandId, picks.commandWhen) });
@@ -120,26 +121,35 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         if (!this.hasAdditionalCommandPicks(filter, token)) {
             return [];
         }
-        let additionalPicks;
+        let additionalPicks = [];
         try {
             await timeout(CommandsQuickAccessProvider_1.AI_RELATED_INFORMATION_DEBOUNCE, token);
             additionalPicks = await this.getRelatedInformationPicks(allPicks, picksSoFar, filter, token);
         }
         catch (e) {
-            return [];
-        }
-        if (picksSoFar.length || additionalPicks.length) {
-            additionalPicks.push({
-                type: 'separator'
-            });
         }
-        const defaultAgent = this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat);
-        if (defaultAgent) {
-            additionalPicks.push({
-                label: ( localize(9756, "Ask {0}: {1}", defaultAgent.fullName, filter)),
-                commandId: this.configuration.experimental.askChatLocation === 'quickChat' ? ASK_QUICK_QUESTION_ACTION_ID : CHAT_OPEN_ACTION_ID,
-                args: [filter]
-            });
+        if (this.configuration.showAskInChat) {
+            const defaultAgent = this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat);
+            if (defaultAgent) {
+                if (picksSoFar.length || additionalPicks.length) {
+                    additionalPicks.push({
+                        type: 'separator'
+                    });
+                }
+                additionalPicks.push({
+                    label: ( localize(10004, "Ask in Chat: {0}", filter)),
+                    commandId: this.configuration.experimental.askChatLocation === 'quickChat' ? ASK_QUICK_QUESTION_ACTION_ID : CHAT_OPEN_ACTION_ID,
+                    args: [filter],
+                    buttons: [{
+                            iconClass: ThemeIcon.asClassName(Codicon.gear),
+                            tooltip: ( localize(10005, "Configure visibility")),
+                        }],
+                    trigger: () => {
+                        void this.preferencesService.openSettings({ jsonEditor: false, query: 'workbench.commandPalette.showAskInChat' });
+                        return TriggerAction.CLOSE_PICKER;
+                    },
+                });
+            }
         }
         return additionalPicks;
     }
@@ -170,7 +180,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
             let label = (typeof action.item.title === 'string' ? action.item.title : action.item.title.value) || action.item.id;
             const category = typeof action.item.category === 'string' ? action.item.category : action.item.category?.value;
             if (category) {
-                label = ( localize(9757, "{0}: {1}", category, label));
+                label = ( localize(10006, "{0}: {1}", category, label));
             }
             const aliasLabel = typeof action.item.title !== 'string' ? action.item.title.original : undefined;
             const aliasCategory = (category && action.item.category && typeof action.item.category !== 'string') ? action.item.category.original : undefined;
@@ -187,6 +197,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
                 commandAlias,
                 label: stripIcons(label),
                 commandDescription,
+                commandCategory: category,
             });
         }
         return globalCommandPicks;
@@ -213,7 +224,7 @@ class ShowAllCommandsAction extends Action2 {
     constructor() {
         super({
             id: ShowAllCommandsAction.ID,
-            title: ( localize2(9758, 'Show All Commands')),
+            title: ( localize2(10007, 'Show All Commands')),
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
                 when: undefined,
@@ -231,7 +242,7 @@ class ClearCommandHistoryAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.clearCommandHistory',
-            title: ( localize2(9759, 'Clear Command History')),
+            title: ( localize2(10008, 'Clear Command History')),
             f1: true
         });
     }
@@ -243,9 +254,9 @@ class ClearCommandHistoryAction extends Action2 {
         if (commandHistoryLength > 0) {
             const { confirmed } = await dialogService.confirm({
                 type: 'warning',
-                message: ( localize(9760, "Do you want to clear the history of recently used commands?")),
-                detail: ( localize(9761, "This action is irreversible!")),
-                primaryButton: ( localize(9762, "&&Clear"))
+                message: ( localize(10009, "Do you want to clear the history of recently used commands?")),
+                detail: ( localize(10010, "This action is irreversible!")),
+                primaryButton: ( localize(10011, "&&Clear"))
             });
             if (!confirmed) {
                 return;

package/vscode/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.js

@@ -17,35 +17,35 @@ quickAccessRegistry.registerQuickAccessProvider({
     ctor: HelpQuickAccessProvider,
     prefix: HelpQuickAccessProvider.PREFIX,
     placeholder: ( localize(
-        9763,
+        10012,
         "Type '{0}' to get help on the actions you can take from here.",
         HelpQuickAccessProvider.PREFIX
     )),
     helpEntries: [{
-            description: ( localize(9764, "Show all Quick Access Providers")),
+            description: ( localize(10013, "Show all Quick Access Providers")),
             commandCenterOrder: 70,
-            commandCenterLabel: ( localize(9765, 'More'))
+            commandCenterLabel: ( localize(10014, 'More'))
         }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: ViewQuickAccessProvider,
     prefix: ViewQuickAccessProvider.PREFIX,
     contextKey: 'inViewsPicker',
-    placeholder: ( localize(9766, "Type the name of a view, output channel or terminal to open.")),
-    helpEntries: [{ description: ( localize(9767, "Open View")), commandId: OpenViewPickerAction.ID }]
+    placeholder: ( localize(10015, "Type the name of a view, output channel or terminal to open.")),
+    helpEntries: [{ description: ( localize(10016, "Open View")), commandId: OpenViewPickerAction.ID }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: CommandsQuickAccessProvider,
     prefix: CommandsQuickAccessProvider.PREFIX,
     contextKey: 'inCommandsPicker',
-    placeholder: ( localize(9768, "Type the name of a command to run.")),
-    helpEntries: [{ description: ( localize(9769, "Show and Run Commands")), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
+    placeholder: ( localize(10017, "Type the name of a command to run.")),
+    helpEntries: [{ description: ( localize(10018, "Show and Run Commands")), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(9770, "&&Command Palette..."))
+        title: ( localize(10019, "&&Command Palette..."))
     },
     order: 1
 });
@@ -53,7 +53,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
     group: '1_welcome',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(9771, "Show All Commands"))
+        title: ( localize(10020, "Show All Commands"))
     },
     order: 2
 });
@@ -61,7 +61,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: OpenViewPickerAction.ID,
-        title: ( localize(9772, "&&Open View..."))
+        title: ( localize(10021, "&&Open View..."))
     },
     order: 2
 });
@@ -69,7 +69,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '5_infile_nav',
     command: {
         id: 'workbench.action.gotoLine',
-        title: ( localize(9773, "Go to &&Line/Column..."))
+        title: ( localize(10022, "Go to &&Line/Column..."))
     },
     order: 1
 });
@@ -77,7 +77,7 @@ MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
     group: '1_command',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(9774, "Command Palette..."))
+        title: ( localize(10023, "Command Palette..."))
     },
     order: 1
 });
@@ -86,7 +86,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     when: ( EditorContextKeys.editorSimpleInput.toNegated()),
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(9774, "Command Palette...")),
+        title: ( localize(10023, "Command Palette...")),
     },
     order: 1
 });

package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.d.ts

@@ -1,5 +1,5 @@
 import { IQuickPickSeparator } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
-import { IPickerQuickAccessItem, PickerQuickAccessProvider } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
+import { IPickerQuickAccessItem, PickerQuickAccessProvider } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
 import { IOutputService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/output/common/output.service";

package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ItemActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { PickerQuickAccessProvider } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { PickerQuickAccessProvider } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
@@ -28,7 +28,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
     constructor(viewDescriptorService, viewsService, outputService, terminalService, terminalGroupService, debugService, paneCompositeService, contextKeyService) {
         super(ViewQuickAccessProvider_1.PREFIX, {
             noResultsPick: {
-                label: ( localize(9775, "No matching views")),
+                label: ( localize(10024, "No matching views")),
                 containerLabel: ''
             }
         });
@@ -116,9 +116,9 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
                 }
             }
         };
-        addPaneComposites(ViewContainerLocation.Sidebar, ( localize(9776, "Side Bar")));
-        addPaneComposites(ViewContainerLocation.Panel, ( localize(9777, "Panel")));
-        addPaneComposites(ViewContainerLocation.AuxiliaryBar, ( localize(9778, "Secondary Side Bar")));
+        addPaneComposites(ViewContainerLocation.Sidebar, ( localize(10025, "Side Bar")));
+        addPaneComposites(ViewContainerLocation.Panel, ( localize(10026, "Panel")));
+        addPaneComposites(ViewContainerLocation.AuxiliaryBar, ( localize(10027, "Secondary Side Bar")));
         const addPaneCompositeViews = (location) => {
             const paneComposites = this.paneCompositeService.getPaneComposites(location);
             for (const paneComposite of paneComposites) {
@@ -133,10 +133,15 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
         addPaneCompositeViews(ViewContainerLocation.AuxiliaryBar);
         this.terminalGroupService.groups.forEach((group, groupIndex) => {
             group.terminalInstances.forEach((terminal, terminalIndex) => {
-                const label = ( localize(9779, "{0}: {1}", `${groupIndex + 1}.${terminalIndex + 1}`, terminal.title));
+                const label = ( localize(
+                    10028,
+                    "{0}: {1}",
+                    `${groupIndex + 1}.${terminalIndex + 1}`,
+                    terminal.title
+                ));
                 viewEntries.push({
                     label,
-                    containerLabel: ( localize(9780, "Terminal")),
+                    containerLabel: ( localize(10029, "Terminal")),
                     accept: async () => {
                         await this.terminalGroupService.showPanel(true);
                         this.terminalService.setActiveInstance(terminal);
@@ -148,7 +153,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
             const label = session.name;
             viewEntries.push({
                 label,
-                containerLabel: ( localize(9781, "Debug Console")),
+                containerLabel: ( localize(10030, "Debug Console")),
                 accept: async () => {
                     await this.debugService.focusStackFrame(undefined, undefined, session, { explicit: true });
                     if (!this.viewsService.isViewVisible(REPL_VIEW_ID)) {
@@ -161,7 +166,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
         for (const channel of channels) {
             viewEntries.push({
                 label: channel.label,
-                containerLabel: ( localize(9782, "Output")),
+                containerLabel: ( localize(10031, "Output")),
                 accept: () => this.outputService.showChannel(channel.id)
             });
         }
@@ -190,7 +195,7 @@ class OpenViewPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenViewPickerAction.ID,
-            title: ( localize2(9783, 'Open View')),
+            title: ( localize2(10032, 'Open View')),
             category: Categories.View,
             f1: true
         });
@@ -209,7 +214,7 @@ class QuickAccessViewPickerAction extends Action2 {
     constructor() {
         super({
             id: QuickAccessViewPickerAction.ID,
-            title: ( localize2(9784, 'Quick Open View')),
+            title: ( localize2(10033, 'Quick Open View')),
             category: Categories.View,
             f1: false,
             keybinding: {

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.js

@@ -68,25 +68,25 @@ let OpenerValidatorContributions = class OpenerValidatorContributions {
             const { result } = await this._dialogService.prompt({
                 type: Severity.Info,
                 message: ( localize(
-                    12409,
+                    12703,
                     'Do you want {0} to open the external website?',
                     this._productService.nameShort
                 )),
                 detail: typeof originalResource === 'string' ? originalResource : formattedLink,
                 buttons: [
                     {
-                        label: ( localize(12410, '&&Open')),
+                        label: ( localize(12704, '&&Open')),
                         run: () => true
                     },
                     {
-                        label: ( localize(12411, '&&Copy')),
+                        label: ( localize(12705, '&&Copy')),
                         run: () => {
                             this._clipboardService.writeText(typeof originalResource === 'string' ? originalResource : ( resourceUri.toString(true)));
                             return false;
                         }
                     },
                     {
-                        label: ( localize(12412, 'Configure &&Trusted Domains')),
+                        label: ( localize(12706, 'Configure &&Trusted Domains')),
                         run: async () => {
                             const { trustedDomains, } = this._instantiationService.invokeFunction(readStaticTrustedDomains);
                             const domainToOpen = `${scheme}://${authority}`;

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

@@ -26,7 +26,7 @@ class OpenUrlAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.url.openUrl',
-            title: ( localize2(12413, 'Open URL')),
+            title: ( localize2(12707, 'Open URL')),
             category: Categories.Developer,
             f1: true
         });
@@ -36,7 +36,7 @@ class OpenUrlAction extends Action2 {
         const urlService = accessor.get(IURLService);
         const storageService = accessor.get(IStorageService);
         const value = storageService.get(OpenUrlAction.STORAGE_KEY, StorageScope.WORKSPACE, '');
-        return quickInputService.input({ prompt: ( localize(12414, "URL to open")), value }).then(input => {
+        return quickInputService.input({ prompt: ( localize(12708, "URL to open")), value }).then(input => {
             if (input) {
                 const uri = ( URI.parse(input));
                 urlService.open(uri, { originalUrl: input });
@@ -67,7 +67,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: false,
             description: ( localize(
-                12415,
+                12709,
                 "When enabled, trusted domain prompts will appear when opening links in trusted workspaces."
             ))
         }