@codingame/monaco-vscode-extension-gallery-service-override 4.4.0 → 4.5.0-improve-code-splitting.1

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

@@ -1,21 +1,25 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { registerAction2, MenuRegistry, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { MenuRegistry, MenuId, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IExtensionGalleryService, IExtensionManagementService, ExtensionsLocalizedLabel, PreferencesLocalizedLabel } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
-import { extensionsConfigurationNodeBase, IWorkbenchExtensionManagementService, IExtensionManagementServerService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionIgnoredRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
+import { ExtensionsLocalizedLabel, PreferencesLocalizedLabel } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionGalleryService, IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
+import { extensionsConfigurationNodeBase } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
+import { IWorkbenchExtensionManagementService, IExtensionManagementServerService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { IExtensionIgnoredRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.service';
 import { Extensions as Extensions$4 } from 'vscode/vscode/vs/workbench/common/contributions';
-import { VIEWLET_ID, IExtensionsWorkbenchService, CONTEXT_HAS_GALLERY, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, OUTDATED_EXTENSIONS_VIEW_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, extensionsSearchActionsMenu, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, UPDATE_ACTIONS_GROUP, TOGGLE_IGNORE_EXTENSION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { VIEWLET_ID, CONTEXT_HAS_GALLERY, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, OUTDATED_EXTENSIONS_VIEW_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, extensionsSearchActionsMenu, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, UPDATE_ACTIONS_GROUP, TOGGLE_IGNORE_EXTENSION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { SearchExtensionsAction, PromptExtensionInstallFailureAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, InstallSpecificVersionOfExtensionAction, ReinstallAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, ClearLanguageAction, ConfigureWorkspaceRecommendedExtensionsAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { ExtensionsInput } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsInput';
 import { ExtensionEditor } from './extensionEditor.js';
-import { ExtensionsViewPaneContainer, StatusUpdater, MaliciousExtensionChecker, ExtensionsViewletViewsContribution, DefaultViewsContext, SearchHasTextContext } from './extensionsViewlet.js';
+import { ExtensionsViewPaneContainer, DefaultViewsContext, SearchHasTextContext, StatusUpdater, MaliciousExtensionChecker, ExtensionsViewletViewsContribution } from './extensionsViewlet.js';
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { Extensions as Extensions$3 } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { ExtensionsConfigurationSchemaId, ExtensionsConfigurationSchema } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsFileTemplate';
-import { CommandsRegistry, ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { KeymapExtensions } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsUtils';
 import { areSameExtensions, getIdAndVersion } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
@@ -26,48 +30,51 @@ import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { ExtensionDependencyChecker } from './extensionsDependencyChecker.js';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
-import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
-import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
-import { RawContextKey, IContextKeyService, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
+import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
+import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { Extensions } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
 import { ManageExtensionsQuickAccessProvider, InstallExtensionQuickAccessProvider } from './extensionsQuickAccess.js';
 import './extensionRecommendationsService.js';
 import { CONTEXT_SYNC_ENABLEMENT } from 'vscode/vscode/vs/workbench/services/userDataSync/common/userDataSync';
 import { CopyAction, CutAction, PasteAction } from 'vscode/vscode/vs/editor/contrib/clipboard/browser/clipboard';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import './extensionsWorkbenchService.js';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import './extensionRecommendationNotificationService.js';
-import { IExtensionService, toExtensionDescription } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
+import { toExtensionDescription } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { WorkbenchStateContext, ResourceContextKey } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { IWorkspaceExtensionsConfigService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
+import { IWorkspaceExtensionsConfigService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { ShowRuntimeExtensionsAction } from './abstractRuntimeExtensionsEditor.js';
 import { ExtensionEnablementWorkspaceTrustTransitionParticipant } from './extensionEnablementWorkspaceTrustTransitionParticipant.js';
 import { extensionsViewIcon, installWorkspaceRecommendedIcon, filterIcon, clearSearchResultsIcon, refreshIcon, configureRecommendedIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
 import { EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
-import { Disposable, DisposableStore, isDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { isDisposable, Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IFileDialogService, IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { mnemonicButtonLabel } from 'vscode/vscode/vs/base/common/labels';
 import 'vscode/vscode/vs/base/common/arrays';
 import { Promises } from 'vscode/vscode/vs/base/common/async';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { WORKSPACE_TRUST_EXTENSION_SUPPORT } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceTrust';
 import { ExtensionsCompletionItemsProvider } from './extensionsCompletionItemsProvider.js';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
+import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { UnsupportedExtensionsMigrationContrib } from './unsupportedExtensionsMigrationContribution.js';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { ExtensionStorageService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionStorage';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { CONTEXT_KEYBINDINGS_EDITOR } from 'vscode/vscode/vs/workbench/contrib/preferences/common/preferences';
 import { DeprecatedExtensionsChecker } from './deprecatedExtensionsChecker.js';
-import { IDialogService, IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 ( Registry.as(Extensions.Quickaccess)).registerQuickAccessProvider({
     ctor: ManageExtensionsQuickAccessProvider,
@@ -1112,7 +1119,7 @@ let ExtensionsContributions = class ExtensionsContributions extends Disposable {
                                 )),
                                 run: () => hostService.reload()
                             }] : [];
-                        notificationService.prompt(Severity.Info, message, actions);
+                        notificationService.prompt(Severity$1.Info, message, actions);
                     }
                 });
             }

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActivationProgress.js

@@ -1,9 +1,9 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { DeferredPromise, timeout } from 'vscode/vscode/vs/base/common/async';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 
 let ExtensionActivationProgress = class ExtensionActivationProgress {

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsCompletionItemsProvider.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { getLocation, parse } from 'vscode/vscode/vs/base/common/json';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.js

@@ -1,16 +1,18 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
+import 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
-import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Promises } from 'vscode/vscode/vs/base/common/async';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 let ExtensionDependencyChecker = class ExtensionDependencyChecker extends Disposable {
     constructor(extensionService, extensionsWorkbenchService, notificationService, hostService) {
@@ -63,7 +65,7 @@ let ExtensionDependencyChecker = class ExtensionDependencyChecker extends Dispos
             if (extensions.length) {
                 await Promises.settled(( extensions.map(extension => this.extensionsWorkbenchService.install(extension))));
                 this.notificationService.notify({
-                    severity: Severity.Info,
+                    severity: Severity$1.Info,
                     message: ( localizeWithPath(
                         'vs/workbench/contrib/extensions/browser/extensionsDependencyChecker',
                         'finished installing missing deps',

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsList.js

@@ -5,18 +5,20 @@ import { combinedDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecy
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { IExtensionsWorkbenchService, ExtensionContainers } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { ExtensionContainers } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { ActionWithDropDownAction, ExtensionActionWithDropdownActionViewItem, ExtensionDropDownAction, ExtensionStatusAction, ExtensionStatusLabelAction, MigrateDeprecatedExtensionAction, ExtensionRuntimeStateAction, UpdateAction, ToggleAutoUpdateForExtensionAction, InstallDropdownAction, InstallingLabelAction, SetLanguageAction, ClearLanguageAction, RemoteInstallAction, LocalInstallAction, WebInstallAction, ManageExtensionAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { extensionVerifiedPublisherIconColor, RecommendationWidget, PreReleaseBookmarkWidget, RemoteBadgeWidget, ExtensionPackCountWidget, VerifiedPublisherWidget, ExtensionHoverWidget, SyncIgnoredWidget, ExtensionActivationStatusWidget, InstallCountWidget, RatingsWidget } from './extensionsWidgets.js';
-import { IExtensionService, toExtension } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IExtensionManagementServerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { RecommendationWidget, PreReleaseBookmarkWidget, RemoteBadgeWidget, ExtensionPackCountWidget, VerifiedPublisherWidget, ExtensionHoverWidget, SyncIgnoredWidget, ExtensionActivationStatusWidget, InstallCountWidget, RatingsWidget, extensionVerifiedPublisherIconColor } from './extensionsWidgets.js';
+import { toExtension } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IExtensionManagementServerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { isLanguagePackExtension } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { WORKBENCH_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { verifiedPublisherIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
 
 const EXTENSION_LIST_ELEMENT_HEIGHT = 72;

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsQuickAccess.js

@@ -2,10 +2,10 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
-import { IExtensionGalleryService, IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
+import { IExtensionGalleryService, IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 
 var InstallExtensionQuickAccessProvider_1, ManageExtensionsQuickAccessProvider_1;
 let InstallExtensionQuickAccessProvider = class InstallExtensionQuickAccessProvider extends PickerQuickAccessProvider {

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewer.js

@@ -1,14 +1,15 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { append, $, addDisposableListener, EventType, getWindow, isKeyboardEvent } from 'vscode/vscode/vs/base/browser/dom';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { dispose, Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, toDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
-import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IListService, WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { IListService } from 'vscode/vscode/vs/platform/list/browser/listService.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.js

@@ -8,46 +8,51 @@ import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/life
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { append, $, hide, DragAndDropObserver, show, trackFocus, Dimension } from 'vscode/vscode/vs/base/browser/dom';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IExtensionsWorkbenchService, VIEWLET_ID, CONTEXT_HAS_GALLERY, OUTDATED_EXTENSIONS_VIEW_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, extensionsSearchActionsMenu, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, AutoCheckUpdatesConfigurationKey, CloseExtensionDetailsOnViewChangeKey } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { VIEWLET_ID, CONTEXT_HAS_GALLERY, OUTDATED_EXTENSIONS_VIEW_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, extensionsSearchActionsMenu, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, AutoCheckUpdatesConfigurationKey, CloseExtensionDetailsOnViewChangeKey } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
-import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionManagementServerService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
+import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
+import { IExtensionManagementServerService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { ExtensionsInput } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsInput';
 import { ServerInstalledExtensionsView, DefaultPopularExtensionsView, DefaultRecommendedExtensionsView, EnabledExtensionsView, DisabledExtensionsView, SearchMarketplaceExtensionsView, ExtensionsListView, RecentlyUpdatedExtensionsView, OutdatedExtensionsView, WorkspaceRecommendedExtensionsView, RecommendedExtensionsView, NONE_CATEGORY, StaticQueryExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, DeprecatedExtensionsView } from './extensionsViews.js';
-import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
-import { IActivityService, NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IViewDescriptorService, Extensions } from 'vscode/vscode/vs/workbench/common/views';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { RawContextKey, IContextKeyService, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { INotificationService, NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
-import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { NumberBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
+import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
+import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Query } from '../common/extensionQuery.js';
 import { SuggestEnabledInput } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
 import { alert } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
+import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { WorkbenchStateContext, VirtualWorkspaceContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { installLocalInRemoteIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
+import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { extractEditorsAndFilesDropData } from 'vscode/vscode/vs/platform/dnd/browser/dnd';
 import { extname } from 'vscode/vscode/vs/base/common/resources';

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViews.js

@@ -1,55 +1,59 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { DisposableStore, toDisposable, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { isCancellationError, getErrorMessage } from 'vscode/vscode/vs/base/common/errors';
 import { createErrorWithActions } from 'vscode/vscode/vs/base/common/errorMessage';
 import { PagedModel, DelayedPagedModel } from '../../../../base/common/paging.js';
-import { IExtensionManagementServerService, IWorkbenchExtensionManagementService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
+import { IExtensionManagementServerService, IWorkbenchExtensionManagementService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { IExtensionRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.service';
 import { areSameExtensions, getExtensionDependencies } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { append, $ } from 'vscode/vscode/vs/base/browser/dom';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { Renderer, Delegate } from './extensionsList.js';
-import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { Delegate, Renderer } from './extensionsList.js';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { Query } from '../common/extensionQuery.js';
-import { IExtensionService, toExtension } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { toExtension } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { ManageExtensionAction, getContextMenuActions, ExtensionAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { WorkbenchPagedList } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { Severity, INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { ViewPane, ViewPaneShowActions } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { coalesce, distinct, flatten } from 'vscode/vscode/vs/base/common/arrays';
 import { alert } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { ActionRunner, Separator, Action } from 'vscode/vscode/vs/base/common/actions';
-import { ExtensionIdentifierMap, ExtensionIdentifier, isLanguagePackExtension } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { ExtensionIdentifierMap, isLanguagePackExtension, ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { createCancelablePromise, ThrottledDelayer } from 'vscode/vscode/vs/base/common/async';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { SeverityIcon } from 'vscode/vscode/vs/platform/severityIcon/browser/severityIcon';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { SIDE_BAR_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
-import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
 import { isVirtualWorkspace } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
-import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
+import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { isOfflineError } from 'vscode/vscode/vs/base/parts/request/common/request';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions, IExtensionFeaturesManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
+import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
+import { IExtensionFeaturesManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures.service';
 import { isString } from 'vscode/vscode/vs/base/common/types';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 var ExtensionsListView_1;
 const NONE_CATEGORY = 'none';
@@ -866,7 +870,7 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
             if (count === 0 && this.isBodyVisible()) {
                 if (error) {
                     if (isOfflineError(error)) {
-                        this.bodyTemplate.messageSeverityIcon.className = SeverityIcon.className(Severity.Warning);
+                        this.bodyTemplate.messageSeverityIcon.className = SeverityIcon.className(Severity$1.Warning);
                         this.bodyTemplate.messageBox.textContent = ( localizeWithPath(
                             'vs/workbench/contrib/extensions/browser/extensionsViews',
                             'offline error',
@@ -874,7 +878,7 @@ let ExtensionsListView = class ExtensionsListView extends ViewPane {
                         ));
                     }
                     else {
-                        this.bodyTemplate.messageSeverityIcon.className = SeverityIcon.className(Severity.Error);
+                        this.bodyTemplate.messageSeverityIcon.className = SeverityIcon.className(Severity$1.Error);
                         this.bodyTemplate.messageBox.textContent = ( localizeWithPath(
                             'vs/workbench/contrib/extensions/browser/extensionsViews',
                             'error',
@@ -1308,7 +1312,7 @@ class WorkspaceRecommendedExtensionsView extends ExtensionsListView {
         }
         else {
             this.notificationService.notify({
-                severity: Severity.Info,
+                severity: Severity$1.Info,
                 message: ( localizeWithPath(
                     'vs/workbench/contrib/extensions/browser/extensionsViews',
                     'no local extensions',

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.js

@@ -2,23 +2,24 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/extensionsWidgets.css.js';
 import { semverExports } from 'vscode/external/vscode-semver/semver.js';
 import { Disposable, DisposableStore, toDisposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { addDisposableListener, EventType, finalHandler, append, $, reset } from 'vscode/vscode/vs/base/browser/dom';
 import { language } from 'vscode/vscode/vs/base/common/platform';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IExtensionManagementServerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionRecommendationsService, IExtensionIgnoredRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { IExtensionManagementServerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { IExtensionRecommendationsService, IExtensionIgnoredRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.service';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { extensionButtonProminentBackground } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
-import { IThemeService, registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { EXTENSION_BADGE_REMOTE_BACKGROUND, EXTENSION_BADGE_REMOTE_FOREGROUND } from 'vscode/vscode/vs/workbench/common/theme';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IUserDataSyncEnablementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
-import { starFullIcon, verifiedPublisherIcon, sponsorIcon, installCountIcon, starHalfIcon, starEmptyIcon, ratingIcon, remoteIcon, syncIgnoredIcon, activationTimeIcon, errorIcon, warningIcon, infoIcon, preReleaseIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IUserDataSyncEnablementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
+import { installCountIcon, starFullIcon, starHalfIcon, starEmptyIcon, verifiedPublisherIcon, sponsorIcon, ratingIcon, preReleaseIcon, remoteIcon, syncIgnoredIcon, activationTimeIcon, errorIcon, warningIcon, infoIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
 import { registerColor } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import { textLinkForeground } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
@@ -30,23 +31,23 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
-import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { Color } from 'vscode/vscode/vs/base/common/color';
 import { renderMarkdown } from 'vscode/vscode/vs/base/browser/markdownRenderer';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { renderIcon } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 
 var ExtensionHoverWidget_1;
 class ExtensionWidget extends Disposable {