@codingame/monaco-vscode-quickaccess-service-override 2.2.2 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-service-override",
-  "version": "2.2.2",
+  "version": "3.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

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

@@ -1,4 +1,4 @@
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IQuickInputService, ItemActivation } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
@@ -102,14 +102,11 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpen',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/actions/quickAccessActions',
-                    'quickOpen',
-                    "Go to File..."
-                )),
-                original: 'Go to File...'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/browser/actions/quickAccessActions',
+                'quickOpen',
+                "Go to File..."
+            )),
             metadata: {
                 description: `Quick access`,
                 args: [{

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

@@ -1,34 +1,34 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
-import { CommandsHistory } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { MenuId, MenuItemAction, Action2, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { isFirefox } from 'vscode/vscode/vs/base/browser/browser';
 import { raceTimeout, timeout } from 'vscode/vscode/vs/base/common/async';
-import { AbstractEditorCommandsQuickAccessProvider } from '../../../../editor/contrib/quickAccess/browser/commandsQuickAccess.js';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
 import { Language } from 'vscode/vscode/vs/base/common/platform';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { AbstractEditorCommandsQuickAccessProvider } from '../../../../editor/contrib/quickAccess/browser/commandsQuickAccess.js';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { isLocalizedString } from 'vscode/vscode/vs/platform/action/common/action';
+import { MenuId, MenuItemAction, Action2, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { CommandsHistory } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
+import { TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { DefaultQuickAccessFilterValue } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
-import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
-import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
-import { isFirefox } from 'vscode/vscode/vs/base/browser/browser';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { CHAT_OPEN_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ASK_QUICK_QUESTION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
+import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { RelatedInformationType, IAiRelatedInformationService } from 'vscode/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation';
-import { CHAT_OPEN_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { isLocalizedString } from 'vscode/vscode/vs/platform/action/common/action';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 var CommandsQuickAccessProvider_1;
@@ -44,7 +44,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         }
         return undefined;
     }
-    constructor(editorService, menuService, extensionService, instantiationService, keybindingService, commandService, telemetryService, dialogService, configurationService, editorGroupService, preferencesService, productService, aiRelatedInformationService, chatService) {
+    constructor(editorService, menuService, extensionService, instantiationService, keybindingService, commandService, telemetryService, dialogService, configurationService, editorGroupService, preferencesService, productService, aiRelatedInformationService, chatAgentService) {
         super({
             showAlias: !Language.isDefaultVariant(),
             noResultsPick: () => ({
@@ -64,7 +64,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         this.preferencesService = preferencesService;
         this.productService = productService;
         this.aiRelatedInformationService = aiRelatedInformationService;
-        this.chatService = chatService;
+        this.chatAgentService = chatAgentService;
         this.extensionRegistrationRace = raceTimeout(this.extensionService.whenInstalledExtensionsRegistered(), 800);
         this.useAiRelatedInfo = false;
         this._register(configurationService.onDidChangeConfiguration((e) => this.updateOptions(e)));
@@ -138,14 +138,14 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
                 type: 'separator'
             });
         }
-        const info = this.chatService.getProviderInfos()[0];
-        if (info) {
+        const defaultAgent = this.chatAgentService.getDefaultAgent();
+        if (defaultAgent) {
             additionalPicks.push({
                 label: ( localizeWithPath(
                     'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
                     'askXInChat',
                     "Ask {0}: {1}",
-                    info.displayName,
+                    defaultAgent.metadata.fullName,
                     filter
                 )),
                 commandId: this.configuration.experimental.askChatLocation === 'quickChat' ? ASK_QUICK_QUESTION_ACTION_ID : CHAT_OPEN_ACTION_ID,
@@ -223,7 +223,7 @@ CommandsQuickAccessProvider = CommandsQuickAccessProvider_1 = ( __decorate([
     ( __param(10, IPreferencesService)),
     ( __param(11, IProductService)),
     ( __param(12, IAiRelatedInformationService)),
-    ( __param(13, IChatService))
+    ( __param(13, IChatAgentService))
 ], CommandsQuickAccessProvider));
 class ShowAllCommandsAction extends Action2 {
     static { this.ID = 'workbench.action.showCommands'; }

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

@@ -4,9 +4,10 @@ import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
 
 let ExternalUriResolverContribution = class ExternalUriResolverContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.externalUriResolver'; }
     constructor(_openerService, _workbenchEnvironmentService) {
         super();
-        if (_workbenchEnvironmentService.options && _workbenchEnvironmentService.options.resolveExternalUri) {
+        if (_workbenchEnvironmentService.options?.resolveExternalUri) {
             this._register(_openerService.registerExternalUriResolver({
                 resolveExternalUri: async (resource) => {
                     return {

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

@@ -1,5 +1,5 @@
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
@@ -15,7 +15,7 @@ const TRUSTED_DOMAINS_CONTENT_STORAGE_KEY = 'http.linkProtectionTrustedDomainsCo
 const manageTrustedDomainSettingsCommand = {
     id: 'workbench.action.manageTrustedDomain',
     description: {
-        description: ( localizeWithPath(
+        description: ( localize2WithPath(
             'vs/workbench/contrib/url/browser/trustedDomains',
             'trustedDomain.manageTrustedDomain',
             'Manage Trusted Domains'

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

@@ -71,6 +71,7 @@ function computeTrustedDomainContent(defaultTrustedDomains, trustedDomains, user
     return content;
 }
 let TrustedDomainsFileSystemProvider = class TrustedDomainsFileSystemProvider {
+    static { this.ID = 'workbench.contrib.trustedDomainsFileSystemProvider'; }
     constructor(fileService, storageService, instantiationService) {
         this.fileService = fileService;
         this.storageService = storageService;

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

@@ -5,7 +5,7 @@ import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/comm
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { IURLService } from 'vscode/vscode/vs/platform/url/common/url';
-import { Extensions } 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 './trustedDomains.js';
 import { TrustedDomainsFileSystemProvider } from './trustedDomainsFileSystemProvider.js';
@@ -43,15 +43,12 @@ CommandsRegistry.registerCommand(manageTrustedDomainSettingsCommand);
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: manageTrustedDomainSettingsCommand.id,
-        title: {
-            value: manageTrustedDomainSettingsCommand.description.description,
-            original: 'Manage Trusted Domains'
-        }
+        title: manageTrustedDomainSettingsCommand.description.description
     }
 });
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(OpenerValidatorContributions, 3 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(TrustedDomainsFileSystemProvider, 2 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ExternalUriResolverContribution, 2 );
+registerWorkbenchContribution2(TrustedDomainsFileSystemProvider.ID, TrustedDomainsFileSystemProvider, 2 );
+registerWorkbenchContribution2(ExternalUriResolverContribution.ID, ExternalUriResolverContribution, 2 );
 const configurationRegistry = ( Registry.as(Extensions$1.Configuration));
 configurationRegistry.registerConfiguration({
     ...workbenchConfigurationNodeBase,

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

@@ -7,11 +7,10 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { QuickInputService as QuickInputService$1 } from 'vscode/vscode/vs/platform/quickinput/browser/quickInputService';
 import { InQuickPickContextKey } from 'vscode/vscode/vs/workbench/browser/quickaccess';
-import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover';
 
 let QuickInputService = class QuickInputService extends QuickInputService$1 {
-    constructor(configurationService, instantiationService, keybindingService, contextKeyService, themeService, layoutService, hoverService) {
-        super(instantiationService, contextKeyService, themeService, layoutService, configurationService, hoverService);
+    constructor(configurationService, instantiationService, keybindingService, contextKeyService, themeService, layoutService) {
+        super(instantiationService, contextKeyService, themeService, layoutService, configurationService);
         this.keybindingService = keybindingService;
         this.inQuickInputContext = InQuickPickContextKey.bindTo(this.contextKeyService);
         this.registerListeners();
@@ -33,8 +32,7 @@ QuickInputService = ( __decorate([
     ( __param(2, IKeybindingService)),
     ( __param(3, IContextKeyService)),
     ( __param(4, IThemeService)),
-    ( __param(5, ILayoutService)),
-    ( __param(6, IHoverService))
+    ( __param(5, ILayoutService))
 ], QuickInputService));
 
 export { QuickInputService };