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

package/vscode/src/vs/platform/extensionRecommendations/common/extensionRecommendations.js

@@ -0,0 +1,9 @@
+function RecommendationSourceToString(source) {
+    switch (source) {
+        case 1 : return 'file';
+        case 2 : return 'workspace';
+        case 3 : return 'exe';
+    }
+}
+
+export { RecommendationSourceToString };

package/vscode/src/vs/platform/userDataProfile/common/userDataProfileIpc.js

@@ -0,0 +1,67 @@
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { reviveProfile } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
+import 'vscode/vscode/vs/base/common/path';
+import 'vscode/vscode/vs/base/common/platform';
+
+class UserDataProfilesService extends Disposable {
+    get defaultProfile() { return this.profiles[0]; }
+    get profiles() { return this._profiles; }
+    constructor(profiles, profilesHome, channel) {
+        super();
+        this.profilesHome = profilesHome;
+        this.channel = channel;
+        this._profiles = [];
+        this._onDidChangeProfiles = this._register(( new Emitter()));
+        this.onDidChangeProfiles = this._onDidChangeProfiles.event;
+        this.enabled = true;
+        this._profiles = ( profiles.map(profile => reviveProfile(profile, this.profilesHome.scheme)));
+        this._register(this.channel.listen('onDidChangeProfiles')(e => {
+            const added = ( e.added.map(profile => reviveProfile(profile, this.profilesHome.scheme)));
+            const removed = ( e.removed.map(profile => reviveProfile(profile, this.profilesHome.scheme)));
+            const updated = ( e.updated.map(profile => reviveProfile(profile, this.profilesHome.scheme)));
+            this._profiles = ( e.all.map(profile => reviveProfile(profile, this.profilesHome.scheme)));
+            this._onDidChangeProfiles.fire({ added, removed, updated, all: this.profiles });
+        }));
+        this.onDidResetWorkspaces = this.channel.listen('onDidResetWorkspaces');
+    }
+    setEnablement(enabled) {
+        this.enabled = enabled;
+    }
+    isEnabled() {
+        return this.enabled;
+    }
+    async createNamedProfile(name, options, workspaceIdentifier) {
+        const result = await this.channel.call('createNamedProfile', [name, options, workspaceIdentifier]);
+        return reviveProfile(result, this.profilesHome.scheme);
+    }
+    async createProfile(id, name, options, workspaceIdentifier) {
+        const result = await this.channel.call('createProfile', [id, name, options, workspaceIdentifier]);
+        return reviveProfile(result, this.profilesHome.scheme);
+    }
+    async createTransientProfile(workspaceIdentifier) {
+        const result = await this.channel.call('createTransientProfile', [workspaceIdentifier]);
+        return reviveProfile(result, this.profilesHome.scheme);
+    }
+    async setProfileForWorkspace(workspaceIdentifier, profile) {
+        await this.channel.call('setProfileForWorkspace', [workspaceIdentifier, profile]);
+    }
+    removeProfile(profile) {
+        return this.channel.call('removeProfile', [profile]);
+    }
+    async updateProfile(profile, updateOptions) {
+        const result = await this.channel.call('updateProfile', [profile, updateOptions]);
+        return reviveProfile(result, this.profilesHome.scheme);
+    }
+    resetWorkspaces() {
+        return this.channel.call('resetWorkspaces');
+    }
+    cleanUp() {
+        return this.channel.call('cleanUp');
+    }
+    cleanUpTransientProfiles() {
+        return this.channel.call('cleanUpTransientProfiles');
+    }
+}
+
+export { UserDataProfilesService };

package/vscode/src/vs/platform/userDataSync/common/ignoredExtensions.js

