diff --git a/src/vs/editor/test/common/services/semanticTokensProviderStyling.test.ts b/src/vs/editor/test/common/services/semanticTokensProviderStyling.test.ts index 83d6099184906..bfec2c00b1ad8 100644 --- a/src/vs/editor/test/common/services/semanticTokensProviderStyling.test.ts +++ b/src/vs/editor/test/common/services/semanticTokensProviderStyling.test.ts @@ -10,7 +10,7 @@ import { MetadataConsts } from 'vs/editor/common/encodedTokenAttributes'; import { SemanticTokensProviderStyling, toMultilineTokens2 } from 'vs/editor/common/services/semanticTokensProviderStyling'; import { createModelServices } from 'vs/editor/test/common/testTextModel'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; -import { IThemeService, ITokenStyle } from 'vs/platform/theme/common/themeService'; +import { IColorTheme, IThemeService, ITokenStyle } from 'vs/platform/theme/common/themeService'; import { ILanguageService } from 'vs/editor/common/languages/language'; import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; @@ -38,9 +38,9 @@ suite('ModelService', () => { tokenTypes: ['st0', 'st1', 'st2', 'st3', 'st4', 'st5', 'st6', 'st7', 'st8', 'st9', 'st10'], tokenModifiers: [] }; - instantiationService.stub(IThemeService, >{ + instantiationService.stub(IThemeService, { getColorTheme() { - return { + return { getTokenStyleMetadata: (tokenType, tokenModifiers, languageId): ITokenStyle => { return { foreground: parseInt(tokenType.substr(2), 10), @@ -90,9 +90,9 @@ suite('ModelService', () => { tokenTypes: ['st0', 'st1', 'st2', 'st3', 'st4', 'st5', 'st6', 'st7', 'st8', 'st9'], tokenModifiers: ['stm0', 'stm1', 'stm2'] }; - instantiationService.stub(IThemeService, >{ + instantiationService.stub(IThemeService, { getColorTheme() { - return { + return { getTokenStyleMetadata: (tokenType, tokenModifiers, languageId): ITokenStyle => { return { foreground: parseInt(tokenType.substr(2), 10), @@ -142,9 +142,9 @@ suite('ModelService', () => { tokenTypes: ['st0', 'st1', 'st2', 'st3', 'st4', 'st5'], tokenModifiers: ['stm0', 'stm1', 'stm2'] }; - instantiationService.stub(IThemeService, >{ + instantiationService.stub(IThemeService, { getColorTheme() { - return { + return { getTokenStyleMetadata: (tokenType, tokenModifiers, languageId): ITokenStyle => { return { foreground: parseInt(tokenType.substr(2), 10), diff --git a/src/vs/editor/test/common/services/textResourceConfigurationService.test.ts b/src/vs/editor/test/common/services/textResourceConfigurationService.test.ts index 561d6cb23fe2e..a40b185fd2838 100644 --- a/src/vs/editor/test/common/services/textResourceConfigurationService.test.ts +++ b/src/vs/editor/test/common/services/textResourceConfigurationService.test.ts @@ -35,8 +35,8 @@ suite('TextResourceConfigurationService - Update', () => { setup(() => { instantiationService = disposables.add(new TestInstantiationService()); - instantiationService.stub(IModelService, >{ getModel() { return null; } }); - instantiationService.stub(ILanguageService, >{ guessLanguageIdByFilepathOrFirstLine() { return language; } }); + instantiationService.stub(IModelService, { getModel() { return null; } }); + instantiationService.stub(ILanguageService, { guessLanguageIdByFilepathOrFirstLine() { return language; } }); instantiationService.stub(IConfigurationService, configurationService); testObject = disposables.add(instantiationService.createInstance(TextResourceConfigurationService)); }); diff --git a/src/vs/platform/extensionManagement/test/node/installGalleryExtensionTask.test.ts b/src/vs/platform/extensionManagement/test/node/installGalleryExtensionTask.test.ts index 51395a8673707..1767e8931cbaf 100644 --- a/src/vs/platform/extensionManagement/test/node/installGalleryExtensionTask.test.ts +++ b/src/vs/platform/extensionManagement/test/node/installGalleryExtensionTask.test.ts @@ -224,8 +224,8 @@ suite('InstallGalleryExtensionTask Tests', () => { instantiationService.stub(IProductService, { quality: options.quality ?? 'insiders' }); instantiationService.stub(IFileService, fileService); instantiationService.stub(ILogService, logService); - instantiationService.stub(INativeEnvironmentService, >{ extensionsDownloadLocation: joinPath(ROOT, 'CachedExtensionVSIXs') }); - instantiationService.stub(IExtensionGalleryService, >{ + instantiationService.stub(INativeEnvironmentService, { extensionsDownloadLocation: joinPath(ROOT, 'CachedExtensionVSIXs') }); + instantiationService.stub(IExtensionGalleryService, { async download(extension, location, operation) { await fileService.writeFile(location, VSBuffer.fromString('extension vsix')); }, diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts index 4d1eaa4afb2dd..b622a3efe44b1 100644 --- a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts +++ b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts @@ -62,7 +62,7 @@ export class UserDataSyncClient extends Disposable { const userRoamingDataHome = URI.file('userdata').with({ scheme: Schemas.inMemory }); const userDataSyncHome = joinPath(userRoamingDataHome, '.sync'); - const environmentService = this.instantiationService.stub(IEnvironmentService, >{ + const environmentService = this.instantiationService.stub(IEnvironmentService, { userDataSyncHome, userRoamingDataHome, cacheHome: joinPath(userRoamingDataHome, 'cache'), @@ -117,7 +117,7 @@ export class UserDataSyncClient extends Disposable { this.instantiationService.stub(IUserDataSyncUtilService, new TestUserDataSyncUtilService()); this.instantiationService.stub(IUserDataSyncEnablementService, this._register(this.instantiationService.createInstance(UserDataSyncEnablementService))); - this.instantiationService.stub(IExtensionManagementService, >{ + this.instantiationService.stub(IExtensionManagementService, { async getInstalled() { return []; }, onDidInstallExtensions: new Emitter().event, onDidUninstallExtension: new Emitter().event, @@ -125,7 +125,7 @@ export class UserDataSyncClient extends Disposable { this.instantiationService.stub(IGlobalExtensionEnablementService, this._register(this.instantiationService.createInstance(GlobalExtensionEnablementService))); this.instantiationService.stub(IExtensionStorageService, this._register(this.instantiationService.createInstance(ExtensionStorageService))); this.instantiationService.stub(IIgnoredExtensionsManagementService, this.instantiationService.createInstance(IgnoredExtensionsManagementService)); - this.instantiationService.stub(IExtensionGalleryService, >{ + this.instantiationService.stub(IExtensionGalleryService, { isEnabled() { return true; }, async getCompatibleExtension() { return null; } }); diff --git a/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts b/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts index c4f3e61cfd548..4ad6b2fe90026 100644 --- a/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts +++ b/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts @@ -80,7 +80,7 @@ suite('Edit session sync', () => { override onWillShutdown = Event.None; }); instantiationService.stub(INotificationService, new TestNotificationService()); - instantiationService.stub(IProductService, >{ 'editSessions.store': { url: 'https://test.com', canSwitch: true, authenticationProviders: {} } }); + instantiationService.stub(IProductService, { 'editSessions.store': { url: 'https://test.com', canSwitch: true, authenticationProviders: {} } }); instantiationService.stub(IStorageService, new TestStorageService()); instantiationService.stub(IUriIdentityService, new UriIdentityService(fileService)); instantiationService.stub(IEditSessionsStorageService, new class extends mock() { diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts index 583c9f99be2ec..0ef0e1d50c04d 100644 --- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts +++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts @@ -20,7 +20,7 @@ suite('Extension Test', () => { setup(() => { instantiationService = new TestInstantiationService(); - instantiationService.stub(IProductService, >{ quality: 'insiders' }); + instantiationService.stub(IProductService, { quality: 'insiders' }); }); teardown(() => { @@ -58,7 +58,7 @@ suite('Extension Test', () => { }); test('extension is not outdated when local is built in and older than gallery but product quality is stable', () => { - instantiationService.stub(IProductService, >{ quality: 'stable' }); + instantiationService.stub(IProductService, { quality: 'stable' }); const extension = instantiationService.createInstance(Extension, () => ExtensionState.Installed, () => undefined, undefined, aLocalExtension('somext', { version: '1.0.0' }, { type: ExtensionType.System }), aGalleryExtension('somext', { version: '1.0.1' })); assert.strictEqual(extension.outdated, false); }); diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionRecommendationsService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionRecommendationsService.test.ts index c644f0acb1182..1e9e11baa19be 100644 --- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionRecommendationsService.test.ts +++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionRecommendationsService.test.ts @@ -7,10 +7,9 @@ import * as sinon from 'sinon'; import * as assert from 'assert'; import * as uuid from 'vs/base/common/uuid'; import { - IExtensionGalleryService, IGalleryExtensionAssets, IGalleryExtension, IExtensionManagementService, - DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionTipsService, InstallExtensionResult, getTargetPlatform, UninstallExtensionEvent + IExtensionGalleryService, IGalleryExtensionAssets, IGalleryExtension, IExtensionManagementService, IExtensionTipsService, getTargetPlatform, } from 'vs/platform/extensionManagement/common/extensionManagement'; -import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; +import { IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { Emitter, Event } from 'vs/base/common/event'; @@ -188,10 +187,6 @@ suite('ExtensionRecommendationsService Test', () => { let instantiationService: TestInstantiationService; let testConfigurationService: TestConfigurationService; let testObject: ExtensionRecommendationsService; - let installEvent: Emitter, - didInstallEvent: Emitter, - uninstallEvent: Emitter, - didUninstallEvent: Emitter; let prompted: boolean; let promptedEmitter: Emitter; let onModelAddedEvent: Emitter; @@ -207,10 +202,6 @@ suite('ExtensionRecommendationsService Test', () => { disposableStore = new DisposableStore(); instantiationService = disposableStore.add(new TestInstantiationService()); promptedEmitter = disposableStore.add(new Emitter()); - installEvent = disposableStore.add(new Emitter()); - didInstallEvent = disposableStore.add(new Emitter()); - uninstallEvent = disposableStore.add(new Emitter()); - didUninstallEvent = disposableStore.add(new Emitter()); instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService); instantiationService.stub(ISharedProcessService, TestSharedProcessService); instantiationService.stub(ILifecycleService, disposableStore.add(new TestLifecycleService())); @@ -218,11 +209,11 @@ suite('ExtensionRecommendationsService Test', () => { instantiationService.stub(IConfigurationService, testConfigurationService); instantiationService.stub(INotificationService, new TestNotificationService()); instantiationService.stub(IContextKeyService, new MockContextKeyService()); - instantiationService.stub(IExtensionManagementService, >{ - onInstallExtension: installEvent.event, - onDidInstallExtensions: didInstallEvent.event, - onUninstallExtension: uninstallEvent.event, - onDidUninstallExtension: didUninstallEvent.event, + instantiationService.stub(IWorkbenchExtensionManagementService, { + onInstallExtension: Event.None, + onDidInstallExtensions: Event.None, + onUninstallExtension: Event.None, + onDidUninstallExtension: Event.None, onDidUpdateExtensionMetadata: Event.None, onDidChangeProfile: Event.None, async getInstalled() { return []; }, @@ -230,7 +221,7 @@ suite('ExtensionRecommendationsService Test', () => { async getExtensionsControlManifest() { return { malicious: [], deprecated: {}, search: [] }; }, async getTargetPlatform() { return getTargetPlatform(platform, arch); } }); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { onDidChangeExtensions: Event.None, extensions: [], async whenInstalledExtensionsRegistered() { return true; } @@ -241,12 +232,7 @@ suite('ExtensionRecommendationsService Test', () => { instantiationService.stub(IWorkspaceTagsService, new NoOpWorkspaceTagsService()); instantiationService.stub(IStorageService, disposableStore.add(new TestStorageService())); instantiationService.stub(ILogService, new NullLogService()); - instantiationService.stub(IProductService, >{ - extensionTips: { - 'ms-dotnettools.csharp': '{**/*.cs,**/project.json,**/global.json,**/*.csproj,**/*.sln,**/appsettings.json}', - 'msjsdiag.debugger-for-chrome': '{**/*.ts,**/*.tsx,**/*.js,**/*.jsx,**/*.es6,**/*.mjs,**/*.cjs,**/.babelrc}', - 'lukehoban.Go': '**/*.go' - }, + instantiationService.stub(IProductService, { extensionRecommendations: { 'ms-python.python': { onFileOpen: [ @@ -293,7 +279,7 @@ suite('ExtensionRecommendationsService Test', () => { onModelAddedEvent = new Emitter(); - instantiationService.stub(IEnvironmentService, >{}); + instantiationService.stub(IEnvironmentService, {}); instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []); instantiationService.stub(IExtensionGalleryService, 'isEnabled', true); instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(...mockExtensionGallery)); diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts index c811b48b7bf86..0762678249d50 100644 --- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts +++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts @@ -12,7 +12,7 @@ import { IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, DidUninstallExtensionEvent, InstallExtensionEvent, IExtensionIdentifier, InstallOperation, IExtensionTipsService, InstallExtensionResult, getTargetPlatform, IExtensionsControlManifest, UninstallExtensionEvent, Metadata } from 'vs/platform/extensionManagement/common/extensionManagement'; -import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, ExtensionInstallLocation, IProfileAwareExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; +import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, ExtensionInstallLocation, IProfileAwareExtensionManagementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations'; import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; import { TestExtensionEnablementService } from 'vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test'; @@ -86,13 +86,13 @@ function setupTest(disposables: Pick) { instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService); instantiationService.stub(ISharedProcessService, TestSharedProcessService); - instantiationService.stub(IExtensionManagementService, >{ - onInstallExtension: installEvent.event, + instantiationService.stub(IWorkbenchExtensionManagementService, { onDidInstallExtensions: didInstallEvent.event, - onUninstallExtension: uninstallEvent.event, - onDidUninstallExtension: didUninstallEvent.event, - onDidChangeProfile: Event.None, + onInstallExtension: installEvent.event as any, + onUninstallExtension: uninstallEvent.event as any, + onDidUninstallExtension: didUninstallEvent.event as any, onDidUpdateExtensionMetadata: Event.None, + onDidChangeProfile: Event.None, async getInstalled() { return []; }, async getExtensionsControlManifest() { return { malicious: [], deprecated: {}, search: [] }; }, async updateMetadata(local: ILocalExtension, metadata: Partial) { @@ -108,7 +108,7 @@ function setupTest(disposables: Pick) { instantiationService.stub(IRemoteAgentService, RemoteAgentService); const localExtensionManagementServer = { extensionManagementService: instantiationService.get(IExtensionManagementService) as IProfileAwareExtensionManagementService, label: 'local', id: 'vscode-local' }; - instantiationService.stub(IExtensionManagementServerService, >{ + instantiationService.stub(IExtensionManagementServerService, { get localExtensionManagementServer(): IExtensionManagementServer { return localExtensionManagementServer; }, @@ -131,7 +131,7 @@ function setupTest(disposables: Pick) { instantiationService.stub(IExtensionGalleryService, 'isEnabled', true); instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage()); instantiationService.stubPromise(IExtensionGalleryService, 'getExtensions', []); - instantiationService.stub(IExtensionService, >{ extensions: [], onDidChangeExtensions: Event.None, canAddExtension: (extension: IExtensionDescription) => false, canRemoveExtension: (extension: IExtensionDescription) => false, whenInstalledExtensionsRegistered: () => Promise.resolve(true) }); + instantiationService.stub(IExtensionService, { extensions: [], onDidChangeExtensions: Event.None, canAddExtension: (extension: IExtensionDescription) => false, canRemoveExtension: (extension: IExtensionDescription) => false, whenInstalledExtensionsRegistered: () => Promise.resolve(true) }); (instantiationService.get(IWorkbenchExtensionEnablementService)).reset(); instantiationService.stub(IUserDataSyncEnablementService, disposables.add(instantiationService.createInstance(UserDataSyncEnablementService))); @@ -784,7 +784,7 @@ suite('ExtensionsActions', () => { test('Test DisableForWorkspaceAction when extension is enabled', () => { const local = aLocalExtension('a'); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(local)], onDidChangeExtensions: Event.None, whenInstalledExtensionsRegistered: () => Promise.resolve(true) @@ -839,7 +839,7 @@ suite('ExtensionsActions', () => { test('Test DisableGloballyAction when the extension is enabled', () => { const local = aLocalExtension('a'); instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(local)], onDidChangeExtensions: Event.None, whenInstalledExtensionsRegistered: () => Promise.resolve(true) @@ -856,7 +856,7 @@ suite('ExtensionsActions', () => { test('Test DisableGloballyAction when extension is installed and enabled', () => { const local = aLocalExtension('a'); instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(local)], onDidChangeExtensions: Event.None, whenInstalledExtensionsRegistered: () => Promise.resolve(true) @@ -872,7 +872,7 @@ suite('ExtensionsActions', () => { test('Test DisableGloballyAction when extension is installed and disabled globally', () => { const local = aLocalExtension('a'); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(local)], onDidChangeExtensions: Event.None, whenInstalledExtensionsRegistered: () => Promise.resolve(true) @@ -894,7 +894,7 @@ suite('ExtensionsActions', () => { test('Test DisableGloballyAction when extension is uninstalled', () => { const gallery = aGalleryExtension('a'); instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery)); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('a'))], onDidChangeExtensions: Event.None, whenInstalledExtensionsRegistered: () => Promise.resolve(true) @@ -911,7 +911,7 @@ suite('ExtensionsActions', () => { test('Test DisableGloballyAction when extension is installing', () => { const gallery = aGalleryExtension('a'); instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery)); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('a'))], onDidChangeExtensions: Event.None, whenInstalledExtensionsRegistered: () => Promise.resolve(true) @@ -930,7 +930,7 @@ suite('ExtensionsActions', () => { test('Test DisableGloballyAction when extension is uninstalling', () => { const local = aLocalExtension('a'); instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(local)], onDidChangeExtensions: Event.None, whenInstalledExtensionsRegistered: () => Promise.resolve(true) @@ -988,7 +988,7 @@ suite('ReloadAction', () => { test('Test ReloadAction when extension is newly installed', async () => { const onDidChangeExtensionsEmitter = new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>(); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('b'))], onDidChangeExtensions: onDidChangeExtensionsEmitter.event, canAddExtension: (extension) => false, @@ -1013,7 +1013,7 @@ suite('ReloadAction', () => { test('Test ReloadAction when extension is newly installed and reload is not required', async () => { const onDidChangeExtensionsEmitter = new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>(); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('b'))], onDidChangeExtensions: onDidChangeExtensionsEmitter.event, canAddExtension: (extension) => true, @@ -1034,7 +1034,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when extension is installed and uninstalled', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('b'))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => false, @@ -1058,7 +1058,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when extension is uninstalled', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('a', { version: '1.0.0' }))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => false, @@ -1081,7 +1081,7 @@ suite('ReloadAction', () => { test('Test ReloadAction when extension is uninstalled and can be removed', async () => { const local = aLocalExtension('a'); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(local)], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => true, @@ -1100,7 +1100,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when extension is uninstalled and installed', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('a', { version: '1.0.0' }))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => false, @@ -1126,7 +1126,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when extension is updated while running', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('a', { version: '1.0.1' }))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => true, @@ -1155,7 +1155,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when extension is updated when not running', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('b'))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => false, @@ -1179,7 +1179,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when extension is disabled when running', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('a'))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => false, @@ -1202,7 +1202,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when extension enablement is toggled when running', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('a', { version: '1.0.0' }))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => false, @@ -1223,7 +1223,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when extension is enabled when not running', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('b'))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => false, @@ -1245,7 +1245,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when extension enablement is toggled when not running', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('b'))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => false, @@ -1266,7 +1266,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when extension is updated when not running and enabled', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('a'))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => false, @@ -1292,7 +1292,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when a localization extension is newly installed', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('b'))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => false, @@ -1314,7 +1314,7 @@ suite('ReloadAction', () => { }); test('Test ReloadAction when a localization extension is updated while running', async () => { - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(aLocalExtension('a', { version: '1.0.1' }))], onDidChangeExtensions: Event.None, canRemoveExtension: (extension) => false, @@ -1344,7 +1344,7 @@ suite('ReloadAction', () => { instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService); instantiationService.stub(IWorkbenchExtensionEnablementService, disposables.add(new TestExtensionEnablementService(instantiationService))); const onDidChangeExtensionsEmitter = new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>(); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(remoteExtension)], onDidChangeExtensions: onDidChangeExtensionsEmitter.event, canAddExtension: (extension) => false, @@ -1378,7 +1378,7 @@ suite('ReloadAction', () => { instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService); instantiationService.stub(IWorkbenchExtensionEnablementService, disposables.add(new TestExtensionEnablementService(instantiationService))); const onDidChangeExtensionsEmitter = new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>(); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(remoteExtension)], onDidChangeExtensions: onDidChangeExtensionsEmitter.event, canAddExtension: (extension) => false, @@ -1417,7 +1417,7 @@ suite('ReloadAction', () => { instantiationService.set(IExtensionsWorkbenchService, workbenchService); const onDidChangeExtensionsEmitter = new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>(); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [], onDidChangeExtensions: onDidChangeExtensionsEmitter.event, canAddExtension: (extension) => false, @@ -1456,7 +1456,7 @@ suite('ReloadAction', () => { instantiationService.set(IExtensionsWorkbenchService, workbenchService); const onDidChangeExtensionsEmitter = new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>(); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [], onDidChangeExtensions: onDidChangeExtensionsEmitter.event, canAddExtension: (extension) => false, @@ -1493,7 +1493,7 @@ suite('ReloadAction', () => { instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService); instantiationService.stub(IWorkbenchExtensionEnablementService, disposables.add(new TestExtensionEnablementService(instantiationService))); const onDidChangeExtensionsEmitter = new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>(); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(localExtension)], onDidChangeExtensions: onDidChangeExtensionsEmitter.event, canAddExtension: (extension) => false, @@ -1528,7 +1528,7 @@ suite('ReloadAction', () => { instantiationService.set(IExtensionsWorkbenchService, workbenchService); const onDidChangeExtensionsEmitter = new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>(); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(localExtension)], onDidChangeExtensions: onDidChangeExtensionsEmitter.event, canAddExtension: (extension) => false, @@ -1560,7 +1560,7 @@ suite('ReloadAction', () => { instantiationService.set(IExtensionsWorkbenchService, workbenchService); const onDidChangeExtensionsEmitter = new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>(); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(remoteExtension)], onDidChangeExtensions: onDidChangeExtensionsEmitter.event, canAddExtension: (extension) => false, @@ -1592,7 +1592,7 @@ suite('ReloadAction', () => { instantiationService.set(IExtensionsWorkbenchService, workbenchService); const onDidChangeExtensionsEmitter = new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>(); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(localExtension)], onDidChangeExtensions: onDidChangeExtensionsEmitter.event, canAddExtension: (extension) => false, @@ -1624,7 +1624,7 @@ suite('ReloadAction', () => { instantiationService.set(IExtensionsWorkbenchService, workbenchService); const onDidChangeExtensionsEmitter = new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>(); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(remoteExtension)], onDidChangeExtensions: onDidChangeExtensionsEmitter.event, canAddExtension: (extension) => false, @@ -1649,7 +1649,7 @@ suite('ReloadAction', () => { const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, null, createExtensionManagementService([remoteExtension]), createExtensionManagementService([webExtension])); instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService); instantiationService.stub(IWorkbenchExtensionEnablementService, disposables.add(new TestExtensionEnablementService(instantiationService))); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(remoteExtension)], onDidChangeExtensions: Event.None, canAddExtension: (extension) => false, @@ -1677,7 +1677,7 @@ suite('ReloadAction', () => { const extensionManagementServerService = aMultiExtensionManagementServerService(instantiationService, createExtensionManagementService([localExtension]), null, createExtensionManagementService([webExtension])); instantiationService.stub(IExtensionManagementServerService, extensionManagementServerService); instantiationService.stub(IWorkbenchExtensionEnablementService, disposables.add(new TestExtensionEnablementService(instantiationService))); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { extensions: [toExtensionDescription(localExtension)], onDidChangeExtensions: Event.None, canAddExtension: (extension) => false, diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts index 440111628dfd0..1d07a03c712c1 100644 --- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts +++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts @@ -11,7 +11,7 @@ import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/com import { ExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService'; import { IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions, - DidUninstallExtensionEvent, InstallExtensionEvent, InstallExtensionResult, getTargetPlatform, IExtensionInfo, UninstallExtensionEvent, SortBy + getTargetPlatform, IExtensionInfo, SortBy } from 'vs/platform/extensionManagement/common/extensionManagement'; import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IProfileAwareExtensionManagementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; import { IExtensionRecommendationsService, ExtensionRecommendationReason } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations'; @@ -19,7 +19,7 @@ import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/ex import { TestExtensionEnablementService } from 'vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test'; import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService'; import { IURLService } from 'vs/platform/url/common/url'; -import { Emitter, Event } from 'vs/base/common/event'; +import { Event } from 'vs/base/common/event'; import { IPager } from 'vs/base/common/paging'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils'; @@ -55,10 +55,6 @@ suite('ExtensionsViews Tests', () => { let instantiationService: TestInstantiationService; let testableView: ExtensionsListView; - let installEvent: Emitter, - didInstallEvent: Emitter, - uninstallEvent: Emitter, - didUninstallEvent: Emitter; const localEnabledTheme = aLocalExtension('first-enabled-extension', { categories: ['Themes', 'random'] }, { installedTimestamp: 123456 }); const localEnabledLanguage = aLocalExtension('second-enabled-extension', { categories: ['Programming languages'], version: '1.0.0' }, { installedTimestamp: Date.now(), updated: false }); @@ -79,11 +75,6 @@ suite('ExtensionsViews Tests', () => { const otherRecommendationA = aGalleryExtension('other-recommendation-A'); setup(async () => { - installEvent = disposableStore.add(new Emitter()); - didInstallEvent = disposableStore.add(new Emitter()); - uninstallEvent = disposableStore.add(new Emitter()); - didUninstallEvent = disposableStore.add(new Emitter()); - instantiationService = disposableStore.add(new TestInstantiationService()); instantiationService.stub(ITelemetryService, NullTelemetryService); instantiationService.stub(ILogService, NullLogService); @@ -95,13 +86,13 @@ suite('ExtensionsViews Tests', () => { instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService); instantiationService.stub(ISharedProcessService, TestSharedProcessService); - instantiationService.stub(IExtensionManagementService, >{ - onInstallExtension: installEvent.event, - onDidInstallExtensions: didInstallEvent.event, - onUninstallExtension: uninstallEvent.event, - onDidUninstallExtension: didUninstallEvent.event, - onDidChangeProfile: Event.None, + instantiationService.stub(IWorkbenchExtensionManagementService, { + onInstallExtension: Event.None, + onDidInstallExtensions: Event.None, + onUninstallExtension: Event.None, + onDidUninstallExtension: Event.None, onDidUpdateExtensionMetadata: Event.None, + onDidChangeProfile: Event.None, async getInstalled() { return []; }, async canInstall() { return true; }, async getExtensionsControlManifest() { return { malicious: [], deprecated: {}, search: [] }; }, @@ -113,7 +104,7 @@ suite('ExtensionsViews Tests', () => { instantiationService.stub(IMenuService, new TestMenuService()); const localExtensionManagementServer = { extensionManagementService: instantiationService.get(IExtensionManagementService) as IProfileAwareExtensionManagementService, label: 'local', id: 'vscode-local' }; - instantiationService.stub(IExtensionManagementServerService, >{ + instantiationService.stub(IExtensionManagementServerService, { get localExtensionManagementServer(): IExtensionManagementServer { return localExtensionManagementServer; }, @@ -134,7 +125,7 @@ suite('ExtensionsViews Tests', () => { reasons[fileBasedRecommendationB.identifier.id] = { reasonId: ExtensionRecommendationReason.File }; reasons[otherRecommendationA.identifier.id] = { reasonId: ExtensionRecommendationReason.Executable }; reasons[configBasedRecommendationA.identifier.id] = { reasonId: ExtensionRecommendationReason.WorkspaceConfig }; - instantiationService.stub(IExtensionRecommendationsService, >{ + instantiationService.stub(IExtensionRecommendationsService, { getWorkspaceRecommendations() { return Promise.resolve([ workspaceRecommendationA.identifier.id, @@ -181,7 +172,7 @@ suite('ExtensionsViews Tests', () => { onDidChangeLocation: Event.None }); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { onDidChangeExtensions: Event.None, extensions: [ toExtensionDescription(localEnabledTheme), diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts index 44b5ff85e3e4d..ab080153b5e30 100644 --- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts +++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts @@ -12,7 +12,7 @@ import { IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, DidUninstallExtensionEvent, InstallExtensionEvent, IGalleryExtensionAssets, InstallOperation, IExtensionTipsService, InstallExtensionResult, getTargetPlatform, IExtensionsControlManifest, UninstallExtensionEvent, Metadata } from 'vs/platform/extensionManagement/common/extensionManagement'; -import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IProfileAwareExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; +import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IProfileAwareExtensionManagementService, IWorkbenchExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; import { IExtensionRecommendationsService } from 'vs/workbench/services/extensionRecommendations/common/extensionRecommendations'; import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; import { anExtensionManagementServerService, TestExtensionEnablementService } from 'vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test'; @@ -86,13 +86,13 @@ suite('ExtensionsWorkbenchServiceTest', () => { instantiationService.stub(IRemoteAgentService, RemoteAgentService); - instantiationService.stub(IExtensionManagementService, >{ - onInstallExtension: installEvent.event, + instantiationService.stub(IWorkbenchExtensionManagementService, { onDidInstallExtensions: didInstallEvent.event, - onUninstallExtension: uninstallEvent.event, - onDidUninstallExtension: didUninstallEvent.event, - onDidChangeProfile: Event.None, + onInstallExtension: installEvent.event as any, + onUninstallExtension: uninstallEvent.event as any, + onDidUninstallExtension: didUninstallEvent.event as any, onDidUpdateExtensionMetadata: Event.None, + onDidChangeProfile: Event.None, async getInstalled() { return []; }, async getExtensionsControlManifest() { return { malicious: [], deprecated: {}, search: [] }; }, async updateMetadata(local: ILocalExtension, metadata: Partial) { @@ -119,7 +119,7 @@ suite('ExtensionsWorkbenchServiceTest', () => { instantiationService.stub(INotificationService, { prompt: () => null! }); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { onDidChangeExtensions: Event.None, extensions: [], async whenInstalledExtensionsRegistered() { return true; } @@ -695,9 +695,10 @@ suite('ExtensionsWorkbenchServiceTest', () => { const extensionB = aLocalExtension('b'); const extensionC = aLocalExtension('c'); - instantiationService.stub(INotificationService, >{ + instantiationService.stub(INotificationService, { prompt(severity, message, choices, options) { options!.onCancel!(); + return null!; } }); return instantiationService.get(IWorkbenchExtensionEnablementService).setEnablement([extensionA], EnablementState.EnabledGlobally) @@ -715,9 +716,10 @@ suite('ExtensionsWorkbenchServiceTest', () => { const extensionB = aLocalExtension('b'); const extensionC = aLocalExtension('c'); - instantiationService.stub(INotificationService, >{ + instantiationService.stub(INotificationService, { prompt(severity, message, choices, options) { choices[0].run(); + return null!; } }); return instantiationService.get(IWorkbenchExtensionEnablementService).setEnablement([extensionA], EnablementState.EnabledGlobally) @@ -837,9 +839,10 @@ suite('ExtensionsWorkbenchServiceTest', () => { const extensionB = aLocalExtension('b', { extensionDependencies: ['pub.a'] }); const extensionC = aLocalExtension('c'); - instantiationService.stub(INotificationService, >{ + instantiationService.stub(INotificationService, { prompt(severity, message, choices, options) { options!.onCancel!(); + return null!; } }); return instantiationService.get(IWorkbenchExtensionEnablementService).setEnablement([extensionA], EnablementState.EnabledGlobally) @@ -877,9 +880,10 @@ suite('ExtensionsWorkbenchServiceTest', () => { const extensionB = aLocalExtension('b', { extensionDependencies: ['pub.c'] }); const extensionC = aLocalExtension('c', { extensionDependencies: ['pub.a'] }); - instantiationService.stub(INotificationService, >{ + instantiationService.stub(INotificationService, { prompt(severity, message, choices, options) { options!.onCancel!(); + return null!; } }); return instantiationService.get(IWorkbenchExtensionEnablementService).setEnablement([extensionA], EnablementState.EnabledGlobally) @@ -1662,9 +1666,9 @@ suite('ExtensionsWorkbenchServiceTest', () => { [AutoUpdateConfigurationKey]: autoUpdateValue ?? true, [AutoCheckUpdatesConfigurationKey]: autoCheckUpdatesValue ?? true }; - instantiationService.stub(IConfigurationService, >{ + instantiationService.stub(IConfigurationService, { onDidChangeConfiguration: () => { return undefined!; }, - getValue: (key?: string) => { + getValue: (key?: any) => { return key ? values[key] : undefined; }, updateValue: async (key: string, value: any) => { diff --git a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts index fa8aff5fde344..24908288aa99e 100644 --- a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts +++ b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts @@ -77,7 +77,7 @@ export class TestExtensionEnablementService extends ExtensionEnablementService { storageService, disposables.add(new GlobalExtensionEnablementService(storageService, extensionManagementService)), instantiationService.get(IWorkspaceContextService) || new TestContextService(), - instantiationService.get(IWorkbenchEnvironmentService) || instantiationService.stub(IWorkbenchEnvironmentService, {} as IWorkbenchEnvironmentService), + instantiationService.get(IWorkbenchEnvironmentService) || instantiationService.stub(IWorkbenchEnvironmentService, {}), workbenchExtensionManagementService, instantiationService.get(IConfigurationService), extensionManagementServerService, @@ -518,26 +518,26 @@ suite('ExtensionEnablementService Test', () => { }); test('test canChangeEnablement return false when extensions are disabled in environment', () => { - instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: true } as IWorkbenchEnvironmentService); + instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: true }); testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService)); assert.strictEqual(testObject.canChangeEnablement(aLocalExtension('pub.a')), false); }); test('test canChangeEnablement return false when the extension is disabled in environment', () => { - instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: ['pub.a'] } as IWorkbenchEnvironmentService); + instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: ['pub.a'] }); testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService)); assert.strictEqual(testObject.canChangeEnablement(aLocalExtension('pub.a')), false); }); test('test canChangeEnablement return true for system extensions when extensions are disabled in environment', () => { - instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: true } as IWorkbenchEnvironmentService); + instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: true }); testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService)); const extension = aLocalExtension('pub.a', undefined, ExtensionType.System); assert.strictEqual(testObject.canChangeEnablement(extension), true); }); test('test canChangeEnablement return false for system extension when extension is disabled in environment', () => { - instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: ['pub.a'] } as IWorkbenchEnvironmentService); + instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: ['pub.a'] }); testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService)); const extension = aLocalExtension('pub.a', undefined, ExtensionType.System); assert.ok(!testObject.canChangeEnablement(extension)); @@ -547,7 +547,7 @@ suite('ExtensionEnablementService Test', () => { const extension = aLocalExtension('pub.a'); installed.push(extension); - instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: ['pub.a'] } as IWorkbenchEnvironmentService); + instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: ['pub.a'] }); testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService)); assert.ok(!testObject.isEnabled(extension)); @@ -558,7 +558,7 @@ suite('ExtensionEnablementService Test', () => { const extension = aLocalExtension('pub.a'); installed.push(extension); - instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: ['pub.a'] } as IWorkbenchEnvironmentService); + instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: ['pub.a'] }); testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService)); assert.ok(testObject.isEnabled(extension)); @@ -570,7 +570,7 @@ suite('ExtensionEnablementService Test', () => { installed.push(extension); await testObject.setEnablement([extension], EnablementState.EnabledWorkspace); - instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: ['pub.a'] } as IWorkbenchEnvironmentService); + instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: ['pub.a'] }); testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService)); assert.ok(testObject.isEnabled(extension)); @@ -582,7 +582,7 @@ suite('ExtensionEnablementService Test', () => { installed.push(extension); await testObject.setEnablement([extension], EnablementState.DisabledGlobally); - instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: ['pub.a'] } as IWorkbenchEnvironmentService); + instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: ['pub.a'] }); testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService)); assert.ok(testObject.isEnabled(extension)); @@ -594,7 +594,7 @@ suite('ExtensionEnablementService Test', () => { installed.push(extension); await testObject.setEnablement([extension], EnablementState.DisabledWorkspace); - instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: ['pub.a'] } as IWorkbenchEnvironmentService); + instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: ['pub.a'] }); testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService)); assert.ok(testObject.isEnabled(extension)); @@ -606,7 +606,7 @@ suite('ExtensionEnablementService Test', () => { installed.push(extension); testObject.setEnablement([extension], EnablementState.DisabledWorkspace); - instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: true, enableExtensions: ['pub.a'] } as IWorkbenchEnvironmentService); + instantiationService.stub(IWorkbenchEnvironmentService, { disableExtensions: true, enableExtensions: ['pub.a'] }); testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService)); assert.ok(!testObject.isEnabled(extension)); @@ -614,7 +614,7 @@ suite('ExtensionEnablementService Test', () => { }); test('test canChangeEnablement return false when the extension is enabled in environment', () => { - instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: ['pub.a'] } as IWorkbenchEnvironmentService); + instantiationService.stub(IWorkbenchEnvironmentService, { enableExtensions: ['pub.a'] }); testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService)); assert.strictEqual(testObject.canChangeEnablement(aLocalExtension('pub.a')), false); }); diff --git a/src/vs/workbench/services/extensions/test/browser/extensionStorageMigration.test.ts b/src/vs/workbench/services/extensions/test/browser/extensionStorageMigration.test.ts index 52dc0e6997f1e..f1795ab490867 100644 --- a/src/vs/workbench/services/extensions/test/browser/extensionStorageMigration.test.ts +++ b/src/vs/workbench/services/extensions/test/browser/extensionStorageMigration.test.ts @@ -38,7 +38,7 @@ suite('ExtensionStorageMigration', () => { const fileService = disposables.add(new FileService(new NullLogService())); disposables.add(fileService.registerProvider(ROOT.scheme, disposables.add(new InMemoryFileSystemProvider()))); instantiationService.stub(IFileService, fileService); - const environmentService = instantiationService.stub(IEnvironmentService, >{ userRoamingDataHome: ROOT, workspaceStorageHome, cacheHome: ROOT }); + const environmentService = instantiationService.stub(IEnvironmentService, { userRoamingDataHome: ROOT, workspaceStorageHome, cacheHome: ROOT }); const userDataProfilesService = instantiationService.stub(IUserDataProfilesService, disposables.add(new UserDataProfilesService(environmentService, fileService, disposables.add(new UriIdentityService(fileService)), new NullLogService()))); instantiationService.stub(IUserDataProfileService, disposables.add(new UserDataProfileService(userDataProfilesService.defaultProfile))); diff --git a/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts b/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts index 9cde094633371..ab5a069fe14ee 100644 --- a/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts +++ b/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts @@ -136,7 +136,7 @@ if (!isWeb) { } test('test extension workspace trust request when main entry point is missing', () => { - instantiationService.stub(IProductService, >{}); + instantiationService.stub(IProductService, {}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); const extensionManifest = getExtensionManifest(); @@ -144,7 +144,7 @@ if (!isWeb) { }); test('test extension workspace trust request when workspace trust is disabled', async () => { - instantiationService.stub(IProductService, >{}); + instantiationService.stub(IProductService, {}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService(false)); const extensionManifest = getExtensionManifest({ main: './out/extension.js' }); @@ -152,7 +152,7 @@ if (!isWeb) { }); test('test extension workspace trust request when "true" override exists in settings.json', async () => { - instantiationService.stub(IProductService, >{}); + instantiationService.stub(IProductService, {}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); await testConfigurationService.setUserConfiguration('extensions', { supportUntrustedWorkspaces: { 'pub.a': { supported: true } } }); @@ -161,7 +161,7 @@ if (!isWeb) { }); test('test extension workspace trust request when override (false) exists in settings.json', async () => { - instantiationService.stub(IProductService, >{}); + instantiationService.stub(IProductService, {}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); await testConfigurationService.setUserConfiguration('extensions', { supportUntrustedWorkspaces: { 'pub.a': { supported: false } } }); @@ -170,7 +170,7 @@ if (!isWeb) { }); test('test extension workspace trust request when override (true) for the version exists in settings.json', async () => { - instantiationService.stub(IProductService, >{}); + instantiationService.stub(IProductService, {}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); await testConfigurationService.setUserConfiguration('extensions', { supportUntrustedWorkspaces: { 'pub.a': { supported: true, version: '1.0.0' } } }); @@ -179,7 +179,7 @@ if (!isWeb) { }); test('test extension workspace trust request when override (false) for the version exists in settings.json', async () => { - instantiationService.stub(IProductService, >{}); + instantiationService.stub(IProductService, {}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); await testConfigurationService.setUserConfiguration('extensions', { supportUntrustedWorkspaces: { 'pub.a': { supported: false, version: '1.0.0' } } }); @@ -188,7 +188,7 @@ if (!isWeb) { }); test('test extension workspace trust request when override for a different version exists in settings.json', async () => { - instantiationService.stub(IProductService, >{}); + instantiationService.stub(IProductService, {}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); await testConfigurationService.setUserConfiguration('extensions', { supportUntrustedWorkspaces: { 'pub.a': { supported: true, version: '2.0.0' } } }); @@ -197,7 +197,7 @@ if (!isWeb) { }); test('test extension workspace trust request when default (true) exists in product.json', () => { - instantiationService.stub(IProductService, >{ extensionUntrustedWorkspaceSupport: { 'pub.a': { default: true } } }); + instantiationService.stub(IProductService, { extensionUntrustedWorkspaceSupport: { 'pub.a': { default: true } } }); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); const extensionManifest = getExtensionManifest({ main: './out/extension.js' }); @@ -205,7 +205,7 @@ if (!isWeb) { }); test('test extension workspace trust request when default (false) exists in product.json', () => { - instantiationService.stub(IProductService, >{ extensionUntrustedWorkspaceSupport: { 'pub.a': { default: false } } }); + instantiationService.stub(IProductService, { extensionUntrustedWorkspaceSupport: { 'pub.a': { default: false } } }); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); const extensionManifest = getExtensionManifest({ main: './out/extension.js' }); @@ -213,7 +213,7 @@ if (!isWeb) { }); test('test extension workspace trust request when override (limited) exists in product.json', () => { - instantiationService.stub(IProductService, >{ extensionUntrustedWorkspaceSupport: { 'pub.a': { override: 'limited' } } }); + instantiationService.stub(IProductService, { extensionUntrustedWorkspaceSupport: { 'pub.a': { override: 'limited' } } }); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); const extensionManifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: true } } }); @@ -221,7 +221,7 @@ if (!isWeb) { }); test('test extension workspace trust request when override (false) exists in product.json', () => { - instantiationService.stub(IProductService, >{ extensionUntrustedWorkspaceSupport: { 'pub.a': { override: false } } }); + instantiationService.stub(IProductService, { extensionUntrustedWorkspaceSupport: { 'pub.a': { override: false } } }); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); const extensionManifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: true } } }); @@ -229,7 +229,7 @@ if (!isWeb) { }); test('test extension workspace trust request when value exists in package.json', () => { - instantiationService.stub(IProductService, >{}); + instantiationService.stub(IProductService, {}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); const extensionManifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); @@ -237,7 +237,7 @@ if (!isWeb) { }); test('test extension workspace trust request when no value exists in package.json', () => { - instantiationService.stub(IProductService, >{}); + instantiationService.stub(IProductService, {}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); const extensionManifest = getExtensionManifest({ main: './out/extension.js' }); diff --git a/src/vs/workbench/services/preferences/test/browser/keybindingsEditorModel.test.ts b/src/vs/workbench/services/preferences/test/browser/keybindingsEditorModel.test.ts index ca279aaea690f..b7b974d2d4976 100644 --- a/src/vs/workbench/services/preferences/test/browser/keybindingsEditorModel.test.ts +++ b/src/vs/workbench/services/preferences/test/browser/keybindingsEditorModel.test.ts @@ -41,9 +41,9 @@ suite('KeybindingsEditorModel', () => { instantiationService = disposables.add(new TestInstantiationService()); instantiationService.stub(IKeybindingService, {}); - instantiationService.stub(IExtensionService, >{ + instantiationService.stub(IExtensionService, { whenInstalledExtensionsRegistered: () => Promise.resolve(true), - get extensions() { return extensions; } + get extensions() { return extensions as IExtensionDescription[]; } }); testObject = disposables.add(instantiationService.createInstance(KeybindingsEditorModel, OS));