Fix more strict function errors

mjbvz · mjbvz · commit 6a85bc726e43 · 2020-02-10T16:45:38.000-08:00
For microsoft#81574
diff --git a/src/vs/platform/instantiation/common/extensions.ts b/src/vs/platform/instantiation/common/extensions.ts
@@ -8,8 +8,8 @@ import { ServiceIdentifier, BrandedService } from './instantiation';
 
 const _registry: [ServiceIdentifier<any>, SyncDescriptor<any>][] = [];
 
-export function registerSingleton<T, Services extends BrandedService[]>(id: ServiceIdentifier<T>, ctor: { new(...services: Services): T }, supportsDelayedInstantiation?: boolean): void {
-	_registry.push([id, new SyncDescriptor<T>(ctor, [], supportsDelayedInstantiation)]);
+export function registerSingleton<T, Services extends BrandedService[]>(id: ServiceIdentifier<T>, ctor: new (...services: Services) => T, supportsDelayedInstantiation?: boolean): void {
+	_registry.push([id, new SyncDescriptor<T>(ctor as new (...args: any[]) => T, [], supportsDelayedInstantiation)]);
 }
 
 export function getSingletonServiceDescriptors(): [ServiceIdentifier<any>, SyncDescriptor<any>][] {
diff --git a/src/vs/platform/instantiation/common/instantiationService.ts b/src/vs/platform/instantiation/common/instantiationService.ts
@@ -64,7 +64,7 @@ export class InstantiationService implements IInstantiationService {
 					return result;
 				}
 			};
-			return fn.apply(undefined, [accessor, ...args]);
+			return fn(accessor, ...args);
 		} finally {
 			_done = true;
 			_trace.stop();
diff --git a/src/vs/workbench/common/contributions.ts b/src/vs/workbench/common/contributions.ts
@@ -43,10 +43,10 @@ class WorkbenchContributionsRegistry implements IWorkbenchContributionsRegistry
 
 	private readonly toBeInstantiated: Map<LifecyclePhase, IConstructorSignature0<IWorkbenchContribution>[]> = new Map<LifecyclePhase, IConstructorSignature0<IWorkbenchContribution>[]>();
 
-	registerWorkbenchContribution<Services extends BrandedService[]>(ctor: { new(...services: Services): IWorkbenchContribution }, phase: LifecyclePhase = LifecyclePhase.Starting): void {
+	registerWorkbenchContribution<Services extends BrandedService[]>(ctor: new (...services: Services) => IWorkbenchContribution, phase: LifecyclePhase = LifecyclePhase.Starting): void {
 		// Instantiate directly if we are already matching the provided phase
 		if (this.instantiationService && this.lifecycleService && this.lifecycleService.phase >= phase) {
-			this.instantiationService.createInstance(ctor);
+			this.instantiationService.createInstance<Services, typeof ctor, IWorkbenchContribution>(ctor);
 		}
 
 		// Otherwise keep contributions by lifecycle phase
@@ -57,7 +57,7 @@ class WorkbenchContributionsRegistry implements IWorkbenchContributionsRegistry
 				this.toBeInstantiated.set(phase, toBeInstantiated);
 			}
 
-			toBeInstantiated.push(ctor);
+			toBeInstantiated.push(ctor as IConstructorSignature0<IWorkbenchContribution>);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import { ServiceIdentifier, BrandedService } from './instantiation';`
`8`	`8`
`9`	`9`	`const _registry: [ServiceIdentifier<any>, SyncDescriptor<any>][] = [];`
`10`	`10`
`11`		`-export function registerSingleton<T, Services extends BrandedService[]>(id: ServiceIdentifier<T>, ctor: { new(...services: Services): T }, supportsDelayedInstantiation?: boolean): void {`
`12`		`- _registry.push([id, new SyncDescriptor<T>(ctor, [], supportsDelayedInstantiation)]);`
	`11`	`+export function registerSingleton<T, Services extends BrandedService[]>(id: ServiceIdentifier<T>, ctor: new (...services: Services) => T, supportsDelayedInstantiation?: boolean): void {`
	`12`	`+ _registry.push([id, new SyncDescriptor<T>(ctor as new (...args: any[]) => T, [], supportsDelayedInstantiation)]);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`export function getSingletonServiceDescriptors(): [ServiceIdentifier<any>, SyncDescriptor<any>][] {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export class InstantiationService implements IInstantiationService {`
`64`	`64`	`return result;`
`65`	`65`	`}`
`66`	`66`	`};`
`67`		`- return fn.apply(undefined, [accessor, ...args]);`
	`67`	`+ return fn(accessor, ...args);`
`68`	`68`	`} finally {`
`69`	`69`	`_done = true;`
`70`	`70`	`_trace.stop();`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,10 @@ class WorkbenchContributionsRegistry implements IWorkbenchContributionsRegistry`
`43`	`43`
`44`	`44`	`private readonly toBeInstantiated: Map<LifecyclePhase, IConstructorSignature0<IWorkbenchContribution>[]> = new Map<LifecyclePhase, IConstructorSignature0<IWorkbenchContribution>[]>();`
`45`	`45`
`46`		`- registerWorkbenchContribution<Services extends BrandedService[]>(ctor: { new(...services: Services): IWorkbenchContribution }, phase: LifecyclePhase = LifecyclePhase.Starting): void {`
	`46`	`+ registerWorkbenchContribution<Services extends BrandedService[]>(ctor: new (...services: Services) => IWorkbenchContribution, phase: LifecyclePhase = LifecyclePhase.Starting): void {`
`47`	`47`	`// Instantiate directly if we are already matching the provided phase`
`48`	`48`	`if (this.instantiationService && this.lifecycleService && this.lifecycleService.phase >= phase) {`
`49`		`- this.instantiationService.createInstance(ctor);`
	`49`	`+ this.instantiationService.createInstance<Services, typeof ctor, IWorkbenchContribution>(ctor);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`// Otherwise keep contributions by lifecycle phase`
`@@ -57,7 +57,7 @@ class WorkbenchContributionsRegistry implements IWorkbenchContributionsRegistry`
`57`	`57`	`this.toBeInstantiated.set(phase, toBeInstantiated);`
`58`	`58`	`}`
`59`	`59`
`60`		`- toBeInstantiated.push(ctor);`
	`60`	`+ toBeInstantiated.push(ctor as IConstructorSignature0<IWorkbenchContribution>);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`