@codingame/monaco-vscode-extensions-service-override 5.2.0 → 6.0.0

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

@@ -11,7 +11,7 @@ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.serv
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IRequestService } from 'vscode/vscode/vs/platform/request/common/request.service';
 import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
-import { isUntitledWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { WorkbenchState, isUntitledWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { checkGlobFileExists } from 'vscode/vscode/vs/workbench/services/extensions/common/workspaceContains';
@@ -21,7 +21,7 @@ import { ISearchService } from 'vscode/vscode/vs/workbench/services/search/commo
 import { IWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceEditing.service';
 import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { IEditSessionIdentityService } from 'vscode/vscode/vs/platform/workspace/common/editSessions.service';
-import { SideBySideEditor, EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
+import { SideBySideEditor, SaveReason, EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
 import { firstOrDefault, coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { ICanonicalUriService } from 'vscode/vscode/vs/platform/workspace/common/canonicalUri.service';
 
@@ -126,7 +126,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         this._proxy.$acceptWorkspaceData(this.getWorkspaceData(this._contextService.getWorkspace()));
     }
     getWorkspaceData(workspace) {
-        if (this._contextService.getWorkbenchState() === 1 ) {
+        if (this._contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
             return null;
         }
         return {
@@ -181,7 +181,7 @@ let MainThreadWorkspace = class MainThreadWorkspace {
         const uri = URI.revive(uriComponents);
         const editors = [...this._editorService.findEditors(uri, { supportSideBySide: SideBySideEditor.PRIMARY })];
         const result = await this._editorService.save(editors, {
-            reason: 1 ,
+            reason: SaveReason.EXPLICIT,
             saveAs: options.saveAs,
             force: !options.saveAs
         });

package/vscode/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.js

@@ -3,6 +3,7 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { TextFileEditorModelState } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 
 var CustomTextEditorModel_1;
@@ -57,7 +58,7 @@ let CustomTextEditorModel = CustomTextEditorModel_1 = class CustomTextEditorMode
         return this.textFileService.isDirty(this.resource);
     }
     isOrphaned() {
-        return !!this._textFileModel?.hasState(4 );
+        return !!this._textFileModel?.hasState(TextFileEditorModelState.ORPHAN);
     }
     async revert(options) {
         return this.textFileService.revert(this.resource, options);

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { updateContributedOpeners } from 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
@@ -14,7 +15,7 @@ let ContributedExternalUriOpenersStore = class ContributedExternalUriOpenersStor
         this._extensionService = _extensionService;
         this._openers = ( new Map());
         this._memento = ( new Memento(ContributedExternalUriOpenersStore_1.STORAGE_ID, storageService));
-        this._mementoObject = this._memento.getMemento(0 , 1 );
+        this._mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
         for (const [id, value] of Object.entries(this._mementoObject || {})) {
             this.add(id, value.extensionId, { isCurrentlyRegistered: false });
         }

package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js

@@ -1,8 +1,10 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { IExtensionManagementService, IGlobalExtensionEnablementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { isResolverExtension } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import { isResolverExtension, ExtensionType } from 'vscode/vscode/vs/platform/extensions/common/extensions';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
@@ -10,12 +12,12 @@ import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/acti
 import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
-import { IWorkbenchIssueService } from 'vscode/vscode/vs/workbench/services/issue/common/issue.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
@@ -54,7 +56,7 @@ let ExtensionBisectService = class ExtensionBisectService {
         this._storageService = _storageService;
         this._envService = _envService;
         this._disabled = ( (new Map()));
-        const raw = _storageService.get(ExtensionBisectService_1._storageKey, -1 );
+        const raw = _storageService.get(ExtensionBisectService_1._storageKey, StorageScope.APPLICATION);
         this._state = BisectState.fromJSON(raw);
         if (this._state) {
             const { mid, high } = this._state;
@@ -93,7 +95,7 @@ let ExtensionBisectService = class ExtensionBisectService {
         }
         const extensionIds = ( (extensions.map(ext => ext.identifier.id)));
         const newState = ( (new BisectState(extensionIds, 0, extensionIds.length, 0)));
-        this._storageService.store(ExtensionBisectService_1._storageKey, JSON.stringify(newState), -1 , 1 );
+        this._storageService.store(ExtensionBisectService_1._storageKey, JSON.stringify(newState), StorageScope.APPLICATION, StorageTarget.MACHINE);
         await this._storageService.flush();
     }
     async next(seeingBad) {
@@ -112,12 +114,12 @@ let ExtensionBisectService = class ExtensionBisectService {
             seeingBad ? this._state.low : this._state.mid,
             seeingBad ? this._state.mid : this._state.high
         )));
-        this._storageService.store(ExtensionBisectService_1._storageKey, JSON.stringify(nextState), -1 , 1 );
+        this._storageService.store(ExtensionBisectService_1._storageKey, JSON.stringify(nextState), StorageScope.APPLICATION, StorageTarget.MACHINE);
         await this._storageService.flush();
         return undefined;
     }
     async reset() {
-        this._storageService.remove(ExtensionBisectService_1._storageKey, -1 );
+        this._storageService.remove(ExtensionBisectService_1._storageKey, StorageScope.APPLICATION);
         await this._storageService.flush();
     }
 };
@@ -172,7 +174,7 @@ ExtensionBisectUi = ExtensionBisectUi_1 = ( (__decorate([
     ( (__param(2, INotificationService))),
     ( (__param(3, ICommandService)))
 ], ExtensionBisectUi)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(ExtensionBisectUi, 3 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(ExtensionBisectUi, LifecyclePhase.Restored);
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -195,7 +197,7 @@ registerAction2(class extends Action2 {
         const extensionManagement = accessor.get(IExtensionManagementService);
         const extensionEnablementService = accessor.get(IWorkbenchExtensionEnablementService);
         const extensionsBisect = accessor.get(IExtensionBisectService);
-        const extensions = (await extensionManagement.getInstalled(1 )).filter(ext => extensionEnablementService.isEnabled(ext));
+        const extensions = (await extensionManagement.getInstalled(ExtensionType.User)).filter(ext => extensionEnablementService.isEnabled(ext));
         const res = await dialogService.confirm({
             message: ( localizeWithPath(_moduleId, 5, "Extension Bisect")),
             detail: ( localizeWithPath(
@@ -228,7 +230,7 @@ registerAction2(class extends Action2 {
         const bisectService = accessor.get(IExtensionBisectService);
         const productService = accessor.get(IProductService);
         const extensionEnablementService = accessor.get(IGlobalExtensionEnablementService);
-        const issueService = accessor.get(IWorkbenchIssueService);
+        const commandService = accessor.get(ICommandService);
         if (!bisectService.isActive) {
             return;
         }
@@ -275,7 +277,7 @@ registerAction2(class extends Action2 {
                 await extensionEnablementService.disableExtension({ id: done.id }, undefined);
             }
             if (res.confirmed) {
-                await issueService.openReporter({ extensionId: done.id });
+                await commandService.executeCommand('workbench.action.openIssueReporter', done.id);
             }
         }
         await bisectService.reset();

package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js

@@ -3,12 +3,15 @@ import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { ExtensionType } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { getLogs } from 'vscode/vscode/vs/platform/log/browser/log';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { PersistentConnectionEventType } from 'vscode/vscode/vs/platform/remote/common/remoteAgentConnection';
 import { RemoteAuthorityResolverError } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
 import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner.service';
@@ -20,13 +23,14 @@ import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementServ
 import { WebWorkerExtensionHost } from './webWorkerExtensionHost.js';
 import { FetchFileSystemProvider } from './webWorkerFileSystemProvider.js';
 import { AbstractExtensionService, ResolvedExtensions, checkEnabledAndProposedAPI } from '../common/abstractExtensionService.js';
-import { extensionRunningPreferenceToString, extensionHostKindToString } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
+import { ExtensionHostKind, extensionRunningPreferenceToString, extensionHostKindToString, ExtensionRunningPreference } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
 import { filterExtensionDescriptions } from '../common/extensionRunningLocationTracker.js';
-import { toExtensionDescription, ExtensionHostExtensions } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { toExtensionDescription, ExtensionHostStartup, ExtensionHostExtensions } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import '../common/extensionsProposedApi.js';
 import { dedupExtensions } from '../common/extensionsUtil.js';
 import { RemoteExtensionHost } from '../common/remoteExtensionHost.js';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService.service';
@@ -43,7 +47,7 @@ let ExtensionService = class ExtensionService extends AbstractExtensionService {
         this._userDataProfileService = _userDataProfileService;
         this._workspaceTrustManagementService = _workspaceTrustManagementService;
         this._remoteExplorerService = _remoteExplorerService;
-        lifecycleService.when(2 ).then(async () => {
+        lifecycleService.when(LifecyclePhase.Ready).then(async () => {
             await this._userDataInitializationService.initializeInstalledExtensions(this._instantiationService);
             this._initialize();
         });
@@ -51,7 +55,7 @@ let ExtensionService = class ExtensionService extends AbstractExtensionService {
     }
     async _scanSingleExtension(extension) {
         if (extension.location.scheme === Schemas.vscodeRemote) {
-            return this._remoteExtensionsScannerService.scanSingleExtension(extension.location, extension.type === 0 );
+            return this._remoteExtensionsScannerService.scanSingleExtension(extension.location, extension.type === ExtensionType.System);
         }
         const scannedExtension = await this._webExtensionsScannerService.scanExistingExtension(extension.location, extension.type, this._userDataProfileService.currentProfile.extensionsResource);
         if (scannedExtension) {
@@ -76,7 +80,7 @@ let ExtensionService = class ExtensionService extends AbstractExtensionService {
         catch (error) {
             this._logService.error(error);
         }
-        return dedupExtensions(system, user, development, this._logService);
+        return dedupExtensions(system, user, [], development, this._logService);
     }
     async _resolveExtensionsDefault() {
         const [localExtensions, remoteExtensions] = await Promise.all([
@@ -112,7 +116,7 @@ let ExtensionService = class ExtensionService extends AbstractExtensionService {
         const connection = this._remoteAgentService.getConnection();
         if (connection) {
             connection.onDidStateChange(async (e) => {
-                if (e.type === 0 ) {
+                if (e.type === PersistentConnectionEventType.ConnectionLost) {
                     this._remoteAuthorityResolverService._clearResolvedAuthority(remoteAuthority);
                 }
             });
@@ -128,7 +132,7 @@ let ExtensionService = class ExtensionService extends AbstractExtensionService {
         }
     }
     async _resolveAuthority(remoteAuthority) {
-        return this._resolveAuthorityOnExtensionHosts(2 , remoteAuthority);
+        return this._resolveAuthorityOnExtensionHosts(ExtensionHostKind.LocalWebWorker, remoteAuthority);
     }
 };
 ExtensionService = ( __decorate([
@@ -168,14 +172,16 @@ let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
     }
     createExtensionHost(runningLocations, runningLocation, isInitialStart) {
         switch (runningLocation.kind) {
-            case 1 : {
+            case ExtensionHostKind.LocalProcess: {
                 return null;
             }
-            case 2 : {
-                const startup = ((isInitialStart ? 2  : 1) );
+            case ExtensionHostKind.LocalWebWorker: {
+                const startup = (isInitialStart
+                    ? ExtensionHostStartup.EagerManualStart
+                    : ExtensionHostStartup.EagerAutoStart);
                 return this._instantiationService.createInstance(WebWorkerExtensionHost, runningLocation, startup, this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart));
             }
-            case 3 : {
+            case ExtensionHostKind.Remote: {
                 const remoteAgentConnection = this._remoteAgentService.getConnection();
                 if (remoteAgentConnection) {
                     return this._instantiationService.createInstance(RemoteExtensionHost, runningLocation, this._createRemoteExtensionHostDataProvider(runningLocations, remoteAgentConnection.remoteAuthority));
@@ -212,7 +218,7 @@ let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
                 if (!remoteEnv) {
                     throw ( new Error('Cannot provide init data for remote extension host!'));
                 }
-                const myExtensions = runningLocations.filterByExtensionHostKind(snapshot.extensions, 3 );
+                const myExtensions = runningLocations.filterByExtensionHostKind(snapshot.extensions, ExtensionHostKind.Remote);
                 const extensions = ( new ExtensionHostExtensions(snapshot.versionId, snapshot.extensions, ( myExtensions.map(extension => extension.identifier))));
                 return {
                     connectionData: this._remoteAuthorityResolverService.getConnectionData(remoteAuthority),
@@ -248,32 +254,32 @@ let BrowserExtensionHostKindPicker = BrowserExtensionHostKindPicker_1 = class Br
         let canRunRemotely = false;
         for (const extensionKind of extensionKinds) {
             if (extensionKind === 'ui' && isInstalledRemotely) {
-                if (preference === 2 ) {
-                    return 3 ;
+                if (preference === ExtensionRunningPreference.Remote) {
+                    return ExtensionHostKind.Remote;
                 }
                 else {
                     canRunRemotely = true;
                 }
             }
             if (extensionKind === 'workspace' && isInstalledRemotely) {
-                if (preference === 0  || preference === 2 ) {
-                    return 3 ;
+                if (preference === ExtensionRunningPreference.None || preference === ExtensionRunningPreference.Remote) {
+                    return ExtensionHostKind.Remote;
                 }
                 else {
-                    result.push(3 );
+                    result.push(ExtensionHostKind.Remote);
                 }
             }
             if (extensionKind === 'web' && (isInstalledLocally || isInstalledRemotely)) {
-                if (preference === 0  || preference === 1 ) {
-                    return 2 ;
+                if (preference === ExtensionRunningPreference.None || preference === ExtensionRunningPreference.Local) {
+                    return ExtensionHostKind.LocalWebWorker;
                 }
                 else {
-                    result.push(2 );
+                    result.push(ExtensionHostKind.LocalWebWorker);
                 }
             }
         }
         if (canRunRemotely) {
-            result.push(3 );
+            result.push(ExtensionHostKind.Remote);
         }
         return (result.length > 0 ? result[0] : null);
     }

package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js

@@ -16,13 +16,16 @@ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.serv
 import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
 import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { isLoggingOnly } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
 import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
-import { isMessageOfType, createMessageOfType, UIKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostProtocol';
+import { ExtensionHostExitCode, isMessageOfType, MessageType, createMessageOfType, UIKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostProtocol';
+import { ExtensionHostStartup } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 
 let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
     constructor(runningLocation, startup, _initDataProvider, _telemetryService, _contextService, _labelService, _logService, _loggerService, _environmentService, _userDataProfilesService, _productService, _layoutService, _storageService) {
@@ -64,10 +67,10 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
             const quality = this._productService.quality;
             if (webEndpointUrlTemplate && commit && quality) {
                 const key = 'webWorkerExtensionHostIframeStableOriginUUID';
-                let stableOriginUUID = this._storageService.get(key, 1 );
+                let stableOriginUUID = this._storageService.get(key, StorageScope.WORKSPACE);
                 if (typeof stableOriginUUID === 'undefined') {
                     stableOriginUUID = generateUuid();
-                    this._storageService.store(key, stableOriginUUID, 1 , 1 );
+                    this._storageService.store(key, stableOriginUUID, StorageScope.WORKSPACE, StorageTarget.MACHINE);
                 }
                 const hash = await parentOriginHash(mainWindow.origin, stableOriginUUID);
                 const baseUrl = (webEndpointUrlTemplate
@@ -111,7 +114,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
             barrierHasError = true;
             onUnexpectedError(barrierError);
             clearTimeout(startTimeout);
-            this._onDidExit.fire([81 , barrierError.message]);
+            this._onDidExit.fire([ExtensionHostExitCode.UnexpectedError, barrierError.message]);
             barrier.open();
         };
         const resolveBarrier = (messagePort) => {
@@ -135,13 +138,13 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
                 err.message = message;
                 err.name = name;
                 err.stack = stack;
-                return rejectBarrier(81 , err);
+                return rejectBarrier(ExtensionHostExitCode.UnexpectedError, err);
             }
             const { data } = event.data;
             if (barrier.isOpen() || !(data instanceof MessagePort)) {
                 console.warn('UNEXPECTED message', event);
                 const err = ( new Error('UNEXPECTED message'));
-                return rejectBarrier(81 , err);
+                return rejectBarrier(ExtensionHostExitCode.UnexpectedError, err);
             }
             resolveBarrier(data);
         }));
@@ -172,7 +175,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
         return this._performHandshake(protocol);
     }
     async _performHandshake(protocol) {
-        await Event.toPromise(Event.filter(protocol.onMessage, msg => isMessageOfType(msg, 1 )));
+        await Event.toPromise(Event.filter(protocol.onMessage, msg => isMessageOfType(msg, MessageType.Ready)));
         if (this._isTerminating) {
             throw canceled();
         }
@@ -180,7 +183,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
         if (this._isTerminating) {
             throw canceled();
         }
-        await Event.toPromise(Event.filter(protocol.onMessage, msg => isMessageOfType(msg, 0 )));
+        await Event.toPromise(Event.filter(protocol.onMessage, msg => isMessageOfType(msg, MessageType.Initialized)));
         if (this._isTerminating) {
             throw canceled();
         }
@@ -191,7 +194,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
             return;
         }
         this._isTerminating = true;
-        this._protocol?.send(createMessageOfType(2 ));
+        this._protocol?.send(createMessageOfType(MessageType.Terminate));
         super.dispose();
     }
     getInspectPort() {
@@ -228,7 +231,7 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
                 workspaceStorageHome: this._environmentService.workspaceStorageHome,
                 extensionLogLevel: this._environmentService.extensionLogLevel
             },
-            workspace: this._contextService.getWorkbenchState() === 1  ? undefined : {
+            workspace: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? undefined : {
                 configuration: workspace.configuration || undefined,
                 id: workspace.id,
                 name: this._labelService.getWorkspaceLabel(workspace),
@@ -244,13 +247,14 @@ let WebWorkerExtensionHost = class WebWorkerExtensionHost extends Disposable {
                 sessionId: this._telemetryService.sessionId,
                 machineId: this._telemetryService.machineId,
                 sqmId: this._telemetryService.sqmId,
+                devDeviceId: this._telemetryService.devDeviceId,
                 firstSessionDate: this._telemetryService.firstSessionDate,
                 msftInternal: this._telemetryService.msftInternal
             },
             logLevel: this._logService.getLevel(),
             loggers: [...this._loggerService.getRegisteredLoggers()],
             logsLocation: this._extensionHostLogsLocation,
-            autoStart: ((this.startup === 1) ),
+            autoStart: (this.startup === ExtensionHostStartup.EagerAutoStart),
             remote: {
                 authority: this._environmentService.remoteAuthority,
                 connectionData: null,

package/vscode/src/vs/workbench/services/extensions/browser/webWorkerFileSystemProvider.js

@@ -1,11 +1,11 @@
-import { createFileSystemProviderError, FileSystemProviderErrorCode, FileType } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileSystemProviderCapabilities, createFileSystemProviderError, FileSystemProviderErrorCode, FileType } from 'vscode/vscode/vs/platform/files/common/files';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { NotSupportedError } from 'vscode/vscode/vs/base/common/errors';
 
 class FetchFileSystemProvider {
     constructor() {
-        this.capabilities = 2048  + 2  + 1024 ;
+        this.capabilities = FileSystemProviderCapabilities.Readonly + FileSystemProviderCapabilities.FileReadWrite + FileSystemProviderCapabilities.PathCaseSensitive;
         this.onDidChangeCapabilities = Event.None;
         this.onDidChangeFile = Event.None;
     }

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

@@ -13,6 +13,7 @@ import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { InstallOperation } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { ImplicitActivationEvents } from 'vscode/vscode/vs/platform/extensionManagement/common/implicitActivationEvents';
 import { ExtensionIdentifierMap, ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
@@ -34,13 +35,15 @@ import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagem
 import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { LockableExtensionDescriptionRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionDescriptionRegistry';
 import { parseExtensionDevOptions } from './extensionDevOptions.js';
+import { ExtensionRunningPreference, ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { ExtensionHostManager } from './extensionHostManager.js';
 import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
 import { RemoteRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionRunningLocation';
 import { ExtensionRunningLocationTracker, filterExtensionIdentifiers } from './extensionRunningLocationTracker.js';
-import { ExtensionPointContribution, ActivationTimes, toExtension } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { ExtensionHostStartup, ActivationKind, ExtensionPointContribution, ActivationTimes, toExtension } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry, ExtensionMessageCollector } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { LazyCreateExtensionHostManager } from './lazyCreateExtensionHostManager.js';
+import { ResponsiveState } from 'vscode/vscode/vs/workbench/services/extensions/common/rpcProtocol';
 import { checkGlobFileExists, checkActivateWorkspaceContainsExtension } from 'vscode/vscode/vs/workbench/services/extensions/common/workspaceContains';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
@@ -143,7 +146,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         this._register(this._extensionManagementService.onDidInstallExtensions((result) => {
             const extensions = [];
             for (const { local, operation } of result) {
-                if (local && local.isValid && operation !== 4  && this._safeInvokeIsEnabled(local)) {
+                if (local && local.isValid && operation !== InstallOperation.Migrate && this._safeInvokeIsEnabled(local)) {
                     extensions.push(local);
                 }
             }
@@ -289,7 +292,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         }
         const extensionKinds = this._runningLocations.readExtensionKinds(extension);
         const isRemote = extension.extensionLocation.scheme === Schemas.vscodeRemote;
-        const extensionHostKind = this._extensionHostKindPicker.pickExtensionHostKind(extension.identifier, extensionKinds, !isRemote, isRemote, 0 );
+        const extensionHostKind = this._extensionHostKindPicker.pickExtensionHostKind(extension.identifier, extensionKinds, !isRemote, isRemote, ExtensionRunningPreference.None);
         if (extensionHostKind === null) {
             return false;
         }
@@ -363,7 +366,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             this._processExtensions(lock, resolvedExtensions);
             const snapshot = this._registry.getSnapshot();
             for (const extHostManager of this._extensionHostManagers) {
-                if (extHostManager.startup !== 1 ) {
+                if (extHostManager.startup !== ExtensionHostStartup.EagerAutoStart) {
                     const extensions = this._runningLocations.filterByExtensionHostManager(snapshot.extensions, extHostManager);
                     extHostManager.start(snapshot.versionId, snapshot.extensions, ( (extensions.map(extension => extension.identifier))));
                 }
@@ -382,10 +385,10 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         let remoteExtensions = checkEnabledAndProposedAPI(this._logService, this._extensionEnablementService, this._extensionsProposedApi, resolvedExtensions.remote, false);
         this._runningLocations.initializeRunningLocation(localExtensions, remoteExtensions);
         this._startExtensionHostsIfNecessary(true, []);
-        const remoteExtensionsThatNeedToRunLocally = (allowRemoteExtensionsInLocalWebWorker ? this._runningLocations.filterByExtensionHostKind(remoteExtensions, 2 ) : []);
-        const localProcessExtensions = (hasLocalProcess ? this._runningLocations.filterByExtensionHostKind(localExtensions, 1 ) : []);
-        const localWebWorkerExtensions = this._runningLocations.filterByExtensionHostKind(localExtensions, 2 );
-        remoteExtensions = this._runningLocations.filterByExtensionHostKind(remoteExtensions, 3 );
+        const remoteExtensionsThatNeedToRunLocally = (allowRemoteExtensionsInLocalWebWorker ? this._runningLocations.filterByExtensionHostKind(remoteExtensions, ExtensionHostKind.LocalWebWorker) : []);
+        const localProcessExtensions = (hasLocalProcess ? this._runningLocations.filterByExtensionHostKind(localExtensions, ExtensionHostKind.LocalProcess) : []);
+        const localWebWorkerExtensions = this._runningLocations.filterByExtensionHostKind(localExtensions, ExtensionHostKind.LocalWebWorker);
+        remoteExtensions = this._runningLocations.filterByExtensionHostKind(remoteExtensions, ExtensionHostKind.Remote);
         for (const ext of remoteExtensionsThatNeedToRunLocally) {
             if (!includes(localWebWorkerExtensions, ext.identifier)) {
                 localWebWorkerExtensions.push(ext);
@@ -638,10 +641,10 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         const processManager = this._doCreateExtensionHostManager(extensionHost, initialActivationEvents);
         processManager.onDidExit(([code, signal]) => this._onExtensionHostCrashOrExit(processManager, code, signal));
         processManager.onDidChangeResponsiveState((responsiveState) => {
-            this._logService.info(`Extension host (${processManager.friendyName}) is ${responsiveState === 0  ? 'responsive' : 'unresponsive'}.`);
+            this._logService.info(`Extension host (${processManager.friendyName}) is ${responsiveState === ResponsiveState.Responsive ? 'responsive' : 'unresponsive'}.`);
             this._onDidChangeResponsiveChange.fire({
                 extensionHostKind: processManager.kind,
-                isResponsive: responsiveState === 0 ,
+                isResponsive: responsiveState === ResponsiveState.Responsive,
                 getInspectListener: (tryEnableInspector) => {
                     return processManager.getInspectPort(tryEnableInspector);
                 }
@@ -651,7 +654,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
     }
     _doCreateExtensionHostManager(extensionHost, initialActivationEvents) {
         const internalExtensionService = this._acquireInternalAPI(extensionHost);
-        if (extensionHost.startup === 3  && initialActivationEvents.length === 0) {
+        if (extensionHost.startup === ExtensionHostStartup.Lazy && initialActivationEvents.length === 0) {
             return this._instantiationService.createInstance(LazyCreateExtensionHostManager, extensionHost, internalExtensionService);
         }
         return this._instantiationService.createInstance(ExtensionHostManager, extensionHost, initialActivationEvents, internalExtensionService);
@@ -666,10 +669,10 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
     }
     _onExtensionHostCrashed(extensionHost, code, signal) {
         console.error(`Extension host (${extensionHost.friendyName}) terminated unexpectedly. Code: ${code}, Signal: ${signal}`);
-        if (extensionHost.kind === 1 ) {
+        if (extensionHost.kind === ExtensionHostKind.LocalProcess) {
             this._doStopExtensionHosts();
         }
-        else if (extensionHost.kind === 3 ) {
+        else if (extensionHost.kind === ExtensionHostKind.Remote) {
             if (signal) {
                 this._onRemoteExtensionHostCrashed(extensionHost, signal);
             }
@@ -750,14 +753,14 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         const lock = await this._registry.acquireLock('startExtensionHosts');
         try {
             this._startExtensionHostsIfNecessary(false, Array.from(( (this._allRequestedActivateEvents.keys()))));
-            const localProcessExtensionHosts = this._getExtensionHostManagers(1 );
+            const localProcessExtensionHosts = this._getExtensionHostManagers(ExtensionHostKind.LocalProcess);
             await Promise.all(( (localProcessExtensionHosts.map(extHost => extHost.ready()))));
         }
         finally {
             lock.dispose();
         }
     }
-    activateByEvent(activationEvent, activationKind = 0 ) {
+    activateByEvent(activationEvent, activationKind = ActivationKind.Normal) {
         if (this._installedExtensionsReady.isOpen()) {
             this._allRequestedActivateEvents.add(activationEvent);
             if (!this._registry.containsActivationEvent(activationEvent)) {
@@ -767,7 +770,7 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         }
         else {
             this._allRequestedActivateEvents.add(activationEvent);
-            if (activationKind === 1 ) {
+            if (activationKind === ActivationKind.Immediate) {
                 return this._activateByEvent(activationEvent, activationKind);
             }
             return this._installedExtensionsReady.wait().then(() => this._activateByEvent(activationEvent, activationKind));

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

@@ -16,7 +16,8 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { ExtHostCustomersRegistry } from './extHostCustomers.js';
 import { extensionHostKindToString } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
-import { RPCProtocol } from 'vscode/vscode/vs/workbench/services/extensions/common/rpcProtocol';
+import { ActivationKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { RPCProtocol, RequestInitiator } from 'vscode/vscode/vs/workbench/services/extensions/common/rpcProtocol';
 
 var ExtensionHostManager_1;
 const _moduleId = "vs/workbench/services/extensions/common/extensionHostManager";
@@ -85,7 +86,7 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
             return null;
         });
         this._proxy.then(() => {
-            initialActivationEvents.forEach((activationEvent) => this.activateByEvent(activationEvent, 0 ));
+            initialActivationEvents.forEach((activationEvent) => this.activateByEvent(activationEvent, ActivationKind.Normal));
             this._register(registerLatencyTestProvider({
                 measure: () => this.measure()
             }));
@@ -228,7 +229,7 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
         return proxy.activate(extension, reason);
     }
     activateByEvent(activationEvent, activationKind) {
-        if (activationKind === 1  && !this._hasStarted) {
+        if (activationKind === ActivationKind.Immediate && !this._hasStarted) {
             return Promise.resolve();
         }
         if (!( (this._cachedActivationEvents.has(activationEvent)))) {
@@ -434,7 +435,7 @@ let TelemetryRPCLogger = class TelemetryRPCLogger {
         this._pendingRequests = ( (new Map()));
     }
     logIncoming(msgLength, req, initiator, str) {
-        if (initiator === 0  && /^receiveReply(Err)?:/.test(str)) {
+        if (initiator === RequestInitiator.LocalSide && /^receiveReply(Err)?:/.test(str)) {
             const requestStr = this._pendingRequests.get(req) ?? 'unknown_reply';
             this._pendingRequests.delete(req);
             this._telemetryService.publicLog2('extensionhost.incoming', {
@@ -442,7 +443,7 @@ let TelemetryRPCLogger = class TelemetryRPCLogger {
                 length: msgLength
             });
         }
-        if (initiator === 1  && /^receiveRequest /.test(str)) {
+        if (initiator === RequestInitiator.OtherSide && /^receiveRequest /.test(str)) {
             this._telemetryService.publicLog2('extensionhost.incoming', {
                 type: `${str}`,
                 length: msgLength
@@ -450,7 +451,7 @@ let TelemetryRPCLogger = class TelemetryRPCLogger {
         }
     }
     logOutgoing(msgLength, req, initiator, str) {
-        if (initiator === 0  && str.startsWith('request: ')) {
+        if (initiator === RequestInitiator.LocalSide && str.startsWith('request: ')) {
             this._pendingRequests.set(req, str);
             this._telemetryService.publicLog2('extensionhost.outgoing', {
                 type: str,