@codingame/monaco-vscode-api 4.4.1 → 4.5.0-improve-code-splitting.1

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

@@ -6,23 +6,27 @@ import { Throttler, Delayer, Promises } from '../../../../base/common/async.js';
 import { getDomNodePagePosition } from '../../../../base/browser/dom.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { parse, parseTree, findNodeAtLocation } from '../../../../base/common/json.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { disposeIfDisposable } from '../../../../base/common/lifecycle.js';
-import { AutoUpdateConfigurationKey, INSTALL_ACTIONS_GROUP, UPDATE_ACTIONS_GROUP, THEME_ACTIONS_GROUP, VIEWLET_ID, IExtensionsWorkbenchService, TOGGLE_IGNORE_EXTENSION_ACTION_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID } from '../common/extensions.js';
+import { AutoUpdateConfigurationKey, INSTALL_ACTIONS_GROUP, UPDATE_ACTIONS_GROUP, THEME_ACTIONS_GROUP, VIEWLET_ID, TOGGLE_IGNORE_EXTENSION_ACTION_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID } from '../common/extensions.js';
+import { IExtensionsWorkbenchService } from '../common/extensions.service.js';
 import { ExtensionsConfigurationInitialContent } from '../common/extensionsFileTemplate.js';
-import { ExtensionManagementErrorCode, TargetPlatformToString, IExtensionGalleryService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
-import { IExtensionManagementServerService, IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
-import { IExtensionRecommendationsService, IExtensionIgnoredRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
+import { ExtensionManagementErrorCode, TargetPlatformToString } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionGalleryService } from '../../../../platform/extensionManagement/common/extensionManagement.service.js';
+import { IExtensionManagementServerService, IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.service.js';
+import { IExtensionRecommendationsService, IExtensionIgnoredRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.service.js';
 import { areSameExtensions, getExtensionId } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { isLanguagePackExtension, ExtensionIdentifier, getWorkspaceSupportTypeMessage, isApplicationScopedExtension } from '../../../../platform/extensions/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IFileService } from '../../../../platform/files/common/files.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { IHostService } from '../../../services/host/browser/host.js';
-import { toExtensionDescription, toExtension, IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IFileService } from '../../../../platform/files/common/files.service.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
+import { IHostService } from '../../../services/host/browser/host.service.js';
+import { toExtensionDescription, toExtension } from '../../../services/extensions/common/extensions.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
 import { URI } from '../../../../base/common/uri.js';
-import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
@@ -36,48 +40,51 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-import { IJSONEditingService } from '../../../services/configuration/common/jsonEditing.js';
+import { IJSONEditingService } from '../../../services/configuration/common/jsonEditing.service.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from '../../../browser/actions/workspaceCommands.js';
-import { Severity, INotificationService } from '../../../../platform/notification/common/notification.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import '../../../../platform/notification/common/notification.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
+import { IEditorService } from '../../../services/editor/common/editorService.service.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { IWorkbenchThemeService } from '../../../services/themes/common/workbenchThemeService.js';
-import { ILabelService } from '../../../../platform/label/common/label.js';
-import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
-import { IProductService } from '../../../../platform/product/common/productService.js';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { IWorkbenchThemeService } from '../../../services/themes/common/workbenchThemeService.service.js';
+import { ILabelService } from '../../../../platform/label/common/label.service.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
+import { IProductService } from '../../../../platform/product/common/productService.service.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { EXTENSIONS_CONFIG } from '../../../services/extensionRecommendations/common/workspaceExtensionsConfig.js';
 import { getErrorMessage, isCancellationError } from '../../../../base/common/errors.js';
-import { IUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSync.service.js';
 import { ActionWithDropdownActionViewItem } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { manageExtensionIcon, syncIgnoredIcon, syncEnabledIcon, warningIcon, infoIcon, trustIcon, errorIcon } from './extensionsIcons.js';
 import { language, isWeb, isIOS } from '../../../../base/common/platform.js';
-import { IExtensionManifestPropertiesService } from '../../../services/extensions/common/extensionManifestPropertiesService.js';
-import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IExtensionManifestPropertiesService } from '../../../services/extensions/common/extensionManifestPropertiesService.service.js';
+import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.service.js';
 import { isVirtualWorkspace } from '../../../../platform/workspace/common/virtualWorkspace.js';
 import { MarkdownString, escapeMarkdownSyntaxTokens } from '../../../../base/common/htmlContent.js';
-import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
+import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.service.js';
 import { flatten } from '../../../../base/common/arrays.js';
 import { fromNow } from '../../../../base/common/date.js';
-import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
 import { getLocale } from '../../../../platform/languagePacks/common/languagePacks.js';
-import { ILocaleService } from '../../../services/localization/common/locale.js';
+import { ILocaleService } from '../../../services/localization/common/locale.service.js';
 import { isString } from '../../../../base/common/types.js';
 import { showWindowLogActionId } from '../../../services/log/common/logConstants.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { Extensions, IExtensionFeaturesManagementService } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
+import { Extensions } from '../../../services/extensionManagement/common/extensionFeatures.js';
+import { IExtensionFeaturesManagementService } from '../../../services/extensionManagement/common/extensionFeatures.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { IUpdateService } from '../../../../platform/update/common/update.js';
-import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IUpdateService } from '../../../../platform/update/common/update.service.js';
+import Severity$1 from '../../../../base/common/severity.js';
 var InstallAction_1, InstallInOtherServerAction_1, UninstallAction_1, ToggleAutoUpdateForExtensionAction_1, ToggleAutoUpdatesForPublisherAction_1, MigrateDeprecatedExtensionAction_1, ManageExtensionAction_1, TogglePreReleaseExtensionAction_1, InstallAnotherVersionAction_1, EnableForWorkspaceAction_1, EnableGloballyAction_1, DisableForWorkspaceAction_1, DisableGloballyAction_1, ExtensionRuntimeStateAction_1, SetColorThemeAction_1, SetFileIconThemeAction_1, SetProductIconThemeAction_1, SetLanguageAction_1, ClearLanguageAction_1, ShowRecommendedExtensionAction_1, InstallRecommendedExtensionAction_1, IgnoreExtensionRecommendationAction_1, UndoIgnoreExtensionRecommendationAction_1, ExtensionStatusLabelAction_1, ToggleSyncExtensionAction_1, ExtensionStatusAction_1, ReinstallAction_1, InstallSpecificVersionOfExtensionAction_1;
 let PromptExtensionInstallFailureAction = class PromptExtensionInstallFailureAction extends Action {
     constructor(extension, version, installOperation, error, productService, openerService, notificationService, dialogService, commandService, logService, extensionManagementServerService, instantiationService, galleryService, extensionManifestPropertiesService) {
@@ -117,7 +124,7 @@ let PromptExtensionInstallFailureAction = class PromptExtensionInstallFailureAct
                 productName
             ));
             const { confirmed } = await this.dialogService.confirm({
-                type: Severity.Info,
+                type: Severity$1.Info,
                 message,
                 primaryButton: ( localizeWithPath(
                     'vs/workbench/contrib/extensions/browser/extensionsActions',
@@ -222,7 +229,7 @@ let PromptExtensionInstallFailureAction = class PromptExtensionInstallFailureAct
                     "Try Downloading Manually..."
                 )),
                 run: () => this.openerService.open(downloadUrl).then(() => {
-                    this.notificationService.prompt(Severity.Info, ( localizeWithPath(
+                    this.notificationService.prompt(Severity$1.Info, ( localizeWithPath(
                         'vs/workbench/contrib/extensions/browser/extensionsActions',
                         'install vsix',
                         'Once downloaded, please manually install the downloaded VSIX of \'{0}\'.',
@@ -239,7 +246,7 @@ let PromptExtensionInstallFailureAction = class PromptExtensionInstallFailureAct
             });
         }
         const message = `${operationMessage}${additionalMessage ? ` ${additionalMessage}` : ''}`;
-        this.notificationService.prompt(Severity.Error, message, promptChoices);
+        this.notificationService.prompt(Severity$1.Error, message, promptChoices);
     }
     async getDownloadUrl() {
         if (isIOS) {
@@ -470,7 +477,7 @@ let InstallAction = class InstallAction extends ExtensionAction {
                 detail = ( new MarkdownString(`${detail} ${this.extension.deprecationInfo.additionalInfo}`));
             }
             const { result } = await this.dialogService.prompt({
-                type: Severity.Warning,
+                type: Severity$1.Warning,
                 message: ( localizeWithPath(
                     'vs/workbench/contrib/extensions/browser/extensionsActions',
                     'install confirmation',
@@ -2833,11 +2840,11 @@ let ExtensionStatusAction = class ExtensionStatusAction extends ExtensionAction
             ))}](${( URI.parse(
                 `command:extension.open?${encodeURIComponent(JSON.stringify([this.extension.identifier.id, "features" , false, feature.id]))}`
             ))})`;
-            if (status?.severity === Severity.Error) {
+            if (status?.severity === Severity$1.Error) {
                 this.updateStatus({ icon: errorIcon, message: ( new MarkdownString()).appendText(status.message).appendMarkdown(` ${manageAccessLink}`) }, true);
                 return;
             }
-            if (status?.severity === Severity.Warning) {
+            if (status?.severity === Severity$1.Warning) {
                 this.updateStatus({ icon: warningIcon, message: ( new MarkdownString()).appendText(status.message).appendMarkdown(` ${manageAccessLink}`) }, true);
                 return;
             }
@@ -2968,7 +2975,7 @@ let ExtensionStatusAction = class ExtensionStatusAction extends ExtensionAction
             }
         }
         if (isEnabled && !isRunning && !this.extension.local.isValid) {
-            const errors = ( this.extension.local.validations.filter(([severity]) => severity === Severity.Error).map(([, message]) => message));
+            const errors = ( this.extension.local.validations.filter(([severity]) => severity === Severity$1.Error).map(([, message]) => message));
             this.updateStatus({ icon: errorIcon, message: ( new MarkdownString(errors.join(' ').trim())) }, true);
         }
     }
@@ -3090,7 +3097,7 @@ let ReinstallAction = class ReinstallAction extends Action {
                         )),
                         run: () => this.hostService.reload()
                     }] : [];
-                this.notificationService.prompt(Severity.Info, message, actions, { sticky: true });
+                this.notificationService.prompt(Severity$1.Info, message, actions, { sticky: true });
             }, error => this.notificationService.error(error));
         });
     }
@@ -3222,7 +3229,7 @@ let AbstractInstallExtensionsInServerAction = class AbstractInstallExtensionsInS
             quickPick.hide();
             quickPick.dispose();
             this.notificationService.notify({
-                severity: Severity.Info,
+                severity: Severity$1.Info,
                 message: ( localizeWithPath(
                     'vs/workbench/contrib/extensions/browser/extensionsActions',
                     'no local extensions',

package/vscode/src/vs/workbench/contrib/extensions/common/extensions.js

@@ -1,11 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IExtensionsWorkbenchService } from './extensions.service.js';
 const VIEWLET_ID = 'workbench.view.extensions';
-const IExtensionsWorkbenchService = ( createDecorator('extensionsWorkbenchService'));
 const AutoUpdateConfigurationKey = 'extensions.autoUpdate';
 const AutoCheckUpdatesConfigurationKey = 'extensions.autoCheckUpdates';
 const CloseExtensionDetailsOnViewChangeKey = 'extensions.closeExtensionDetailsOnViewChange';
@@ -53,4 +52,4 @@ const THEME_ACTIONS_GROUP = '_theme_';
 const INSTALL_ACTIONS_GROUP = '0_install';
 const UPDATE_ACTIONS_GROUP = '0_update';
 const extensionsSearchActionsMenu = ( new MenuId('extensionsSearchActionsMenu'));
-export { AutoCheckUpdatesConfigurationKey, AutoUpdateConfigurationKey, CONTEXT_HAS_GALLERY, CloseExtensionDetailsOnViewChangeKey, ExtensionContainers, HasOutdatedExtensionsContext, IExtensionsWorkbenchService, INSTALL_ACTIONS_GROUP, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, OUTDATED_EXTENSIONS_VIEW_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, THEME_ACTIONS_GROUP, TOGGLE_IGNORE_EXTENSION_ACTION_ID, UPDATE_ACTIONS_GROUP, VIEWLET_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, extensionsSearchActionsMenu };
+export { AutoCheckUpdatesConfigurationKey, AutoUpdateConfigurationKey, CONTEXT_HAS_GALLERY, CloseExtensionDetailsOnViewChangeKey, ExtensionContainers, HasOutdatedExtensionsContext, INSTALL_ACTIONS_GROUP, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, OUTDATED_EXTENSIONS_VIEW_ID, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, THEME_ACTIONS_GROUP, TOGGLE_IGNORE_EXTENSION_ACTION_ID, UPDATE_ACTIONS_GROUP, VIEWLET_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, extensionsSearchActionsMenu };

package/vscode/src/vs/workbench/contrib/extensions/common/extensions.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const IExtensionsWorkbenchService = ( createDecorator('extensionsWorkbenchService'));
+export { IExtensionsWorkbenchService };

package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js

@@ -3,13 +3,15 @@ import { localizeWithPath } from '../../../../nls.js';
 import { Event } from '../../../../base/common/event.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
-import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
-import { IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
-import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.service.js';
+import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.service.js';
+import { IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.service.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
-import { Severity, INotificationService } from '../../../../platform/notification/common/notification.js';
+import '../../../../platform/notification/common/notification.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import Severity$1 from '../../../../base/common/severity.js';
 let KeymapExtensions = class KeymapExtensions extends Disposable {
     constructor(instantiationService, extensionEnablementService, tipsService, lifecycleService, notificationService) {
         super();
@@ -42,7 +44,7 @@ let KeymapExtensions = class KeymapExtensions extends Disposable {
                 this.extensionEnablementService.setEnablement(( oldKeymaps.map(keymap => keymap.local)), 6 );
             }
         };
-        this.notificationService.prompt(Severity.Info, ( localizeWithPath(
+        this.notificationService.prompt(Severity$1.Info, ( localizeWithPath(
             'vs/workbench/contrib/extensions/common/extensionsUtils',
             'disableOtherKeymapsConfirmation',
             "Disable other keymaps ({0}) to avoid conflicts between keybindings?",

package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js

@@ -7,15 +7,13 @@ import { isWeb } from '../../../../base/common/platform.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ExternalUriOpenerPriority } from '../../../../editor/common/languages.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { defaultExternalUriOpenerId, externalUriOpenersSettingId } from './configuration.js';
 import { testUrlMatchesGlob } from '../../url/common/urlGlob.js';
-import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
-const IExternalUriOpenerService = ( createDecorator('externalUriOpenerService'));
+import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
 let ExternalUriOpenerService = class ExternalUriOpenerService extends Disposable {
     constructor(openerService, configurationService, logService, preferencesService, quickInputService) {
         super();
@@ -181,4 +179,4 @@ ExternalUriOpenerService = ( __decorate([
     ( __param(3, IPreferencesService)),
     ( __param(4, IQuickInputService))
 ], ExternalUriOpenerService));
-export { ExternalUriOpenerService, IExternalUriOpenerService };
+export { ExternalUriOpenerService };

package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const IExternalUriOpenerService = ( createDecorator('externalUriOpenerService'));
+export { IExternalUriOpenerService };

package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js

@@ -1,13 +1,13 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { BaseBinaryResourceEditor } from '../../../../browser/parts/editor/binaryEditor.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
-import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.service.js';
 import { FileEditorInput } from './fileEditorInput.js';
 import { BINARY_FILE_EDITOR_ID, BINARY_TEXT_FILE_MODE } from '../../common/files.js';
-import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.service.js';
 import { EditorResolution } from '../../../../../platform/editor/common/editor.js';
-import { IEditorResolverService } from '../../../../services/editor/common/editorResolverService.js';
+import { IEditorResolverService } from '../../../../services/editor/common/editorResolverService.service.js';
 import { isEditorInputWithOptions } from '../../../../common/editor.js';
 import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
 var BinaryFileEditor_1;

package/vscode/src/vs/workbench/contrib/files/browser/editors/fileEditorHandler.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { ITextEditorService } from '../../../../services/textfile/common/textEditorService.js';
+import { ITextEditorService } from '../../../../services/textfile/common/textEditorService.service.js';
 import { isEqual } from '../../../../../base/common/resources.js';
 import { NO_TYPE_ID } from '../../../../services/workingCopy/common/workingCopy.js';
-import { IWorkingCopyEditorService } from '../../../../services/workingCopy/common/workingCopyEditorService.js';
-import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IWorkingCopyEditorService } from '../../../../services/workingCopy/common/workingCopyEditorService.service.js';
+import { IFileService } from '../../../../../platform/files/common/files.service.js';
 class FileEditorInputSerializer {
     canSerialize(editorInput) {
         return true;

package/vscode/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.js

@@ -2,22 +2,22 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { DEFAULT_EDITOR_ASSOCIATION, findViewStateForEditor, isResourceEditorInput } from '../../../../common/editor.js';
 import { AbstractTextResourceEditorInput } from '../../../../common/editor/textResourceEditorInput.js';
 import { BinaryEditorModel } from '../../../../common/editor/binaryEditorModel.js';
-import { IFileService } from '../../../../../platform/files/common/files.js';
-import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
+import { IFileService } from '../../../../../platform/files/common/files.service.js';
+import { ITextFileService } from '../../../../services/textfile/common/textfiles.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { DisposableStore, dispose } from '../../../../../base/common/lifecycle.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { FILE_EDITOR_INPUT_ID, BINARY_FILE_EDITOR_ID, TEXT_FILE_EDITOR_ID } from '../../common/files.js';
-import { ILabelService } from '../../../../../platform/label/common/label.js';
-import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { ILabelService } from '../../../../../platform/label/common/label.service.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.service.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { isEqual } from '../../../../../base/common/resources.js';
 import { Event } from '../../../../../base/common/event.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { createTextBufferFactory } from '../../../../../editor/common/model/textModel.js';
-import { IPathService } from '../../../../services/path/common/pathService.js';
+import { IPathService } from '../../../../services/path/common/pathService.service.js';
 import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
-import { ICustomEditorLabelService } from '../../../../services/editor/common/customEditorLabelService.js';
+import { ICustomEditorLabelService } from '../../../../services/editor/common/customEditorLabelService.service.js';
 var FileEditorInput_1;
 let FileEditorInput = FileEditorInput_1 = class FileEditorInput extends AbstractTextResourceEditorInput {
     get typeId() {

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js

@@ -2,32 +2,33 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { localizeWithPath } from '../../../../../nls.js';
 import { mark } from '../../../../../base/common/performance.js';
 import { assertIsDefined } from '../../../../../base/common/types.js';
-import { IPathService } from '../../../../services/path/common/pathService.js';
+import { IPathService } from '../../../../services/path/common/pathService.service.js';
 import { toAction } from '../../../../../base/common/actions.js';
 import { TEXT_FILE_EDITOR_ID, BINARY_TEXT_FILE_MODE, VIEWLET_ID } from '../../common/files.js';
-import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
+import { ITextFileService } from '../../../../services/textfile/common/textfiles.service.js';
 import { AbstractTextCodeEditor } from '../../../../browser/parts/editor/textCodeEditor.js';
 import { isTextEditorViewState, createEditorOpenError, createTooLargeFileError, DEFAULT_EDITOR_ASSOCIATION } from '../../../../common/editor.js';
 import { applyTextEditorOptions } from '../../../../common/editor/editorOptions.js';
 import { BinaryEditorModel } from '../../../../common/editor/binaryEditorModel.js';
 import { FileEditorInput } from './fileEditorInput.js';
-import { TooLargeFileOperationError, ByteSize, FileOperationError, IFileService } from '../../../../../platform/files/common/files.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
-import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { TooLargeFileOperationError, ByteSize, FileOperationError } from '../../../../../platform/files/common/files.js';
+import { IFileService } from '../../../../../platform/files/common/files.service.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.service.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.service.js';
 import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.service.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.service.js';
 import { EditorActivation } from '../../../../../platform/editor/common/editor.js';
-import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
-import { IExplorerService } from '../files.js';
-import { IPaneCompositePartService } from '../../../../services/panecomposite/browser/panecomposite.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
-import { IHostService } from '../../../../services/host/browser/host.js';
-import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.service.js';
+import { IExplorerService } from '../files.service.js';
+import { IPaneCompositePartService } from '../../../../services/panecomposite/browser/panecomposite.service.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
+import { IPreferencesService } from '../../../../services/preferences/common/preferences.service.js';
+import { IHostService } from '../../../../services/host/browser/host.service.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 var TextFileEditor_1;
 let TextFileEditor = class TextFileEditor extends AbstractTextCodeEditor {
     static { TextFileEditor_1 = this; }

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.js

@@ -1,17 +1,17 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
-import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { ITextFileService } from '../../../../services/textfile/common/textfiles.service.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.service.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { distinct, coalesce } from '../../../../../base/common/arrays.js';
-import { IHostService } from '../../../../services/host/browser/host.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IHostService } from '../../../../services/host/browser/host.service.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { RunOnceWorker } from '../../../../../base/common/async.js';
 import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
-import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { FILE_EDITOR_INPUT_ID } from '../../common/files.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { UntitledTextEditorInput } from '../../../../services/untitled/common/untitledTextEditorInput.js';
-import { IWorkingCopyEditorService } from '../../../../services/workingCopy/common/workingCopyEditorService.js';
+import { IWorkingCopyEditorService } from '../../../../services/workingCopy/common/workingCopyEditorService.service.js';
 import { DEFAULT_EDITOR_ASSOCIATION } from '../../../../common/editor.js';
 let TextFileEditorTracker = class TextFileEditorTracker extends Disposable {
     static { this.ID = 'workbench.contrib.textFileEditorTracker'; }

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js

@@ -4,27 +4,30 @@ import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
 import { isEqual, basename } from '../../../../../base/common/resources.js';
 import { Action } from '../../../../../base/common/actions.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
+import { ITextFileService } from '../../../../services/textfile/common/textfiles.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { Disposable, dispose } from '../../../../../base/common/lifecycle.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
-import { RawContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
 import { TextFileContentProvider } from '../../common/files.js';
 import { FileEditorInput } from './fileEditorInput.js';
 import { SAVE_FILE_AS_LABEL } from '../fileConstants.js';
-import { Severity, INotificationService } from '../../../../../platform/notification/common/notification.js';
-import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
-import { IStorageService } from '../../../../../platform/storage/common/storage.js';
-import { IProductService } from '../../../../../platform/product/common/productService.js';
+import '../../../../../platform/notification/common/notification.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.service.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.service.js';
+import { IProductService } from '../../../../../platform/product/common/productService.service.js';
 import { Event } from '../../../../../base/common/event.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { isWindows } from '../../../../../base/common/platform.js';
 import { Schemas } from '../../../../../base/common/network.js';
-import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
+import { IPreferencesService } from '../../../../services/preferences/common/preferences.service.js';
 import { SideBySideEditor } from '../../../../common/editor.js';
 import { hash } from '../../../../../base/common/hash.js';
+import Severity$1 from '../../../../../base/common/severity.js';
 const CONFLICT_RESOLUTION_CONTEXT = 'saveConflictResolutionContext';
 const CONFLICT_RESOLUTION_SCHEME = 'conflictResolution';
 const LEARN_MORE_DIRTY_WRITE_IGNORE_KEY = 'learnMoreDirtyWriteError';
@@ -169,7 +172,7 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
         const actions = { primary: primaryActions, secondary: secondaryActions };
         const handle = this.notificationService.notify({
             id: `${hash(( model.resource.toString()))}`,
-            severity: Severity.Error,
+            severity: Severity$1.Error,
             message,
             actions
         });
@@ -259,7 +262,7 @@ let ResolveSaveConflictAction = class ResolveSaveConflictAction extends Action {
             const actions = { primary: [this.instantiationService.createInstance(ResolveConflictLearnMoreAction)] };
             const handle = this.notificationService.notify({
                 id: `${hash(( resource.toString()))}`,
-                severity: Severity.Info,
+                severity: Severity$1.Info,
                 message: conflictEditorHelp,
                 actions,
                 neverShowAgain: { id: LEARN_MORE_DIRTY_WRITE_IGNORE_KEY, isSecondary: true }

package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js

@@ -3,25 +3,27 @@ import './media/explorerviewlet.css.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { mark } from '../../../../base/common/performance.js';
 import { VIEW_ID, VIEWLET_ID, ExplorerViewletVisibleContext } from '../common/files.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ExplorerView } from './views/explorerView.js';
 import { EmptyView } from './views/emptyView.js';
 import { OpenEditorsView } from './views/openEditorsView.js';
-import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { Extensions, ViewContentGroups, IViewDescriptorService } from '../../../common/views.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
+import { Extensions, ViewContentGroups } from '../../../common/views.js';
+import { IViewDescriptorService } from '../../../common/views.service.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
 import { KeyChord } from '../../../../base/common/keyCodes.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { WorkbenchStateContext, OpenFolderWorkspaceSupportContext, RemoteNameContext } from '../../../common/contextkeys.js';
 import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';