fix #71846 (#202132)

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, <Partial<IThemeService>>{
+		instantiationService.stub(IThemeService, {
 			getColorTheme() {
-				return {
+				return <IColorTheme>{
 					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, <Partial<IThemeService>>{
+		instantiationService.stub(IThemeService, {
 			getColorTheme() {
-				return {
+				return <IColorTheme>{
 					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, <Partial<IThemeService>>{
+		instantiationService.stub(IThemeService, {
 			getColorTheme() {
-				return {
+				return <IColorTheme>{
 					getTokenStyleMetadata: (tokenType, tokenModifiers, languageId): ITokenStyle => {
 						return {
 							foreground: parseInt(tokenType.substr(2), 10),

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, <Partial<IModelService>>{ getModel() { return null; } });
-		instantiationService.stub(ILanguageService, <Partial<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));
 	});

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, <Partial<INativeEnvironmentService>>{ extensionsDownloadLocation: joinPath(ROOT, 'CachedExtensionVSIXs') });
-		instantiationService.stub(IExtensionGalleryService, <Partial<IExtensionGalleryService>>{
+		instantiationService.stub(INativeEnvironmentService, { extensionsDownloadLocation: joinPath(ROOT, 'CachedExtensionVSIXs') });
+		instantiationService.stub(IExtensionGalleryService, {
 			async download(extension, location, operation) {
 				await fileService.writeFile(location, VSBuffer.fromString('extension vsix'));
 			},

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, <Partial<IEnvironmentService>>{
+		const environmentService = this.instantiationService.stub(IEnvironmentService, {
 			userDataSyncHome,
 			userRoamingDataHome,
 			cacheHome: joinPath(userRoamingDataHome, 'cache'),
@@ -117,15 +117,15 @@ 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, <Partial<IExtensionManagementService>>{
+		this.instantiationService.stub(IExtensionManagementService, {
 			async getInstalled() { return []; },
 			onDidInstallExtensions: new Emitter<readonly InstallExtensionResult[]>().event,
 			onDidUninstallExtension: new Emitter<DidUninstallExtensionEvent>().event,
 		});
 		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, <Partial<IExtensionGalleryService>>{
+		this.instantiationService.stub(IExtensionGalleryService, {
 			isEnabled() { return true; },
 			async getCompatibleExtension() { return null; }
 		});

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, <Partial<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<IEditSessionsStorageService>() {

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, <Partial<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, <Partial<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);
 	});

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<InstallExtensionEvent>,
-		didInstallEvent: Emitter<readonly InstallExtensionResult[]>,
-		uninstallEvent: Emitter<UninstallExtensionEvent>,
-		didUninstallEvent: Emitter<DidUninstallExtensionEvent>;
 	let prompted: boolean;
 	let promptedEmitter: Emitter<void>;
 	let onModelAddedEvent: Emitter<ITextModel>;
@@ -207,30 +202,26 @@ suite('ExtensionRecommendationsService Test', () => {
 		disposableStore = new DisposableStore();
 		instantiationService = disposableStore.add(new TestInstantiationService());
 		promptedEmitter = disposableStore.add(new Emitter<void>());
-		installEvent = disposableStore.add(new Emitter<InstallExtensionEvent>());
-		didInstallEvent = disposableStore.add(new Emitter<readonly InstallExtensionResult[]>());
-		uninstallEvent = disposableStore.add(new Emitter<UninstallExtensionEvent>());
-		didUninstallEvent = disposableStore.add(new Emitter<DidUninstallExtensionEvent>());
 		instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService);
 		instantiationService.stub(ISharedProcessService, TestSharedProcessService);
 		instantiationService.stub(ILifecycleService, disposableStore.add(new TestLifecycleService()));
 		testConfigurationService = new TestConfigurationService();
 		instantiationService.stub(IConfigurationService, testConfigurationService);
 		instantiationService.stub(INotificationService, new TestNotificationService());
 		instantiationService.stub(IContextKeyService, new MockContextKeyService());
-		instantiationService.stub(IExtensionManagementService, <Partial<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 []; },
 			async canInstall() { return true; },
 			async getExtensionsControlManifest() { return { malicious: [], deprecated: {}, search: [] }; },
 			async getTargetPlatform() { return getTargetPlatform(platform, arch); }
 		});
-		instantiationService.stub(IExtensionService, <Partial<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, <Partial<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<ITextModel>();
 
-		instantiationService.stub(IEnvironmentService, <Partial<IEnvironmentService>>{});
+		instantiationService.stub(IEnvironmentService, {});
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []);
 		instantiationService.stub(IExtensionGalleryService, 'isEnabled', true);
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage<IGalleryExtension>(...mockExtensionGallery));