@codingame/monaco-vscode-quickaccess-service-override 9.0.2 → 10.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-service-override",
-  "version": "9.0.2",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0"
   }
 }

package/quickaccess.js

@@ -26,7 +26,7 @@ const original = CommandsQuickAccessProvider.prototype['getCommandPicks'];
 CommandsQuickAccessProvider.prototype['getCommandPicks'] = async function (token) {
     let result = await original.call(this, token);
     if (!isKeybindingConfigurationVisible()) {
-        result = ( result.map(picks => ({
+        result = ( result.map((picks) => ({
             ...picks,
             buttons: undefined
         })));
@@ -40,22 +40,34 @@ let DelegateQuickInputService = class DelegateQuickInputService {
     }
     get activeService() {
         const activeCodeEditor = StandaloneServices.get(ICodeEditorService).getFocusedCodeEditor();
-        if (activeCodeEditor == null || shouldUseGlobalPicker(activeCodeEditor, activeCodeEditor instanceof StandaloneCodeEditor)) {
+        if (activeCodeEditor == null ||
+            shouldUseGlobalPicker(activeCodeEditor, activeCodeEditor instanceof StandaloneCodeEditor)) {
             return this.workbenchQuickInputService;
         }
         this.standaloneQuickInputService ?? (this.standaloneQuickInputService = this.instantiationService.createInstance(StandaloneQuickInputService));
         return this.standaloneQuickInputService;
     }
-    get currentQuickInput() { return this.activeService.currentQuickInput; }
-    get quickAccess() { return this.activeService.quickAccess; }
-    get backButton() { return this.activeService.backButton; }
-    get onShow() { return this.activeService.onShow; }
-    get onHide() { return this.activeService.onHide; }
+    get currentQuickInput() {
+        return this.activeService.currentQuickInput;
+    }
+    get quickAccess() {
+        return this.activeService.quickAccess;
+    }
+    get backButton() {
+        return this.activeService.backButton;
+    }
+    get onShow() {
+        return this.activeService.onShow;
+    }
+    get onHide() {
+        return this.activeService.onHide;
+    }
     createQuickWidget() {
         return this.activeService.createQuickWidget();
     }
     pick(picks, options = {}, token = CancellationToken.None) {
-        return this.activeService .pick(picks, options, token);
+        return this.activeService
+            .pick(picks, options, token);
     }
     input(options, token) {
         return this.activeService.input(options, token);

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

@@ -14,7 +14,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
-import { WillSaveStateReason, StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { WillSaveStateReason } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 
@@ -134,20 +134,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(4579, "recently used")) });
+                commandPicks.push({ type: 'separator', label: ( localize(4606, "recently used")) });
                 addOtherSeparator = true;
             }
             if (addSuggestedSeparator && commandPick.tfIdfScore !== undefined) {
-                commandPicks.push({ type: 'separator', label: ( localize(4580, "similar commands")) });
+                commandPicks.push({ type: 'separator', label: ( localize(4607, "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(4581, "commonly used")) });
+                commandPicks.push({ type: 'separator', label: ( localize(4608, "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(4582, "other commands")) });
+                commandPicks.push({ type: 'separator', label: ( localize(4609, "other commands")) });
                 addOtherSeparator = false;
             }
             commandPicks.push(this.toCommandPick(commandPick, runOptions));
@@ -164,7 +164,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(4580, "similar commands")) });
+                    commandPicks.unshift({ type: 'separator', label: ( localize(4607, "similar commands")) });
                 }
                 return commandPicks;
             })()
@@ -176,7 +176,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         }
         const keybinding = this.keybindingService.lookupKeybinding(commandPick.commandId);
         const ariaLabel = keybinding ?
-            ( localize(4583, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
+            ( localize(4610, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
             commandPick.label;
         return {
             ...commandPick,
@@ -196,7 +196,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 }
                 catch (error) {
                     if (!isCancellationError(error)) {
-                        this.dialogService.error(( localize(4584, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
+                        this.dialogService.error(( localize(4611, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
                     }
                 }
             }
@@ -256,7 +256,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         }
     }
     load() {
-        const raw = this.storageService.get(CommandsHistory_1.PREF_KEY_CACHE, StorageScope.PROFILE);
+        const raw = this.storageService.get(CommandsHistory_1.PREF_KEY_CACHE, 0 );
         let serializedCache;
         if (raw) {
             try {
@@ -277,7 +277,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
             }
             entries.forEach(entry => cache.set(entry.key, entry.value));
         }
-        CommandsHistory_1.counter = this.storageService.getNumber(CommandsHistory_1.PREF_KEY_COUNTER, StorageScope.PROFILE, CommandsHistory_1.counter);
+        CommandsHistory_1.counter = this.storageService.getNumber(CommandsHistory_1.PREF_KEY_COUNTER, 0 , CommandsHistory_1.counter);
     }
     push(commandId) {
         if (!CommandsHistory_1.cache) {
@@ -298,8 +298,8 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         }
         const serializedCache = { usesLRU: true, entries: [] };
         CommandsHistory_1.cache.forEach((value, key) => serializedCache.entries.push({ key, value }));
-        this.storageService.store(CommandsHistory_1.PREF_KEY_CACHE, JSON.stringify(serializedCache), StorageScope.PROFILE, StorageTarget.USER);
-        this.storageService.store(CommandsHistory_1.PREF_KEY_COUNTER, CommandsHistory_1.counter, StorageScope.PROFILE, StorageTarget.USER);
+        this.storageService.store(CommandsHistory_1.PREF_KEY_CACHE, JSON.stringify(serializedCache), 0 , 0 );
+        this.storageService.store(CommandsHistory_1.PREF_KEY_COUNTER, CommandsHistory_1.counter, 0 , 0 );
         CommandsHistory_1.hasChanges = false;
     }
     static getConfiguredCommandHistoryLength(configurationService) {

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(4780, "{0}, {1}", label, helpEntry.description)),
+                    ariaLabel: ( localize(4811, "{0}, {1}", label, helpEntry.description)),
                     description: helpEntry.description
                 };
             }))

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

@@ -1,7 +1,6 @@
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
-import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ItemActivation } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
@@ -10,15 +9,15 @@ import { inQuickPickContext, getQuickNavigateHandler, defaultQuickAccessContext
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 
 const globalQuickAccessKeybinding = {
-    primary: KeyMod.CtrlCmd | KeyCode.KeyP,
-    secondary: [KeyMod.CtrlCmd | KeyCode.KeyE],
-    mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyP, secondary: undefined }
+    primary: 2048  | 46 ,
+    secondary: [2048  | 35 ],
+    mac: { primary: 2048  | 46 , secondary: undefined }
 };
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.closeQuickOpen',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: inQuickPickContext,
-    primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape],
+    primary: 9 , secondary: [1024  | 9 ],
     handler: accessor => {
         const quickInputService = accessor.get(IQuickInputService);
         return quickInputService.cancel();
@@ -26,7 +25,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.acceptSelectedQuickOpenItem',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: inQuickPickContext,
     primary: 0,
     handler: accessor => {
@@ -36,7 +35,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.alternativeAcceptSelectedQuickOpenItem',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: inQuickPickContext,
     primary: 0,
     handler: accessor => {
@@ -46,7 +45,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.focusQuickOpen',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: inQuickPickContext,
     primary: 0,
     handler: accessor => {
@@ -57,7 +56,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const quickAccessNavigateNextInFilePickerId = 'workbench.action.quickOpenNavigateNextInFilePicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: quickAccessNavigateNextInFilePickerId,
-    weight: KeybindingWeight.WorkbenchContrib + 50,
+    weight: 200  + 50,
     handler: getQuickNavigateHandler(quickAccessNavigateNextInFilePickerId, true),
     when: defaultQuickAccessContext,
     primary: globalQuickAccessKeybinding.primary,
@@ -67,19 +66,19 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const quickAccessNavigatePreviousInFilePickerId = 'workbench.action.quickOpenNavigatePreviousInFilePicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: quickAccessNavigatePreviousInFilePickerId,
-    weight: KeybindingWeight.WorkbenchContrib + 50,
+    weight: 200  + 50,
     handler: getQuickNavigateHandler(quickAccessNavigatePreviousInFilePickerId, false),
     when: defaultQuickAccessContext,
-    primary: globalQuickAccessKeybinding.primary | KeyMod.Shift,
-    secondary: [globalQuickAccessKeybinding.secondary[0] | KeyMod.Shift],
+    primary: globalQuickAccessKeybinding.primary | 1024 ,
+    secondary: [globalQuickAccessKeybinding.secondary[0] | 1024 ],
     mac: {
-        primary: globalQuickAccessKeybinding.mac.primary | KeyMod.Shift,
+        primary: globalQuickAccessKeybinding.mac.primary | 1024 ,
         secondary: undefined
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.quickPickManyToggle',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: inQuickPickContext,
     primary: 0,
     handler: accessor => {
@@ -89,12 +88,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'workbench.action.quickInputBack',
-    weight: KeybindingWeight.WorkbenchContrib + 50,
+    weight: 200  + 50,
     when: inQuickPickContext,
     primary: 0,
-    win: { primary: KeyMod.Alt | KeyCode.LeftArrow },
-    mac: { primary: KeyMod.WinCtrl | KeyCode.Minus },
-    linux: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Minus },
+    win: { primary: 512  | 15  },
+    mac: { primary: 256  | 88  },
+    linux: { primary: 2048  | 512  | 88  },
     handler: accessor => {
         const quickInputService = accessor.get(IQuickInputService);
         quickInputService.back();
@@ -104,7 +103,7 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpen',
-            title: ( localize2(891, "Go to File...")),
+            title: ( localize2(903, "Go to File...")),
             metadata: {
                 description: `Quick access`,
                 args: [{
@@ -115,7 +114,7 @@ registerAction2(class QuickAccessAction extends Action2 {
                     }]
             },
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
+                weight: 200 ,
                 primary: globalQuickAccessKeybinding.primary,
                 secondary: globalQuickAccessKeybinding.secondary,
                 mac: globalQuickAccessKeybinding.mac
@@ -132,7 +131,7 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpenWithModes',
-            title: ( localize(892, "Quick Open")),
+            title: ( localize(904, "Quick Open")),
             icon: Codicon.search,
             menu: {
                 id: MenuId.CommandCenterCenter,
@@ -173,31 +172,31 @@ class BaseQuickAccessNavigateAction extends Action2 {
 }
 class QuickAccessNavigateNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigateNext', ( localize2(893, 'Navigate Next in Quick Open')), true, true);
+        super('workbench.action.quickOpenNavigateNext', ( localize2(905, 'Navigate Next in Quick Open')), true, true);
     }
 }
 class QuickAccessNavigatePreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigatePrevious', ( localize2(894, 'Navigate Previous in Quick Open')), false, true);
+        super('workbench.action.quickOpenNavigatePrevious', ( localize2(906, 'Navigate Previous in Quick Open')), false, true);
     }
 }
 class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectNext', ( localize2(895, 'Select Next in Quick Open')), true, false, {
-            weight: KeybindingWeight.WorkbenchContrib + 50,
+        super('workbench.action.quickOpenSelectNext', ( localize2(907, 'Select Next in Quick Open')), true, false, {
+            weight: 200  + 50,
             when: inQuickPickContext,
             primary: 0,
-            mac: { primary: KeyMod.WinCtrl | KeyCode.KeyN }
+            mac: { primary: 256  | 44  }
         });
     }
 }
 class QuickAccessSelectPreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectPrevious', ( localize2(896, 'Select Previous in Quick Open')), false, false, {
-            weight: KeybindingWeight.WorkbenchContrib + 50,
+        super('workbench.action.quickOpenSelectPrevious', ( localize2(908, 'Select Previous in Quick Open')), false, false, {
+            weight: 200  + 50,
             when: inQuickPickContext,
             primary: 0,
-            mac: { primary: KeyMod.WinCtrl | KeyCode.KeyP }
+            mac: { primary: 256  | 46  }
         });
     }
 }

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

@@ -7,8 +7,6 @@ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 
 let GotoLineQuickAccessProvider = class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProvider {
@@ -53,13 +51,13 @@ class GotoLineAction extends Action2 {
     constructor() {
         super({
             id: GotoLineAction.ID,
-            title: ( localize2(882, 'Go to Line/Column...')),
+            title: ( localize2(894, 'Go to Line/Column...')),
             f1: true,
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
+                weight: 200 ,
                 when: null,
-                primary: KeyMod.CtrlCmd | KeyCode.KeyG,
-                mac: { primary: KeyMod.WinCtrl | KeyCode.KeyG }
+                primary: 2048  | 37 ,
+                mac: { primary: 256  | 37  }
             }
         });
     }
@@ -72,10 +70,10 @@ registerAction2(GotoLineAction);
     ctor: GotoLineQuickAccessProvider,
     prefix: AbstractGotoLineQuickAccessProvider.PREFIX,
     placeholder: ( localize(
-        883,
+        895,
         "Type the line number and optional column to go to (e.g. 42:5 for line 42 and column 5)."
     )),
-    helpEntries: [{ description: ( localize(884, "Go to Line/Column")), commandId: GotoLineAction.ID }]
+    helpEntries: [{ description: ( localize(896, "Go to Line/Column")), commandId: GotoLineAction.ID }]
 });
 
 export { GotoLineQuickAccessProvider };

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

@@ -3,7 +3,6 @@ import { isFirefox } from 'vscode/vscode/vs/base/browser/browser';
 import { raceTimeout, timeout } from 'vscode/vscode/vs/base/common/async';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Language } from 'vscode/vscode/vs/base/common/platform';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { AbstractEditorCommandsQuickAccessProvider } from '../../../../editor/contrib/quickAccess/browser/commandsQuickAccess.js';
@@ -16,7 +15,6 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { CommandsHistory } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
 import { TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
@@ -40,7 +38,6 @@ var CommandsQuickAccessProvider_1;
 let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAccessProvider {
     static { CommandsQuickAccessProvider_1 = this; }
     static { this.AI_RELATED_INFORMATION_MAX_PICKS = 5; }
-    static { this.AI_RELATED_INFORMATION_THRESHOLD = 0.8; }
     static { this.AI_RELATED_INFORMATION_DEBOUNCE = 200; }
     get activeTextEditorControl() { return this.editorService.activeTextEditorControl; }
     get defaultFilterValue() {
@@ -53,7 +50,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         super({
             showAlias: !Language.isDefaultVariant(),
             noResultsPick: () => ({
-                label: ( localize(873, "No matching commands")),
+                label: ( localize(885, "No matching commands")),
                 commandId: ''
             }),
         }, instantiationService, keybindingService, commandService, telemetryService, dialogService);
@@ -102,7 +99,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
                 ...picks,
                 buttons: [{
                         iconClass: ThemeIcon.asClassName(Codicon.gear),
-                        tooltip: ( localize(874, "Configure Keybinding")),
+                        tooltip: ( localize(886, "Configure Keybinding")),
                     }],
                 trigger: () => {
                     this.preferencesService.openGlobalKeybindingSettings(false, { query: createKeybindingCommandQuery(picks.commandId, picks.commandWhen) });
@@ -140,7 +137,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         const defaultAgent = this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
         if (defaultAgent) {
             additionalPicks.push({
-                label: ( localize(875, "Ask {0}: {1}", defaultAgent.fullName, filter)),
+                label: ( localize(887, "Ask {0}: {1}", defaultAgent.fullName, filter)),
                 commandId: this.configuration.experimental.askChatLocation === 'quickChat' ? ASK_QUICK_QUESTION_ACTION_ID : CHAT_OPEN_ACTION_ID,
                 args: [filter]
             });
@@ -153,7 +150,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         const setOfPicksSoFar = ( (new Set( (picksSoFar.map(p => p.commandId)))));
         const additionalPicks = ( (new Array()));
         for (const info of relatedInformation) {
-            if (info.weight < CommandsQuickAccessProvider_1.AI_RELATED_INFORMATION_THRESHOLD || additionalPicks.length === CommandsQuickAccessProvider_1.AI_RELATED_INFORMATION_MAX_PICKS) {
+            if (additionalPicks.length === CommandsQuickAccessProvider_1.AI_RELATED_INFORMATION_MAX_PICKS) {
                 break;
             }
             const pick = allPicks.find(p => p.commandId === info.command && !( (setOfPicksSoFar.has(p.commandId))));
@@ -174,7 +171,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(876, "{0}: {1}", category, label));
+                label = ( localize(888, "{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;
@@ -217,12 +214,12 @@ class ShowAllCommandsAction extends Action2 {
     constructor() {
         super({
             id: ShowAllCommandsAction.ID,
-            title: ( localize2(877, 'Show All Commands')),
+            title: ( localize2(889, 'Show All Commands')),
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
+                weight: 200 ,
                 when: undefined,
-                primary: !isFirefox ? (KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyP) : undefined,
-                secondary: [KeyCode.F1]
+                primary: !isFirefox ? ((2048  | 1024  | 46) ) : undefined,
+                secondary: [59 ]
             },
             f1: true
         });
@@ -235,7 +232,7 @@ class ClearCommandHistoryAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.clearCommandHistory',
-            title: ( localize2(878, 'Clear Command History')),
+            title: ( localize2(890, 'Clear Command History')),
             f1: true
         });
     }
@@ -247,9 +244,9 @@ class ClearCommandHistoryAction extends Action2 {
         if (commandHistoryLength > 0) {
             const { confirmed } = await dialogService.confirm({
                 type: 'warning',
-                message: ( localize(879, "Do you want to clear the history of recently used commands?")),
-                detail: ( localize(880, "This action is irreversible!")),
-                primaryButton: ( localize(881, "&&Clear"))
+                message: ( localize(891, "Do you want to clear the history of recently used commands?")),
+                detail: ( localize(892, "This action is irreversible!")),
+                primaryButton: ( localize(893, "&&Clear"))
             });
             if (!confirmed) {
                 return;

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

@@ -5,10 +5,9 @@ import { HelpQuickAccessProvider } from '../../../../platform/quickinput/browser
 import { ViewQuickAccessProvider, OpenViewPickerAction, QuickAccessViewPickerAction } from './viewQuickAccess.js';
 import { CommandsQuickAccessProvider, ShowAllCommandsAction, ClearCommandHistoryAction } from './commandsQuickAccess.js';
 import { MenuRegistry, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { inQuickPickContext, getQuickNavigateHandler } from 'vscode/vscode/vs/workbench/browser/quickaccess';
-import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 
 const quickAccessRegistry = ( (Registry.as(Extensions.Quickaccess)));
@@ -16,35 +15,35 @@ quickAccessRegistry.registerQuickAccessProvider({
     ctor: HelpQuickAccessProvider,
     prefix: HelpQuickAccessProvider.PREFIX,
     placeholder: ( localize(
-        897,
+        909,
         "Type '{0}' to get help on the actions you can take from here.",
         HelpQuickAccessProvider.PREFIX
     )),
     helpEntries: [{
-            description: ( localize(898, "Show all Quick Access Providers")),
+            description: ( localize(910, "Show all Quick Access Providers")),
             commandCenterOrder: 70,
-            commandCenterLabel: ( localize(899, 'More'))
+            commandCenterLabel: ( localize(911, 'More'))
         }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: ViewQuickAccessProvider,
     prefix: ViewQuickAccessProvider.PREFIX,
     contextKey: 'inViewsPicker',
-    placeholder: ( localize(900, "Type the name of a view, output channel or terminal to open.")),
-    helpEntries: [{ description: ( localize(901, "Open View")), commandId: OpenViewPickerAction.ID }]
+    placeholder: ( localize(912, "Type the name of a view, output channel or terminal to open.")),
+    helpEntries: [{ description: ( localize(913, "Open View")), commandId: OpenViewPickerAction.ID }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: CommandsQuickAccessProvider,
     prefix: CommandsQuickAccessProvider.PREFIX,
     contextKey: 'inCommandsPicker',
-    placeholder: ( localize(902, "Type the name of a command to run.")),
-    helpEntries: [{ description: ( localize(903, "Show and Run Commands")), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
+    placeholder: ( localize(914, "Type the name of a command to run.")),
+    helpEntries: [{ description: ( localize(915, "Show and Run Commands")), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(904, "&&Command Palette..."))
+        title: ( localize(916, "&&Command Palette..."))
     },
     order: 1
 });
@@ -52,7 +51,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
     group: '1_welcome',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(905, "Show All Commands"))
+        title: ( localize(917, "Show All Commands"))
     },
     order: 2
 });
@@ -60,7 +59,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: OpenViewPickerAction.ID,
-        title: ( localize(906, "&&Open View..."))
+        title: ( localize(918, "&&Open View..."))
     },
     order: 2
 });
@@ -68,7 +67,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '5_infile_nav',
     command: {
         id: 'workbench.action.gotoLine',
-        title: ( localize(907, "Go to &&Line/Column..."))
+        title: ( localize(919, "Go to &&Line/Column..."))
     },
     order: 1
 });
@@ -76,7 +75,7 @@ MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
     group: '1_command',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(908, "Command Palette..."))
+        title: ( localize(920, "Command Palette..."))
     },
     order: 1
 });
@@ -85,7 +84,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     when: ( (EditorContextKeys.editorSimpleInput.toNegated())),
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(908, "Command Palette...")),
+        title: ( localize(920, "Command Palette...")),
     },
     order: 1
 });
@@ -102,7 +101,7 @@ const viewPickerKeybinding = QuickAccessViewPickerAction.KEYBINDING;
 const quickAccessNavigateNextInViewPickerId = 'workbench.action.quickOpenNavigateNextInViewPicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: quickAccessNavigateNextInViewPickerId,
-    weight: KeybindingWeight.WorkbenchContrib + 50,
+    weight: 200  + 50,
     handler: getQuickNavigateHandler(quickAccessNavigateNextInViewPickerId, true),
     when: inViewsPickerContext,
     primary: viewPickerKeybinding.primary,
@@ -112,12 +111,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 const quickAccessNavigatePreviousInViewPickerId = 'workbench.action.quickOpenNavigatePreviousInViewPicker';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: quickAccessNavigatePreviousInViewPickerId,
-    weight: KeybindingWeight.WorkbenchContrib + 50,
+    weight: 200  + 50,
     handler: getQuickNavigateHandler(quickAccessNavigatePreviousInViewPickerId, false),
     when: inViewsPickerContext,
-    primary: viewPickerKeybinding.primary | KeyMod.Shift,
+    primary: viewPickerKeybinding.primary | 1024 ,
     linux: viewPickerKeybinding.linux,
     mac: {
-        primary: viewPickerKeybinding.mac.primary | KeyMod.Shift
+        primary: viewPickerKeybinding.mac.primary | 1024
     }
 });

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

@@ -3,7 +3,6 @@ import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { ItemActivation } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
-import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output.service';
@@ -13,8 +12,6 @@ import { matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
 import { fuzzyContains } from 'vscode/vscode/vs/base/common/strings';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { REPL_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
@@ -27,7 +24,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
     constructor(viewDescriptorService, viewsService, outputService, terminalService, terminalGroupService, debugService, paneCompositeService, contextKeyService) {
         super(ViewQuickAccessProvider_1.PREFIX, {
             noResultsPick: {
-                label: ( localize(4781, "No matching views")),
+                label: ( localize(4812, "No matching views")),
                 containerLabel: ''
             }
         });
@@ -115,9 +112,9 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
                 }
             }
         };
-        addPaneComposites(ViewContainerLocation.Sidebar, ( localize(4782, "Side Bar")));
-        addPaneComposites(ViewContainerLocation.Panel, ( localize(4783, "Panel")));
-        addPaneComposites(ViewContainerLocation.AuxiliaryBar, ( localize(4784, "Secondary Side Bar")));
+        addPaneComposites(0 , ( localize(4813, "Side Bar")));
+        addPaneComposites(1 , ( localize(4814, "Panel")));
+        addPaneComposites(2 , ( localize(4815, "Secondary Side Bar")));
         const addPaneCompositeViews = (location) => {
             const paneComposites = this.paneCompositeService.getPaneComposites(location);
             for (const paneComposite of paneComposites) {
@@ -127,15 +124,15 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
                 }
             }
         };
