@codingame/monaco-vscode-extensions-service-override 1.85.6 → 2.0.0-v2.1

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js

@@ -1,28 +1,28 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Barrier } from 'monaco-editor/esm/vs/base/common/async.js';
-import { toErrorMessage } from 'monaco-editor/esm/vs/base/common/errorMessage.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import * as performance from 'monaco-editor/esm/vs/base/common/performance.js';
-import { isCI } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { isEqualOrParent } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { Barrier } from 'vscode/vscode/vs/base/common/async';
+import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { mark } from 'vscode/vscode/vs/base/common/performance';
+import { isCI } from 'vscode/vscode/vs/base/common/platform';
+import { isEqualOrParent } from 'vscode/vscode/vs/base/common/resources';
+import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { ImplicitActivationEvents } from 'vscode/vscode/vs/platform/extensionManagement/common/implicitActivationEvents';
-import { ExtensionIdentifierMap, ExtensionIdentifier } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { ExtensionIdentifierMap, ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { handleVetos } from '../../../../platform/lifecycle/common/lifecycle.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { INotificationService, Severity } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError, getRemoteAuthorityPrefix, RemoteAuthorityResolverErrorCode } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
 import { LockableExtensionDescriptionRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionDescriptionRegistry';
@@ -225,7 +225,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         if (result.removedDueToLooping.length > 0) {
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( nls.localizeWithPath(
+                message: ( localizeWithPath(
                     'vs/workbench/services/extensions/common/abstractExtensionService',
                     'looping',
                     "The following extensions contain dependency loops and have been disabled: {0}",
@@ -338,7 +338,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         }
     }
     async _initialize() {
-        performance.mark('code/willLoadExtensions');
+        mark('code/willLoadExtensions');
         this._startExtensionHostsIfNecessary(true, []);
         const lock = await this._registry.acquireLock('_initialize');
         try {
@@ -356,7 +356,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             lock.dispose();
         }
         this._releaseBarrier();
-        performance.mark('code/didLoadExtensions');
+        mark('code/didLoadExtensions');
         await this._handleExtensionTests();
     }
     _processExtensions(lock, resolvedExtensions) {
@@ -379,7 +379,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         if (result.removedDueToLooping.length > 0) {
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( nls.localizeWithPath(
+                message: ( localizeWithPath(
                     'vs/workbench/services/extensions/common/abstractExtensionService',
                     'looping',
                     "The following extensions contain dependency loops and have been disabled: {0}",
@@ -395,7 +395,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         }
         const extensionHostManager = this.findTestExtensionHost(this._environmentService.extensionTestsLocationURI);
         if (!extensionHostManager) {
-            const msg = ( nls.localizeWithPath(
+            const msg = ( localizeWithPath(
                 'vs/workbench/services/extensions/common/abstractExtensionService',
                 'extensionTestError',
                 "No extension host found that can launch the test runner at {0}.",
@@ -485,14 +485,14 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         const sw = StopWatch.create(false);
         this._logService.info(`Invoking resolveAuthority(${authorityPrefix})...`);
         try {
-            performance.mark(`code/willResolveAuthority/${authorityPrefix}`);
+            mark(`code/willResolveAuthority/${authorityPrefix}`);
             const result = await this._resolveAuthority(remoteAuthority);
-            performance.mark(`code/didResolveAuthorityOK/${authorityPrefix}`);
+            mark(`code/didResolveAuthorityOK/${authorityPrefix}`);
             this._logService.info(`resolveAuthority(${authorityPrefix}) returned '${result.authority.connectTo}' after ${sw.elapsed()} ms`);
             return result;
         }
         catch (err) {
-            performance.mark(`code/didResolveAuthorityError/${authorityPrefix}`);
+            mark(`code/didResolveAuthorityError/${authorityPrefix}`);
             this._logService.error(`resolveAuthority(${authorityPrefix}) returned an error after ${sw.elapsed()} ms`, err);
             throw err;
         }
@@ -562,7 +562,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                             vetoReasons.add(reason);
                         }
                     }).catch(error => {
-                        vetoReasons.add(( nls.localizeWithPath(
+                        vetoReasons.add(( localizeWithPath(
                             'vs/workbench/services/extensions/common/abstractExtensionService',
                             'extensionStopVetoError',
                             "{0} (Error: {1})",
@@ -580,19 +580,19 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         else {
             const vetoReasonsArray = Array.from(vetoReasons);
             this._logService.warn(`Extension host was not stopped because of veto (stop reason: ${reason}, veto reason: ${vetoReasonsArray.join(', ')})`);
-            await this._dialogService.warn(( nls.localizeWithPath(
+            await this._dialogService.warn(( localizeWithPath(
                 'vs/workbench/services/extensions/common/abstractExtensionService',
                 'extensionStopVetoMessage',
                 "The following operation was blocked: {0}",
                 reason
             )), vetoReasonsArray.length === 1 ?
-                ( nls.localizeWithPath(
+                ( localizeWithPath(
                     'vs/workbench/services/extensions/common/abstractExtensionService',
                     'extensionStopVetoDetailsOne',
                     "The reason for blocking the operation: {0}",
                     vetoReasonsArray[0]
                 )) :
-                ( nls.localizeWithPath(
+                ( localizeWithPath(
                     'vs/workbench/services/extensions/common/abstractExtensionService',
                     'extensionStopVetoDetailsMany',
                     "The reasons for blocking the operation:\n- {0}",
@@ -693,7 +693,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._remoteCrashTracker.registerCrash();
             if (this._remoteCrashTracker.shouldAutomaticallyRestart()) {
                 this._logService.info(`Automatically restarting the remote extension host.`);
-                this._notificationService.status(( nls.localizeWithPath(
+                this._notificationService.status(( localizeWithPath(
                     'vs/workbench/services/extensions/common/abstractExtensionService',
                     'extensionService.autoRestart',
                     "The remote extension host terminated unexpectedly. Restarting..."
@@ -701,12 +701,12 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                 this._startExtensionHostsIfNecessary(false, Array.from(( this._allRequestedActivateEvents.keys())));
             }
             else {
-                this._notificationService.prompt(Severity.Error, ( nls.localizeWithPath(
+                this._notificationService.prompt(Severity.Error, ( localizeWithPath(
                     'vs/workbench/services/extensions/common/abstractExtensionService',
                     'extensionService.crash',
                     "Remote Extension host terminated unexpectedly 3 times within the last 5 minutes."
                 )), [{
-                        label: ( nls.localizeWithPath(
+                        label: ( localizeWithPath(
                             'vs/workbench/services/extensions/common/abstractExtensionService',
                             'restart',
                             "Restart Remote Extension Host"
@@ -858,15 +858,15 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         const messageHandler = (msg) => this._handleExtensionPointMessage(msg);
         const availableExtensions = this._registry.getAllExtensionDescriptions();
         const extensionPoints = ExtensionsRegistry.getExtensionPoints();
-        performance.mark('code/willHandleExtensionPoints');
+        mark('code/willHandleExtensionPoints');
         for (const extensionPoint of extensionPoints) {
             if (affectedExtensionPoints[extensionPoint.name]) {
-                performance.mark(`code/willHandleExtensionPoint/${extensionPoint.name}`);
+                mark(`code/willHandleExtensionPoint/${extensionPoint.name}`);
                 AbstractExtensionService_1._handleExtensionPoint(extensionPoint, availableExtensions, messageHandler);
-                performance.mark(`code/didHandleExtensionPoint/${extensionPoint.name}`);
+                mark(`code/didHandleExtensionPoint/${extensionPoint.name}`);
             }
         }
-        performance.mark('code/didHandleExtensionPoints');
+        mark('code/didHandleExtensionPoints');
     }
     _getOrCreateExtensionStatus(extensionId) {
         if (!( this._extensionStatus.has(extensionId))) {

package/vscode/src/vs/workbench/services/extensions/common/extensionDevOptions.js

@@ -1,4 +1,4 @@
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 
 function parseExtensionDevOptions(environmentService) {
     const isExtensionDevHost = environmentService.isExtensionDevelopment;

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js

@@ -1,17 +1,17 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { IntervalTimer } from 'monaco-editor/esm/vs/base/common/async.js';
-import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import * as errors from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
-import { registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { IntervalTimer } from 'vscode/vscode/vs/base/common/async';
+import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
+import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
+import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { RemoteAuthorityResolverErrorCode, getRemoteAuthorityPrefix } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { ExtHostCustomersRegistry } from './extHostCustomers.js';
@@ -103,7 +103,7 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
                 customer.dispose();
             }
             catch (err) {
-                errors.onUnexpectedError(err);
+                onUnexpectedError(err);
             }
         }
         this._proxy = null;
@@ -197,7 +197,7 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
             catch (err) {
                 this._logService.error(`Cannot instantiate named customer: '${id.sid}'`);
                 this._logService.error(err);
-                errors.onUnexpectedError(err);
+                onUnexpectedError(err);
             }
         }
         const customers = ExtHostCustomersRegistry.getCustomers();
@@ -208,7 +208,7 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
             }
             catch (err) {
                 this._logService.error(err);
-                errors.onUnexpectedError(err);
+                onUnexpectedError(err);
             }
         }
         if (!extensionHostProxy) {
@@ -476,7 +476,7 @@ registerAction2(class MeasureExtHostLatencyAction extends Action2 {
         super({
             id: 'editor.action.measureExtHostLatency',
             title: {
-                value: ( nls.localizeWithPath(
+                value: ( localizeWithPath(
                     'vs/workbench/services/extensions/common/extensionHostManager',
                     'measureExtHostLatency',
                     "Measure Extension Host Latency"

package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { ExtensionIdentifierMap } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { determineExtensionHostKinds } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';

package/vscode/src/vs/workbench/services/extensions/common/extensionStorageMigration.js

@@ -1,12 +1,12 @@
-import { getErrorMessage } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
+import { getErrorMessage } from 'vscode/vscode/vs/base/common/errors';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
 import { IExtensionStorageService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionStorage';
-import { IFileService, FileSystemProviderErrorCode } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
-import { IUserDataProfilesService } from 'monaco-editor/esm/vs/platform/userDataProfile/common/userDataProfile.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { IFileService, FileSystemProviderErrorCode } from 'vscode/vscode/vs/platform/files/common/files';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 
 async function migrateExtensionStorage(fromExtensionId, toExtensionId, global, instantionService) {
     return instantionService.invokeFunction(async (serviceAccessor) => {

package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { isNonEmptyArray } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { ExtensionIdentifier } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
+import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { allApiProposals } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsApiProposals';
 

package/vscode/src/vs/workbench/services/extensions/common/extensionsUtil.js

@@ -1,5 +1,5 @@
-import { ExtensionIdentifierMap } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { gte } from 'vscode-semver';
 
 function dedupExtensions(system, user, development, logService) {

package/vscode/src/vs/workbench/services/extensions/common/lazyCreateExtensionHostManager.js

@@ -1,9 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Barrier } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { Barrier } from 'vscode/vscode/vs/base/common/async';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { RemoteAuthorityResolverErrorCode } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { friendlyExtHostName, ExtensionHostManager } from './extensionHostManager.js';
 import { ExtensionHostExtensions } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';

package/vscode/src/vs/workbench/services/extensions/common/remoteExtensionHost.js

@@ -1,20 +1,20 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
+import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { language, isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { IExtensionHostDebugService } from 'vscode/vscode/vs/platform/debug/common/extensionHostDebug';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { ILogService, ILoggerService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { connectRemoteAgentExtensionHost } from 'vscode/vscode/vs/platform/remote/common/remoteAgentConnection';
 import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService';
 import { ISignService } from 'vscode/vscode/vs/platform/sign/common/sign';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { isLoggingOnly } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { parseExtensionDevOptions } from './extensionDevOptions.js';
 import { isMessageOfType, UIKind, createMessageOfType } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostProtocol';
@@ -64,7 +64,7 @@ let RemoteExtensionHost = class RemoteExtensionHost extends Disposable {
         };
         return this.remoteAuthorityResolverService.resolveAuthority(this._initDataProvider.remoteAuthority).then((resolverResult) => {
             const startParams = {
-                language: platform.language,
+                language: language,
                 debugId: this._environmentService.debugExtensionHost.debugId,
                 break: this._environmentService.debugExtensionHost.break,
                 port: this._environmentService.debugExtensionHost.port,
@@ -149,7 +149,7 @@ let RemoteExtensionHost = class RemoteExtensionHost extends Disposable {
                 appUriScheme: this._productService.urlProtocol,
                 extensionTelemetryLogResource: this._environmentService.extHostTelemetryLogFile,
                 isExtensionTelemetryLoggingOnly: isLoggingOnly(this._productService, this._environmentService),
-                appLanguage: platform.language,
+                appLanguage: language,
                 extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
                 extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
                 globalStorageHome: remoteInitData.globalStorageHome,
@@ -183,7 +183,7 @@ let RemoteExtensionHost = class RemoteExtensionHost extends Disposable {
             loggers: [...this._loggerService.getRegisteredLoggers()],
             logsLocation: remoteInitData.extensionHostLogsPath,
             autoStart: ((this.startup === 1) ),
-            uiKind: platform.isWeb ? UIKind.Web : UIKind.Desktop
+            uiKind: isWeb ? UIKind.Web : UIKind.Desktop
         };
     }
     getInspectPort() {