Skip to content

Commit 5b8244c

Browse files
authored
chat - reduce contributions blocking startup (microsoft#242203)
1 parent fc6f977 commit 5b8244c

File tree

3 files changed

+9
-25
lines changed

3 files changed

+9
-25
lines changed

src/vs/workbench/contrib/chat/browser/chatStatus.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
163163
let text = '$(copilot)';
164164
let ariaLabel = localize('chatStatus', "Copilot Status");
165165
let command: string | Command = TOGGLE_CHAT_ACTION_ID;
166-
let tooltip: TooltipContent = localize('openChat', "Open Chat ({0})", this.keybindingService.lookupKeybinding(command)?.getLabel() ?? '');
166+
let tooltip: TooltipContent;
167167
let kind: StatusbarEntryKind | undefined;
168168

169169
// Quota Exceeded

src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { EnablementState, IExtensionManagementServerService, IPublisherInfo, IWo
1313
import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
1414
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
1515
import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
16-
import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, ExtensionEditorTab, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, UPDATE_ACTIONS_GROUP, IExtensionArg, ExtensionRuntimeActionType, EXTENSIONS_CATEGORY } from '../common/extensions.js';
16+
import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, ExtensionEditorTab, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, UPDATE_ACTIONS_GROUP, IExtensionArg, ExtensionRuntimeActionType, EXTENSIONS_CATEGORY, AutoRestartConfigurationKey } from '../common/extensions.js';
1717
import { InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ClearLanguageAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, InstallAnotherVersionAction, InstallAction } from './extensionsActions.js';
1818
import { ExtensionsInput } from '../common/extensionsInput.js';
1919
import { ExtensionEditor } from './extensionEditor.js';
@@ -79,6 +79,7 @@ import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uri
7979
import { IConfigurationMigrationRegistry, Extensions as ConfigurationMigrationExtensions } from '../../../common/configuration.js';
8080
import { IProductService } from '../../../../platform/product/common/productService.js';
8181
import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
82+
import product from '../../../../platform/product/common/product.js';
8283

8384
// Singletons
8485
registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService, InstantiationType.Eager /* Auto updates extensions */);
@@ -265,6 +266,12 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
265266
scope: ConfigurationScope.APPLICATION,
266267
included: isNative
267268
},
269+
[AutoRestartConfigurationKey]: {
270+
type: 'boolean',
271+
description: localize('autoRestart', "If activated, extensions will automatically restart following an update if the window is not in focus. There can be a data loss if you have open Notebooks or Custom Editors."),
272+
default: false,
273+
included: product.quality !== 'stable'
274+
},
268275
[UseUnpkgResourceApiConfigKey]: {
269276
type: 'boolean',
270277
description: localize('extensions.gallery.useUnpkgResourceApi', "When enabled, extensions to update are fetched from Unpkg service."),

src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ import { areApiProposalsCompatible, isEngineValid } from '../../../../platform/e
6363
import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
6464
import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
6565
import { ShowCurrentReleaseNotesActionId } from '../../update/common/update.js';
66-
import { Registry } from '../../../../platform/registry/common/platform.js';
67-
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
6866
import { IViewsService } from '../../../services/views/common/viewsService.js';
6967
import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
7068
import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
@@ -1020,30 +1018,9 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
10201018

10211019
urlService.registerHandler(this);
10221020

1023-
if (this.productService.quality !== 'stable') {
1024-
this.registerAutoRestartConfig();
1025-
}
1026-
10271021
this.whenInitialized = this.initialize();
10281022
}
10291023

1030-
private registerAutoRestartConfig(): void {
1031-
Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
1032-
.registerConfiguration({
1033-
id: 'extensions',
1034-
order: 30,
1035-
title: nls.localize('extensionsConfigurationTitle', "Extensions"),
1036-
type: 'object',
1037-
properties: {
1038-
[AutoRestartConfigurationKey]: {
1039-
type: 'boolean',
1040-
description: nls.localize('autoRestart', "If activated, extensions will automatically restart following an update if the window is not in focus. There can be a data loss if you have open Notebooks or Custom Editors."),
1041-
default: false,
1042-
}
1043-
}
1044-
});
1045-
}
1046-
10471024
private async initialize(): Promise<void> {
10481025
// initialize local extensions
10491026
await Promise.all([this.queryLocal(), this.extensionService.whenInstalledExtensionsRegistered()]);

0 commit comments

Comments
 (0)