@codingame/monaco-vscode-extension-gallery-service-override 1.85.1 → 1.85.3

package/extensionGallery.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from './external/tslib/tslib.es6.js';
 import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
 import { IExtensionGalleryService, IGlobalExtensionEnablementService, IExtensionManagementService, IExtensionTipsService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionGalleryService } from './vscode/src/vs/platform/extensionManagement/common/extensionGalleryService.js';
-import { GlobalExtensionEnablementService } from './vscode/src/vs/platform/extensionManagement/common/extensionEnablementService.js';
+import { GlobalExtensionEnablementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionEnablementService';
 import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { ExtensionsWorkbenchService } from './vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.js';
 import { IExtensionManagementServerService, IWebExtensionsScannerService, IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
@@ -17,8 +17,6 @@ import { IBuiltinExtensionsScannerService } from 'monaco-editor/esm/vs/platform/
 import { BuiltinExtensionsScannerService } from './vscode/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.js';
 import { ExtensionIgnoredRecommendationsService } from './vscode/src/vs/workbench/services/extensionRecommendations/common/extensionIgnoredRecommendationsService.js';
 import { IWorkspaceExtensionsConfigService, WorkspaceExtensionsConfigService } from 'vscode/vscode/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig';
-import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
-import { RemoteExtensionsScannerService } from './vscode/src/vs/workbench/services/remote/common/remoteExtensionsScanner.js';
 import { ExtensionRecommendationNotificationService } from './vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.js';
 import { ExtensionTipsService } from './vscode/src/vs/platform/extensionManagement/common/extensionTipsService.js';
 import { ExtensionManagementService } from './vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.js';
@@ -67,7 +65,6 @@ function getServiceOverride(options = { webOnly: false }) {
         [( IExtensionManagementService.toString())]: new SyncDescriptor(ExtensionManagementService, [], true),
         [( IBuiltinExtensionsScannerService.toString())]: new SyncDescriptor(BuiltinExtensionsScannerService, [], true),
         [( IWorkspaceExtensionsConfigService.toString())]: new SyncDescriptor(WorkspaceExtensionsConfigService, [], true),
-        [( IRemoteExtensionsScannerService.toString())]: new SyncDescriptor(RemoteExtensionsScannerService, [], true),
         [( IExtensionTipsService.toString())]: new SyncDescriptor(ExtensionTipsService, [], true),
         [( IRemoteUserDataProfilesService.toString())]: new SyncDescriptor(RemoteUserDataProfilesService, [], true),
         [( IWorkbenchExtensionEnablementService.toString())]: new SyncDescriptor(ExtensionEnablementService, [], true),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "1.85.1",
+  "version": "1.85.3",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.3",
     "monaco-editor": "0.45.0",
     "vscode-semver": "npm:semver@=5.5.0"
   }

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

@@ -10,7 +10,7 @@ import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/st
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 import { isLanguagePackExtension, isAuthenticationProviderExtension, isResolverExtension } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { StorageManager } from '../../../../platform/extensionManagement/common/extensionEnablementService.js';
+import { StorageManager } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionEnablementService';
 import { webWorkerExtHostConfig } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IUserDataSyncAccountService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSyncAccount';
 import { IUserDataSyncEnablementService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';

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

@@ -1,142 +0,0 @@
-import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { isUndefinedOrNull } from 'monaco-editor/esm/vs/base/common/types.js';
-import { DISABLED_EXTENSIONS_STORAGE_PATH, IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-
-let GlobalExtensionEnablementService = class GlobalExtensionEnablementService extends Disposable {
-    constructor(storageService, extensionManagementService) {
-        super();
-        this._onDidChangeEnablement = ( new Emitter());
-        this.onDidChangeEnablement = this._onDidChangeEnablement.event;
-        this.storageManger = this._register(( new StorageManager(storageService)));
-        this._register(this.storageManger.onDidChange(extensions => this._onDidChangeEnablement.fire({ extensions, source: 'storage' })));
-        this._register(extensionManagementService.onDidInstallExtensions(e => e.forEach(({ local, operation }) => {
-            if (local && operation === 4 ) {
-                this._removeFromDisabledExtensions(local.identifier);
-            }
-        })));
-    }
-    async enableExtension(extension, source) {
-        if (this._removeFromDisabledExtensions(extension)) {
-            this._onDidChangeEnablement.fire({ extensions: [extension], source });
-            return true;
-        }
-        return false;
-    }
-    async disableExtension(extension, source) {
-        if (this._addToDisabledExtensions(extension)) {
-            this._onDidChangeEnablement.fire({ extensions: [extension], source });
-            return true;
-        }
-        return false;
-    }
-    getDisabledExtensions() {
-        return this._getExtensions(DISABLED_EXTENSIONS_STORAGE_PATH);
-    }
-    async getDisabledExtensionsAsync() {
-        return this.getDisabledExtensions();
-    }
-    _addToDisabledExtensions(identifier) {
-        const disabledExtensions = this.getDisabledExtensions();
-        if (disabledExtensions.every(e => !areSameExtensions(e, identifier))) {
-            disabledExtensions.push(identifier);
-            this._setDisabledExtensions(disabledExtensions);
-            return true;
-        }
-        return false;
-    }
-    _removeFromDisabledExtensions(identifier) {
-        const disabledExtensions = this.getDisabledExtensions();
-        for (let index = 0; index < disabledExtensions.length; index++) {
-            const disabledExtension = disabledExtensions[index];
-            if (areSameExtensions(disabledExtension, identifier)) {
-                disabledExtensions.splice(index, 1);
-                this._setDisabledExtensions(disabledExtensions);
-                return true;
-            }
-        }
-        return false;
-    }
-    _setDisabledExtensions(disabledExtensions) {
-        this._setExtensions(DISABLED_EXTENSIONS_STORAGE_PATH, disabledExtensions);
-    }
-    _getExtensions(storageId) {
-        return this.storageManger.get(storageId, 0 );
-    }
-    _setExtensions(storageId, extensions) {
-        this.storageManger.set(storageId, extensions, 0 );
-    }
-};
-GlobalExtensionEnablementService = ( __decorate([
-    ( __param(0, IStorageService)),
-    ( __param(1, IExtensionManagementService))
-], GlobalExtensionEnablementService));
-class StorageManager extends Disposable {
-    constructor(storageService) {
-        super();
-        this.storageService = storageService;
-        this.storage = Object.create(null);
-        this._onDidChange = this._register(( new Emitter()));
-        this.onDidChange = this._onDidChange.event;
-        this._register(storageService.onDidChangeValue(0 , undefined, this._register(( new DisposableStore())))(e => this.onDidStorageChange(e)));
-    }
-    get(key, scope) {
-        let value;
-        if (scope === 0 ) {
-            if (isUndefinedOrNull(this.storage[key])) {
-                this.storage[key] = this._get(key, scope);
-            }
-            value = this.storage[key];
-        }
-        else {
-            value = this._get(key, scope);
-        }
-        return JSON.parse(value);
-    }
-    set(key, value, scope) {
-        const newValue = JSON.stringify(( value.map(({ id, uuid }) => ({ id, uuid }))));
-        const oldValue = this._get(key, scope);
-        if (oldValue !== newValue) {
-            if (scope === 0 ) {
-                if (value.length) {
-                    this.storage[key] = newValue;
-                }
-                else {
-                    delete this.storage[key];
-                }
-            }
-            this._set(key, value.length ? newValue : undefined, scope);
-        }
-    }
-    onDidStorageChange(storageChangeEvent) {
-        if (!isUndefinedOrNull(this.storage[storageChangeEvent.key])) {
-            const newValue = this._get(storageChangeEvent.key, storageChangeEvent.scope);
-            if (newValue !== this.storage[storageChangeEvent.key]) {
-                const oldValues = this.get(storageChangeEvent.key, storageChangeEvent.scope);
-                delete this.storage[storageChangeEvent.key];
-                const newValues = this.get(storageChangeEvent.key, storageChangeEvent.scope);
-                const added = oldValues.filter(oldValue => !( newValues.some(newValue => areSameExtensions(oldValue, newValue))));
-                const removed = newValues.filter(newValue => !( oldValues.some(oldValue => areSameExtensions(oldValue, newValue))));
-                if (added.length || removed.length) {
-                    this._onDidChange.fire([...added, ...removed]);
-                }
-            }
-        }
-    }
-    _get(key, scope) {
-        return this.storageService.get(key, scope, '[]');
-    }
-    _set(key, value, scope) {
-        if (value) {
-            this.storageService.store(key, value, scope, 1 );
-        }
-        else {
-            this.storageService.remove(key, scope);
-        }
-    }
-}
-
-export { GlobalExtensionEnablementService, StorageManager };

package/vscode/src/vs/workbench/services/remote/common/remoteExtensionsScanner.js

@@ -1,73 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { RemoteExtensionsScannerChannelName } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
-import * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IRemoteUserDataProfilesService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IActiveLanguagePackService } from 'vscode/vscode/vs/workbench/services/localization/common/locale';
-
-let RemoteExtensionsScannerService = class RemoteExtensionsScannerService {
-    constructor(remoteAgentService, environmentService, userDataProfileService, remoteUserDataProfilesService, logService, activeLanguagePackService) {
-        this.remoteAgentService = remoteAgentService;
-        this.environmentService = environmentService;
-        this.userDataProfileService = userDataProfileService;
-        this.remoteUserDataProfilesService = remoteUserDataProfilesService;
-        this.logService = logService;
-        this.activeLanguagePackService = activeLanguagePackService;
-    }
-    whenExtensionsReady() {
-        return this.withChannel(channel => channel.call('whenExtensionsReady'), undefined);
-    }
-    async scanExtensions() {
-        try {
-            const languagePack = await this.activeLanguagePackService.getExtensionIdProvidingCurrentLocale();
-            return await this.withChannel(async (channel) => {
-                const profileLocation = this.userDataProfileService.currentProfile.isDefault ? undefined : (await this.remoteUserDataProfilesService.getRemoteProfile(this.userDataProfileService.currentProfile)).extensionsResource;
-                const scannedExtensions = await channel.call('scanExtensions', [platform.language, profileLocation, this.environmentService.extensionDevelopmentLocationURI, languagePack]);
-                scannedExtensions.forEach((extension) => {
-                    extension.extensionLocation = URI.revive(extension.extensionLocation);
-                });
-                return scannedExtensions;
-            }, []);
-        }
-        catch (error) {
-            this.logService.error(error);
-            return [];
-        }
-    }
-    async scanSingleExtension(extensionLocation, isBuiltin) {
-        try {
-            return await this.withChannel(async (channel) => {
-                const extension = await channel.call('scanSingleExtension', [extensionLocation, isBuiltin, platform.language]);
-                if (extension !== null) {
-                    extension.extensionLocation = URI.revive(extension.extensionLocation);
-                }
-                return extension;
-            }, null);
-        }
-        catch (error) {
-            this.logService.error(error);
-            return null;
-        }
-    }
-    withChannel(callback, fallback) {
-        const connection = this.remoteAgentService.getConnection();
-        if (!connection) {
-            return Promise.resolve(fallback);
-        }
-        return connection.withChannel(RemoteExtensionsScannerChannelName, (channel) => callback(channel));
-    }
-};
-RemoteExtensionsScannerService = ( __decorate([
-    ( __param(0, IRemoteAgentService)),
-    ( __param(1, IWorkbenchEnvironmentService)),
-    ( __param(2, IUserDataProfileService)),
-    ( __param(3, IRemoteUserDataProfilesService)),
-    ( __param(4, ILogService)),
-    ( __param(5, IActiveLanguagePackService))
-], RemoteExtensionsScannerService));
-
-export { RemoteExtensionsScannerService };