@@ -0,0 +1,65 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { distinct } from 'vscode/vscode/vs/base/common/arrays';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+
+let IgnoredExtensionsManagementService = class IgnoredExtensionsManagementService {
+    constructor(configurationService) {
+        this.configurationService = configurationService;
+    }
+    hasToNeverSyncExtension(extensionId) {
+        const configuredIgnoredExtensions = this.getConfiguredIgnoredExtensions();
+        return configuredIgnoredExtensions.includes(extensionId.toLowerCase());
+    }
+    hasToAlwaysSyncExtension(extensionId) {
+        const configuredIgnoredExtensions = this.getConfiguredIgnoredExtensions();
+        return configuredIgnoredExtensions.includes(`-${extensionId.toLowerCase()}`);
+    }
+    updateIgnoredExtensions(ignoredExtensionId, ignore) {
+        let currentValue = ( [...this.configurationService.getValue('settingsSync.ignoredExtensions')].map(id => id.toLowerCase()));
+        currentValue = currentValue.filter(v => v !== ignoredExtensionId && v !== `-${ignoredExtensionId}`);
+        if (ignore) {
+            currentValue.push(ignoredExtensionId.toLowerCase());
+        }
+        return this.configurationService.updateValue('settingsSync.ignoredExtensions', currentValue.length ? currentValue : undefined, 2 );
+    }
+    updateSynchronizedExtensions(extensionId, sync) {
+        let currentValue = ( [...this.configurationService.getValue('settingsSync.ignoredExtensions')].map(id => id.toLowerCase()));
+        currentValue = currentValue.filter(v => v !== extensionId && v !== `-${extensionId}`);
+        if (sync) {
+            currentValue.push(`-${extensionId.toLowerCase()}`);
+        }
+        return this.configurationService.updateValue('settingsSync.ignoredExtensions', currentValue.length ? currentValue : undefined, 2 );
+    }
+    getIgnoredExtensions(installed) {
+        const defaultIgnoredExtensions = ( installed.filter(i => i.isMachineScoped).map(i => i.identifier.id.toLowerCase()));
+        const value = ( this.getConfiguredIgnoredExtensions().map(id => id.toLowerCase()));
+        const added = [], removed = [];
+        if (Array.isArray(value)) {
+            for (const key of value) {
+                if (key.startsWith('-')) {
+                    removed.push(key.substring(1));
+                }
+                else {
+                    added.push(key);
+                }
+            }
+        }
+        return distinct([...defaultIgnoredExtensions, ...added,].filter(setting => !removed.includes(setting)));
+    }
+    getConfiguredIgnoredExtensions() {
+        let userValue = this.configurationService.inspect('settingsSync.ignoredExtensions').userValue;
+        if (userValue !== undefined) {
+            return userValue;
+        }
+        userValue = this.configurationService.inspect('sync.ignoredExtensions').userValue;
+        if (userValue !== undefined) {
+            return userValue;
+        }
+        return ( (this.configurationService.getValue('settingsSync.ignoredExtensions') || []).map(id => id.toLowerCase()));
+    }
+};
+IgnoredExtensionsManagementService = ( __decorate([
+    ( __param(0, IConfigurationService))
+], IgnoredExtensionsManagementService));
+
+export { IgnoredExtensionsManagementService };

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

