@codingame/monaco-vscode-extensions-service-override 4.4.1 → 4.5.0-improve-code-splitting.1

package/extensions.d.ts

@@ -1,29 +1,29 @@
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IExtension, IRelaxedExtensionDescription } from 'vscode/vscode/vs/platform/extensions/common/extensions';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
-import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
-import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
-import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, IWebExtensionsScannerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
+import { IRemoteExtensionsScannerService } from './vscode/src/vs/platform/remote/common/remoteExtensionsScanner.service.js';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, IWebExtensionsScannerService } from './vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.service.js';
+import { IExtensionManifestPropertiesService } from './vscode/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
-import { IUserDataInitializationService } from 'vscode/vscode/vs/workbench/services/userData/browser/userDataInit';
-import { ExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/browser/extensionService';
+import { IUserDataInitializationService } from './vscode/src/vs/workbench/services/userData/browser/userDataInit.service.js';
+import { ExtensionService } from './vscode/src/vs/workbench/services/extensions/browser/extensionService.js';
 import { ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 export { ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
-import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
-import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
+import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
+import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
+import { IRemoteExplorerService } from './vscode/src/vs/workbench/services/remote/common/remoteExplorerService.service.js';
 import { LocalExtensionHost } from './localExtensionHost.js';
 
 interface WorkerConfig {

package/extensions.js

@@ -1,38 +1,41 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { toExtensionDescription, IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
+import { toExtensionDescription } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { DeltaExtensionsQueueItem } from './vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import './override/vs/platform/dialogs/common/dialogs.js';
-import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
-import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
-import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, IWebExtensionsScannerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionManifestPropertiesService, ExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
+import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner.service';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, IWebExtensionsScannerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { ExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
+import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IUserDataInitializationService } from 'vscode/vscode/vs/workbench/services/userData/browser/userDataInit';
+import { IUserDataInitializationService } from 'vscode/vscode/vs/workbench/services/userData/browser/userDataInit.service';
 import { ExtensionsProposedApi } from './vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js';
 import { BrowserExtensionHostFactory, BrowserExtensionHostKindPicker, ExtensionService } from './vscode/src/vs/workbench/services/extensions/browser/extensionService.js';
 export { ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { WebWorkerExtensionHost } from './vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js';
-import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
-import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
-import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
+import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
+import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
+import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService.service';
 import { ExtensionResourceLoaderService } from './vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js';
-import { IExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader';
-import { IExtensionBisectService, ExtensionBisectService } from 'vscode/vscode/vs/workbench/services/extensionManagement/browser/extensionBisect';
+import { IExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service';
+import { ExtensionBisectService } from './vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js';
+import { IExtensionBisectService } from 'vscode/vscode/vs/workbench/services/extensionManagement/browser/extensionBisect.service';
 import { changeUrlDomain } from './tools/url.js';
 import { CustomSchemas } from '@codingame/monaco-vscode-files-service-override';
 import { registerAssets } from 'vscode/assets';
@@ -120,7 +123,6 @@ import './vscode/src/vs/workbench/api/browser/mainThreadProfileContentHandlers.j
 import './vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadIssueReporter.js';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 let EsmWebWorkerExtensionHost = class EsmWebWorkerExtensionHost extends WebWorkerExtensionHost {
     constructor(workerConfig, runningLocation, startup, _initDataProvider, _telemetryService, _contextService, _labelService, _logService, _loggerService, _environmentService, _userDataProfilesService, _productService, _layoutService, _storageService) {

package/localExtensionHost.d.ts

@@ -1,14 +1,14 @@
 import { IMessagePassingProtocol } from 'vscode/vscode/vs/base/parts/ipc/common/ipc';
 import { LocalProcessRunningLocation } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionRunningLocation';
 import { IExtensionHost, ExtensionHostStartup, ExtensionHostExtensions } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IWebWorkerExtensionHostDataProvider } from 'vscode/vscode/vs/workbench/services/extensions/browser/webWorkerExtensionHost';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
+import { IWebWorkerExtensionHostDataProvider } from './vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 
 declare class LocalExtensionHost implements IExtensionHost {

package/override/vs/workbench/browser/parts/editor/textEditor.weak.js

@@ -4,5 +4,8 @@ class FakeAbstractTextEditor {
       return AbstractTextEditor != null && instance instanceof AbstractTextEditor
   }
 }
+function setAbstractTextEditor(_AbstractTextEditor) {
+  AbstractTextEditor = _AbstractTextEditor;
+}
 
-export { FakeAbstractTextEditor as AbstractTextEditor };
+export { FakeAbstractTextEditor as AbstractTextEditor, setAbstractTextEditor };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "4.4.1",
+  "version": "4.5.0-improve-code-splitting.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -17,8 +17,16 @@
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "default": "./index.js"
+    },
+    "./vscode/*": {
+      "default": "./vscode/src/*.js"
+    }
+  },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.4.1",
-    "@codingame/monaco-vscode-files-service-override": "4.4.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.5.0-improve-code-splitting.1",
+    "@codingame/monaco-vscode-files-service-override": "4.5.0-improve-code-splitting.1"
   }
 }

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js

@@ -6,7 +6,8 @@ import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { semverExports } from 'vscode/external/vscode-semver/semver.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IExtensionManagementService, IExtensionGalleryService, EXTENSION_IDENTIFIER_REGEX } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { EXTENSION_IDENTIFIER_REGEX } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManagementService, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 

package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js

@@ -1,12 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { FileAccess, Schemas } from 'vscode/vscode/vs/base/common/network';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { AbstractExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
 let ExtensionResourceLoaderService = class ExtensionResourceLoaderService extends AbstractExtensionResourceLoaderService {
     constructor(fileService, storageService, productService, environmentService, configurationService, _logService) {

package/vscode/src/vs/platform/remote/common/managedSocket.js

@@ -1,4 +1,4 @@
-import { VSBuffer, encodeBase64 } from 'vscode/vscode/vs/base/common/buffer';
+import { encodeBase64, VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { PauseableEmitter, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { SocketDiagnostics } from 'vscode/vscode/vs/base/parts/ipc/common/ipc.net';

package/vscode/src/vs/platform/remote/common/remoteExtensionsScanner.service.d.ts

@@ -0,0 +1,13 @@
+import { ServiceIdentifier } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { IExtensionDescription } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+
+declare const IRemoteExtensionsScannerService: ServiceIdentifier<IRemoteExtensionsScannerService>;
+interface IRemoteExtensionsScannerService {
+    readonly _serviceBrand: undefined;
+    whenExtensionsReady(): Promise<void>;
+    scanExtensions(): Promise<IExtensionDescription[]>;
+    scanSingleExtension(extensionLocation: URI, isBuiltin: boolean): Promise<IExtensionDescription | null>;
+}
+
+export { IRemoteExtensionsScannerService };

package/vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { IAiEmbeddingVectorService } from 'vscode/vscode/vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { IAiEmbeddingVectorService } from 'vscode/vscode/vs/workbench/services/aiEmbeddingVector/common/aiEmbeddingVectorService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 let MainThreadAiEmbeddingVector = class MainThreadAiEmbeddingVector extends Disposable {

package/vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { IAiRelatedInformationService } from 'vscode/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { IAiRelatedInformationService } from 'vscode/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 let MainThreadAiRelatedInformation = class MainThreadAiRelatedInformation extends Disposable {

package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js

@@ -2,20 +2,19 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { IAuthenticationService, IAuthenticationExtensionsService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication';
-import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { IAuthenticationService, IAuthenticationExtensionsService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { IAuthenticationAccessService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationAccessService';
-import { IAuthenticationUsageService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationUsageService';
+import { IAuthenticationAccessService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
+import { IAuthenticationUsageService } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service';
 import { getAuthenticationProviderActivationEvent } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationService';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 
 class MainThreadAuthenticationProvider extends Disposable {
     constructor(_proxy, id, label, supportsMultipleAccounts, notificationService, onDidChangeSessionsEmitter) {

package/vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js

@@ -2,8 +2,8 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { decodeBase64 } from 'vscode/vscode/vs/base/common/buffer';
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 import { IBulkEditService, ResourceTextEdit, ResourceFileEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';

package/vscode/src/vs/workbench/api/browser/mainThreadCLICommands.js

@@ -4,18 +4,19 @@ import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { isString } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { CommandsRegistry, ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { IExtensionManagementService, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IExtensionManagementService, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { ExtensionManagementCLI } from '../../../platform/extensionManagement/common/extensionManagementCLI.js';
 import { getExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { AbstractMessageLogger } from 'vscode/vscode/vs/platform/log/common/log';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IExtensionManagementServerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IExtensionManagementServerService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
 
 CommandsRegistry.registerCommand('_remoteCLI.openExternal', function (accessor, uri) {
     const openerService = accessor.get(IOpenerService);

package/vscode/src/vs/workbench/api/browser/mainThreadChat.js

@@ -2,10 +2,10 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
-import { IChatContributionService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContributionService';
-import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { IChatContributionService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContributionService.service';
+import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 let MainThreadChat = class MainThreadChat extends Disposable {

package/vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js

@@ -6,14 +6,15 @@ import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { getWordAtText } from 'vscode/vscode/vs/editor/common/core/wordHelper';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
 import { AddDynamicVariableAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { IChatAgentService, ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { ChatRequestAgentPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
-import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
+import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {

package/vscode/src/vs/workbench/api/browser/mainThreadChatVariables.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
-import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 let MainThreadChatVariables = class MainThreadChatVariables {

package/vscode/src/vs/workbench/api/browser/mainThreadClipboard.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 
 let MainThreadClipboard = class MainThreadClipboard {
     constructor(_context, _clipboardService) {

package/vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js

@@ -5,8 +5,8 @@ import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { reviveWebviewContentOptions } from './mainThreadWebviews.js';
-import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { IWebviewService } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 class EditorWebviewZone {

package/vscode/src/vs/workbench/api/browser/mainThreadCommands.js

@@ -1,11 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { revive } from 'vscode/vscode/vs/base/common/marshalling';
-import { ICommandService, CommandsRegistry } 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 { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { SerializableObjectWithBuffers } from 'vscode/vscode/vs/workbench/services/extensions/common/proxyIdentifier';
-import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { isString } from 'vscode/vscode/vs/base/common/types';
 
 let MainThreadCommands = class MainThreadCommands {

package/vscode/src/vs/workbench/api/browser/mainThreadComments.js

@@ -5,18 +5,19 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService';
+import { ICommentService } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentService.service';
 import { CommentsPanel } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsView';
-import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { COMMENTS_VIEW_ID, COMMENTS_VIEW_TITLE, COMMENTS_VIEW_STORAGE_ID } from 'vscode/vscode/vs/workbench/contrib/comments/browser/commentsTreeViewer';
-import { IViewDescriptorService, Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 class MainThreadCommentThread {
     get input() {

package/vscode/src/vs/workbench/api/browser/mainThreadConfiguration.js

@@ -2,11 +2,11 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { getScopes, Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { MainContext, ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 
 let MainThreadConfiguration = class MainThreadConfiguration {
     constructor(extHostContext, _workspaceContextService, configurationService, _environmentService) {

package/vscode/src/vs/workbench/api/browser/mainThreadConsole.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
-import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 import { log } from '../../../base/common/console.js';
 import { logRemoteEntry, logRemoteEntryIfError } from '../../services/extensions/common/remoteConsoleUtil.js';
 import { parseExtensionDevOptions } from '../../services/extensions/common/extensionDevOptions.js';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 
 let MainThreadConsole = class MainThreadConsole {
     constructor(_extHostContext, _environmentService, _logService) {

package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js

@@ -11,30 +11,29 @@ import { isEqualOrParent, isEqual, toLocalResource } from 'vscode/vscode/vs/base
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { reviveWebviewExtension } from './mainThreadWebviews.js';
 import { ExtHostContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
-import { ICustomEditorService } from 'vscode/vscode/vs/workbench/contrib/customEditor/common/customEditor';
+import { ICustomEditorService } from 'vscode/vscode/vs/workbench/contrib/customEditor/common/customEditor.service';
 import { CustomTextEditorModel } from '../../contrib/customEditor/common/customTextEditorModel.js';
 import { ExtensionKeyedWebviewOriginStore } from 'vscode/vscode/vs/workbench/contrib/webview/browser/webview';
-import { IWebviewWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService';
+import { IWebviewWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';
 import { editorGroupToColumn } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupColumn';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+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 { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { ResourceWorkingCopy } from 'vscode/vscode/vs/workbench/services/workingCopy/common/resourceWorkingCopy';
 import { NO_TYPE_ID } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopy';
-import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService';
-import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
+import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 
 var MainThreadCustomEditorModel_1;
 let MainThreadCustomEditors = class MainThreadCustomEditors extends Disposable {