-        addPaneCompositeViews(ViewContainerLocation.Sidebar);
-        addPaneCompositeViews(ViewContainerLocation.Panel);
-        addPaneCompositeViews(ViewContainerLocation.AuxiliaryBar);
+        addPaneCompositeViews(0 );
+        addPaneCompositeViews(1 );
+        addPaneCompositeViews(2 );
         this.terminalGroupService.groups.forEach((group, groupIndex) => {
             group.terminalInstances.forEach((terminal, terminalIndex) => {
-                const label = ( localize(4785, "{0}: {1}", `${groupIndex + 1}.${terminalIndex + 1}`, terminal.title));
+                const label = ( localize(4816, "{0}: {1}", `${groupIndex + 1}.${terminalIndex + 1}`, terminal.title));
                 viewEntries.push({
                     label,
-                    containerLabel: ( localize(4786, "Terminal")),
+                    containerLabel: ( localize(4817, "Terminal")),
                     accept: async () => {
                         await this.terminalGroupService.showPanel(true);
                         this.terminalService.setActiveInstance(terminal);
@@ -147,7 +144,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
             const label = session.name;
             viewEntries.push({
                 label,
-                containerLabel: ( localize(4787, "Debug Console")),
+                containerLabel: ( localize(4818, "Debug Console")),
                 accept: async () => {
                     await this.debugService.focusStackFrame(undefined, undefined, session, { explicit: true });
                     if (!this.viewsService.isViewVisible(REPL_VIEW_ID)) {
@@ -160,7 +157,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
         for (const channel of channels) {
             viewEntries.push({
                 label: channel.label,
-                containerLabel: ( localize(4788, "Output")),
+                containerLabel: ( localize(4819, "Output")),
                 accept: () => this.outputService.showChannel(channel.id)
             });
         }
@@ -189,7 +186,7 @@ class OpenViewPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenViewPickerAction.ID,
-            title: ( localize2(4789, 'Open View')),
+            title: ( localize2(4820, 'Open View')),
             category: Categories.View,
             f1: true
         });
@@ -201,18 +198,18 @@ class OpenViewPickerAction extends Action2 {
 class QuickAccessViewPickerAction extends Action2 {
     static { this.ID = 'workbench.action.quickOpenView'; }
     static { this.KEYBINDING = {
-        primary: KeyMod.CtrlCmd | KeyCode.KeyQ,
-        mac: { primary: KeyMod.WinCtrl | KeyCode.KeyQ },
+        primary: 2048  | 47 ,
+        mac: { primary: 256  | 47  },
         linux: { primary: 0 }
     }; }
     constructor() {
         super({
             id: QuickAccessViewPickerAction.ID,
-            title: ( localize2(4790, 'Quick Open View')),
+            title: ( localize2(4821, 'Quick Open View')),
             category: Categories.View,
             f1: false,
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
+                weight: 200 ,
                 when: undefined,
                 ...QuickAccessViewPickerAction.KEYBINDING
             }

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

@@ -1,9 +1,8 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { parse } from 'vscode/vscode/vs/base/common/json';
-import { FileType, FileSystemProviderCapabilities } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileType } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, readTrustedDomains, TRUSTED_DOMAINS_STORAGE_KEY } from 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomains';
@@ -66,7 +65,7 @@ let TrustedDomainsFileSystemProvider = class TrustedDomainsFileSystemProvider {
         this.fileService = fileService;
         this.storageService = storageService;
         this.instantiationService = instantiationService;
-        this.capabilities = FileSystemProviderCapabilities.FileReadWrite;
+        this.capabilities = 2 ;
         this.onDidChangeCapabilities = Event.None;
         this.onDidChangeFile = Event.None;
         this.fileService.registerProvider(TRUSTED_DOMAINS_SCHEMA, this);
@@ -75,7 +74,7 @@ let TrustedDomainsFileSystemProvider = class TrustedDomainsFileSystemProvider {
         return Promise.resolve(TRUSTED_DOMAINS_STAT);
     }
     async readFile(resource) {
-        let trustedDomainsContent = this.storageService.get(TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, StorageScope.APPLICATION);
+        let trustedDomainsContent = this.storageService.get(TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, -1 );
         const configuring = resource.fragment;
         const { defaultTrustedDomains, trustedDomains } = await this.instantiationService.invokeFunction(readTrustedDomains);
         if (!trustedDomainsContent ||
@@ -92,8 +91,8 @@ let TrustedDomainsFileSystemProvider = class TrustedDomainsFileSystemProvider {
         try {
             const trustedDomainsContent = ( VSBuffer.wrap(content).toString());
             const trustedDomains = parse(trustedDomainsContent);
-            this.storageService.store(TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, trustedDomainsContent, StorageScope.APPLICATION, StorageTarget.USER);
-            this.storageService.store(TRUSTED_DOMAINS_STORAGE_KEY, JSON.stringify(trustedDomains) || '', StorageScope.APPLICATION, StorageTarget.USER);
+            this.storageService.store(TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, trustedDomainsContent, -1 , 0 );
+            this.storageService.store(TRUSTED_DOMAINS_STORAGE_KEY, JSON.stringify(trustedDomains) || '', -1 , 0 );
         }
         catch (err) { }
         return Promise.resolve();

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

@@ -67,25 +67,25 @@ let OpenerValidatorContributions = class OpenerValidatorContributions {
             const { result } = await this._dialogService.prompt({
                 type: Severity$1.Info,
                 message: ( localize(
-                    4791,
+                    4822,
                     'Do you want {0} to open the external website?',
                     this._productService.nameShort
                 )),
                 detail: typeof originalResource === 'string' ? originalResource : formattedLink,
                 buttons: [
                     {
-                        label: ( localize(4792, '&&Open')),
+                        label: ( localize(4823, '&&Open')),
                         run: () => true
                     },
                     {
-                        label: ( localize(4793, '&&Copy')),
+                        label: ( localize(4824, '&&Copy')),
                         run: () => {
                             this._clipboardService.writeText(typeof originalResource === 'string' ? originalResource : ( (resourceUri.toString(true))));
                             return false;
                         }
                     },
                     {
-                        label: ( localize(4794, 'Configure &&Trusted Domains')),
+                        label: ( localize(4825, '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

@@ -2,27 +2,25 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2, MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { IURLService } from 'vscode/vscode/vs/platform/url/common/url.service';
-import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { ExternalUriResolverContribution } from './externalUriResolver.js';
 import { manageTrustedDomainSettingsCommand } from 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomains';
 import { TrustedDomainsFileSystemProvider } from './trustedDomainsFileSystemProvider.js';
 import { OpenerValidatorContributions } from './trustedDomainsValidator.js';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
-import { Extensions as Extensions$1, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 import 'vscode/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 class OpenUrlAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.url.openUrl',
-            title: ( localize2(909, 'Open URL')),
+            title: ( localize2(921, 'Open URL')),
             category: Categories.Developer,
             f1: true
         });
@@ -30,7 +28,7 @@ class OpenUrlAction extends Action2 {
     async run(accessor) {
         const quickInputService = accessor.get(IQuickInputService);
         const urlService = accessor.get(IURLService);
-        return quickInputService.input({ prompt: ( localize(910, "URL to open")) }).then(input => {
+        return quickInputService.input({ prompt: ( localize(922, "URL to open")) }).then(input => {
             if (input) {
                 const uri = ( (URI.parse(input)));
                 urlService.open(uri, { originalUrl: input });
@@ -46,21 +44,19 @@ MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         title: manageTrustedDomainSettingsCommand.description.description
     }
 });
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(OpenerValidatorContributions, LifecyclePhase.Restored);
-registerWorkbenchContribution2(TrustedDomainsFileSystemProvider.ID, TrustedDomainsFileSystemProvider, WorkbenchPhase.BlockRestore
-);
-registerWorkbenchContribution2(ExternalUriResolverContribution.ID, ExternalUriResolverContribution, WorkbenchPhase.BlockRestore
-);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(OpenerValidatorContributions, 3 );
+registerWorkbenchContribution2(TrustedDomainsFileSystemProvider.ID, TrustedDomainsFileSystemProvider, 2 );
+registerWorkbenchContribution2(ExternalUriResolverContribution.ID, ExternalUriResolverContribution, 2 );
 const configurationRegistry = ( (Registry.as(Extensions$1.Configuration)));
 configurationRegistry.registerConfiguration({
     ...workbenchConfigurationNodeBase,
     properties: {
         'workbench.trustedDomains.promptInTrustedWorkspace': {
-            scope: ConfigurationScope.APPLICATION,
+            scope: 1 ,
             type: 'boolean',
             default: false,
             description: ( localize(
-                911,
+                923,
                 "When enabled, trusted domain prompts will appear when opening links in trusted workspaces."
             ))
         }

package/vscode/src/vs/workbench/services/quickinput/browser/quickInputService.js

@@ -6,7 +6,6 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { QuickInputService as QuickInputService$1 } from 'vscode/vscode/vs/platform/quickinput/browser/quickInputService';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { InQuickPickContextKey } from 'vscode/vscode/vs/workbench/browser/quickaccess';
 
 let QuickInputService = class QuickInputService extends QuickInputService$1 {