@@ -15,17 +15,19 @@ import './media/runtimeExtensionsEditor.css.js';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
-import { IContextKeyService, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
+import { 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 { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { WorkbenchList } from 'vscode/vscode/vs/platform/list/browser/listService';
-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 { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
@@ -37,17 +39,19 @@ 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 { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { errorIcon, warningIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { RuntimeExtensionsInput } from '../common/runtimeExtensionsInput.js';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IExtensionFeaturesManagementService, Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
+import { IExtensionFeaturesManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures.service';
 import { getDefaultIconPath } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
 import { LocalWebWorkerRunningLocation } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionRunningLocation';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 var AbstractRuntimeExtensionsEditor_1;
 let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor extends EditorPane {
@@ -390,7 +394,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                         const status = accessData?.current?.status;
                         if (status) {
                             data.msgContainer.appendChild($('span', undefined, `${feature.label}: `));
-                            data.msgContainer.appendChild($('span', undefined, ...renderLabelWithIcons(`$(${status.severity === Severity.Error ? errorIcon.id : warningIcon.id}) ${status.message}`)));
+                            data.msgContainer.appendChild($('span', undefined, ...renderLabelWithIcons(`$(${status.severity === Severity$1.Error ? errorIcon.id : warningIcon.id}) ${status.message}`)));
                         }
                         if (accessData?.current) {
                             const element = $('span', undefined, ( localizeWithPath(

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

@@ -1,8 +1,8 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IExtensionTipsService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionTipsService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { ExtensionRecommendations } from './extensionRecommendations.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 
 let ConfigBasedRecommendations = class ConfigBasedRecommendations extends ExtensionRecommendations {

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

@@ -1,15 +1,17 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
-import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
+import 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { SearchExtensionsAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { distinct } from 'vscode/vscode/vs/base/common/arrays';
 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 { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
+import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 let DeprecatedExtensionsChecker = class DeprecatedExtensionsChecker extends Disposable {
     constructor(extensionsWorkbenchService, extensionManagementService, extensionEnablementService, storageService, notificationService, instantiationService) {
@@ -40,7 +42,7 @@ let DeprecatedExtensionsChecker = class DeprecatedExtensionsChecker extends Disp
         const previouslyNotified = this.getNotifiedDeprecatedExtensions();
         const toNotify = local.filter(e => !!e.deprecationInfo && e.local && this.extensionEnablementService.isEnabled(e.local)).filter(e => !previouslyNotified.includes(e.identifier.id.toLowerCase()));
         if (toNotify.length) {
-            this.notificationService.prompt(Severity.Warning, ( localizeWithPath(
+            this.notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
                 'vs/workbench/contrib/extensions/browser/deprecatedExtensionsChecker',
                 'deprecated extensions',
                 "You have deprecated extensions installed. We recommend to review them and migrate to alternatives."

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IExtensionTipsService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionTipsService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { ExtensionRecommendations } from './extensionRecommendations.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 

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

@@ -10,8 +10,8 @@ import { insert, isFalsyOrEmpty } from 'vscode/vscode/vs/base/common/arrays';
 import { Cache } from 'vscode/vscode/vs/base/common/cache';
 import { CancellationToken, CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
-import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
-import { MutableDisposable, DisposableStore, toDisposable, Disposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, dispose, MutableDisposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { matchesScheme, Schemas } from 'vscode/vscode/vs/base/common/network';
 import { language } from 'vscode/vscode/vs/base/common/platform';
 import { semverExports } from 'vscode/external/vscode-semver/semver.js';
@@ -25,15 +25,16 @@ import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/langu
 import { generateTokensCSSForColorMap } from 'vscode/vscode/vs/editor/common/languages/supports/tokenization';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { RawContextKey, IContextKeyService, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
-import { IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+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 { IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { defaultCheckboxStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import { textLinkForeground, textLinkActiveForeground } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
@@ -46,26 +47,29 @@ 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 { IThemeService, registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { ExtensionFeaturesTab } from './extensionFeaturesTab.js';
 import { InstallDropdownAction, ExtensionRuntimeStateAction, ExtensionStatusLabelAction, ActionWithDropDownAction, UpdateAction, ToggleAutoUpdateForExtensionAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, SetLanguageAction, ClearLanguageAction, EnableDropDownAction, DisableDropDownAction, RemoteInstallAction, LocalInstallAction, WebInstallAction, InstallingLabelAction, UninstallAction, MigrateDeprecatedExtensionAction, InstallAnotherVersionAction, TogglePreReleaseExtensionAction, ExtensionEditorManageExtensionAction, ExtensionDropDownAction, ExtensionActionWithDropdownActionViewItem, ExtensionStatusAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { Delegate } from './extensionsList.js';
 import { ExtensionsTree, ExtensionData, ExtensionsGridView, getExtensions } from './extensionsViewer.js';
-import { RemoteBadgeWidget, VerifiedPublisherWidget, InstallCountWidget, RatingsWidget, SponsorWidget, ExtensionStatusWidget, ExtensionWidget, ExtensionRecommendationWidget, onClick } from './extensionsWidgets.js';
-import { ExtensionContainers, IExtensionsWorkbenchService, VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
-import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
+import { ExtensionWidget, RemoteBadgeWidget, VerifiedPublisherWidget, InstallCountWidget, RatingsWidget, SponsorWidget, ExtensionStatusWidget, ExtensionRecommendationWidget, onClick } from './extensionsWidgets.js';
+import { ExtensionContainers, VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
+import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files.service';
 import { renderMarkdownDocument, DEFAULT_MARKDOWN_STYLES } from 'vscode/vscode/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer';
 import { ShowCurrentReleaseNotesActionId } from 'vscode/vscode/vs/workbench/contrib/update/common/update';
-import { IWebviewService, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IExtensionRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
+import { IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.service';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IExtensionRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 
 var ExtensionEditor_1;
 class NavBar extends Disposable {

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

@@ -1,11 +1,11 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
+import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 
 let ExtensionEnablementWorkspaceTrustTransitionParticipant = class ExtensionEnablementWorkspaceTrustTransitionParticipant extends Disposable {
     constructor(extensionService, hostService, environmentService, extensionEnablementService, workspaceTrustEnablementService, workspaceTrustManagementService) {

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

@@ -4,7 +4,8 @@ import { $, append, clearNode } from 'vscode/vscode/vs/base/browser/dom';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { SplitView, Sizing } from 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
-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 { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -14,11 +15,12 @@ import { Button } from 'vscode/vscode/vs/base/browser/ui/button/button';
 import { defaultButtonStyles, defaultKeybindingLabelStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { renderMarkdown } from 'vscode/vscode/vs/base/browser/markdownRenderer';
 import { getErrorMessage, onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { PANEL_SECTION_BORDER } from 'vscode/vscode/vs/workbench/common/theme';
-import { IThemeService, Themable } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { Themable } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { errorIcon, warningIcon, infoIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
@@ -27,12 +29,11 @@ import { KeybindingLabel } from 'vscode/vscode/vs/base/browser/ui/keybindingLabe
 import { OS } from 'vscode/vscode/vs/base/common/platform';
 import { MarkdownString, isMarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { Color } from 'vscode/vscode/vs/base/common/color';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { fromNow } from 'vscode/vscode/vs/base/common/date';
 import { ResolvedKeybinding } from 'vscode/vscode/vs/base/common/keybindings';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 let RuntimeStatusMarkdownRenderer = class RuntimeStatusMarkdownRenderer extends Disposable {
     static { this.ID = 'runtimeStatus'; }

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

@@ -1,26 +1,28 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { distinct } from 'vscode/vscode/vs/base/common/arrays';
-import { raceCancellablePromises, createCancelablePromise, raceCancellation, timeout, Promises } from 'vscode/vscode/vs/base/common/async';
+import { raceCancellablePromises, createCancelablePromise, Promises, raceCancellation, timeout } from 'vscode/vscode/vs/base/common/async';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
-import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
-import { Disposable, DisposableStore, isDisposable, toDisposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, MutableDisposable, DisposableStore, isDisposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isString } from 'vscode/vscode/vs/base/common/types';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { RecommendationSourceToString } from 'vscode/vscode/vs/platform/extensionRecommendations/common/extensionRecommendations';
+import { RecommendationSourceToString } from '../../../../platform/extensionRecommendations/common/extensionRecommendations.js';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { INotificationService, Severity, NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
-import { IUserDataSyncEnablementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
+import { NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { IUserDataSyncEnablementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync.service';
 import { SearchExtensionsAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
-import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IWorkbenchExtensionManagementService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionIgnoredRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IWorkbenchExtensionManagementService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { IExtensionIgnoredRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.service';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 const ignoreImportantExtensionRecommendationStorageKey = 'extensionsAssistant/importantRecommendationsIgnore';
 const donotShowWorkspaceRecommendationsStorageKey = 'extensionsAssistant/workspaceRecommendationsIgnore';
@@ -110,7 +112,7 @@ let ExtensionRecommendationNotificationService = class ExtensionRecommendationNo
                     this.addToImportantRecommendationsIgnore(extension.identifier.id);
                     this.telemetryService.publicLog2('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: extension.identifier.id, source: RecommendationSourceToString(extensionRecommendations.source) });
                 }
-                this.notificationService.prompt(Severity.Info, ( localizeWithPath(
+                this.notificationService.prompt(Severity$1.Info, ( localizeWithPath(
                     'vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService',
                     'ignoreExtensionRecommendations',
                     "Do you want to ignore all extension recommendations?"
@@ -303,7 +305,7 @@ let ExtensionRecommendationNotificationService = class ExtensionRecommendationNo
                     }
                 }]);
             try {
-                accepted = await this.doShowRecommendationsNotification(Severity.Info, message, choices, source, token);
+                accepted = await this.doShowRecommendationsNotification(Severity$1.Info, message, choices, source, token);
             }
             catch (error) {
                 if (!isCancellationError(error)) {

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

@@ -1,28 +1,28 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IExtensionGalleryService, IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionIgnoredRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations';
+import { IExtensionGalleryService, IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
+import { IExtensionIgnoredRecommendationsService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { shuffle } from 'vscode/vscode/vs/base/common/arrays';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
-import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
-import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
+import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { ExeBasedRecommendations } from './exeBasedRecommendations.js';
 import { WorkspaceRecommendations } from './workspaceRecommendations.js';
 import { FileBasedRecommendations } from './fileBasedRecommendations.js';
 import { KeymapRecommendations } from './keymapRecommendations.js';
 import { LanguageRecommendations } from './languageRecommendations.js';
 import { ConfigBasedRecommendations } from './configBasedRecommendations.js';
-import { IExtensionRecommendationNotificationService } from 'vscode/vscode/vs/platform/extensionRecommendations/common/extensionRecommendations';
+import { IExtensionRecommendationNotificationService } from 'vscode/vscode/vs/platform/extensionRecommendations/common/extensionRecommendations.service';
 import { timeout } from 'vscode/vscode/vs/base/common/async';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { WebRecommendations } from './webRecommendations.js';
-import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { RemoteRecommendations } from './remoteRecommendations.js';
-import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
-import { IUserDataInitializationService } from 'vscode/vscode/vs/workbench/services/userData/browser/userDataInit';
+import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner.service';
+import { IUserDataInitializationService } from 'vscode/vscode/vs/workbench/services/userData/browser/userDataInit.service';
 import { isString } from 'vscode/vscode/vs/base/common/types';
 
 let ExtensionRecommendationsService = class ExtensionRecommendationsService extends Disposable {