Enable strictBindCallApply for VS Code

mjbvz · mjbvz · commit e2cf8ebc5d6e · 2018-12-07T14:25:14.000-08:00
Fixes microsoft#64633
diff --git a/src/tsconfig.base.json b/src/tsconfig.base.json
@@ -9,6 +9,7 @@
 		"noUnusedLocals": true,
 		"noImplicitThis": true,
 		"alwaysStrict": true,
+		"strictBindCallApply": true,
 		"baseUrl": ".",
 		"paths": {
 			"vs/*": [
diff --git a/src/vs/base/test/common/winjs.promise.test.ts b/src/vs/base/test/common/winjs.promise.test.ts
@@ -52,7 +52,7 @@ suite('WinJS and ES6 Promises', function () {
 		let p1 = winjs.Promise.wrap<number>(new Promise<number>(function (c, e) { c(1); }));
 		let thenFunc = p1.then.bind(p1);
 		setTimeout(() => {
-			thenFunc(() => { });
+			thenFunc(() => 0);
 		}, 0);
 	});
 
@@ -62,7 +62,7 @@ suite('WinJS and ES6 Promises', function () {
 		let thenFunc = p1.then.bind(p1);
 		setTimeout(() => {
 			c(1);
-			thenFunc(() => { });
+			thenFunc(() => 0);
 		}, 0);
 	});
 });
diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts
@@ -242,7 +242,7 @@ export class StandaloneCommandService implements ICommandService {
 
 		try {
 			this._onWillExecuteCommand.fire({ commandId: id });
-			const result = this._instantiationService.invokeFunction.apply(this._instantiationService, [command.handler].concat(args));
+			const result = this._instantiationService.invokeFunction.apply(this._instantiationService, [command.handler, ...args]) as T;
 			return Promise.resolve(result);
 		} catch (err) {
 			return Promise.reject(err);
diff --git a/src/vs/editor/test/browser/editorTestServices.ts b/src/vs/editor/test/browser/editorTestServices.ts
@@ -44,7 +44,7 @@ export class TestCommandService implements ICommandService {
 
 		try {
 			this._onWillExecuteCommand.fire({ commandId: id });
-			const result = this._instantiationService.invokeFunction.apply(this._instantiationService, [command.handler].concat(args));
+			const result = this._instantiationService.invokeFunction.apply(this._instantiationService, [command.handler, ...args]) as T;
 			return Promise.resolve(result);
 		} catch (err) {
 			return Promise.reject(err);
diff --git a/src/vs/platform/instantiation/common/instantiationService.ts b/src/vs/platform/instantiation/common/instantiationService.ts
@@ -37,7 +37,7 @@ export class InstantiationService implements IInstantiationService {
 		let _trace = Trace.traceInvocation(fn);
 		let _done = false;
 		try {
-			let accessor = {
+			const accessor: ServicesAccessor = {
 				get: <T>(id: ServiceIdentifier<T>, isOptional?: typeof optional) => {
 
 					if (_done) {
@@ -51,7 +51,7 @@ export class InstantiationService implements IInstantiationService {
 					return result;
 				}
 			};
-			return fn.apply(undefined, [accessor].concat(args));
+			return fn.apply(undefined, [accessor, ...args]);
 		} finally {
 			_done = true;
 			_trace.stop();
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -72,7 +72,7 @@ function proposedApiFunction<T>(extension: IExtensionDescription, fn: T): T {
 	if (extension.enableProposedApi) {
 		return fn;
 	} else {
-		return throwProposedApiError.bind(null, extension);
+		return throwProposedApiError.bind(null, extension) as any as T;
 	}
 }
 
diff --git a/src/vs/workbench/api/node/extHostFileSystemEventService.ts b/src/vs/workbench/api/node/extHostFileSystemEventService.ts
@@ -131,9 +131,9 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
 
 	getOnWillRenameFileEvent(extension: IExtensionDescription): Event<vscode.FileWillRenameEvent> {
 		return (listener, thisArg, disposables) => {
-			let wrappedListener = <WillRenameListener><any>function () {
-				listener.apply(thisArg, arguments);
-			};
+			const wrappedListener: WillRenameListener = <any>((e: vscode.FileWillRenameEvent) => {
+				listener.call(thisArg, e);
+			});
 			wrappedListener.extension = extension;
 			return this._onWillRenameFile.event(wrappedListener, undefined, disposables);
 		};
diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
@@ -451,7 +451,7 @@ export class CustomTreeView extends Disposable implements ITreeView {
 	getOptimalWidth(): number {
 		if (this.tree) {
 			const parentNode = this.tree.getHTMLElement();
-			const childNodes = ([] as Element[]).slice.call(parentNode.querySelectorAll('.outline-item-label > a'));
+			const childNodes = ([] as HTMLElement[]).slice.call(parentNode.querySelectorAll('.outline-item-label > a'));
 			return DOM.getLargestChildWidth(parentNode, childNodes);
 		}
 		return 0;
diff --git a/src/vs/workbench/node/proxyResolver.ts b/src/vs/workbench/node/proxyResolver.ts
@@ -227,7 +227,7 @@ function patches(originals: typeof http | typeof https, agent: http.Agent, setti
 
 			const config = onRequest && ((<any>options)._vscodeProxySupport || /* LS */ (<any>options)._vscodeSystemProxy) || setting.config;
 			if (config === 'off') {
-				return original.apply(null, arguments);
+				return original.apply(null, arguments as unknown as any[]);
 			}
 
 			if (!options.socketPath && (config === 'override' || config === 'on' && !options.agent) && options.agent !== agent) {
@@ -247,7 +247,7 @@ function patches(originals: typeof http | typeof https, agent: http.Agent, setti
 				return original(options, callback);
 			}
 
-			return original.apply(null, arguments);
+			return original.apply(null, arguments as unknown as any[]);
 		}
 		return patched;
 	}
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
@@ -472,7 +472,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 
 	public getOptimalWidth(): number {
 		const parentNode = this.explorerViewer.getHTMLElement();
-		const childNodes = ([] as Element[]).slice.call(parentNode.querySelectorAll('.explorer-item .label-name')); // select all file labels
+		const childNodes = ([] as HTMLElement[]).slice.call(parentNode.querySelectorAll('.explorer-item .label-name')); // select all file labels
 
 		return DOM.getLargestChildWidth(parentNode, childNodes);
 	}
diff --git a/src/vs/workbench/services/commands/common/commandService.ts b/src/vs/workbench/services/commands/common/commandService.ts
@@ -60,7 +60,7 @@ export class CommandService extends Disposable implements ICommandService {
 		}
 		try {
 			this._onWillExecuteCommand.fire({ commandId: id });
-			const result = this._instantiationService.invokeFunction.apply(this._instantiationService, [command.handler].concat(args));
+			const result = this._instantiationService.invokeFunction.apply(this._instantiationService, [command.handler, ...args]);
 			return Promise.resolve(result);
 		} catch (err) {
 			return Promise.reject(err);
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHostProcessManager.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHostProcessManager.ts
@@ -224,7 +224,7 @@ class RPCLogger implements IRPCProtocolLogger {
 		} else {
 			args.push(data);
 		}
-		console.log.apply(console, args);
+		console.log.apply(console, args as [string, ...string[]]);
 	}
 
 	logIncoming(msgLength: number, req: number, initiator: RequestInitiator, str: string, data?: any): void {

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ function proposedApiFunction<T>(extension: IExtensionDescription, fn: T): T {`
`72`	`72`	`if (extension.enableProposedApi) {`
`73`	`73`	`return fn;`
`74`	`74`	`} else {`
`75`		`- return throwProposedApiError.bind(null, extension);`
	`75`	`+ return throwProposedApiError.bind(null, extension) as any as T;`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ export class CustomTreeView extends Disposable implements ITreeView {`
`451`	`451`	`getOptimalWidth(): number {`
`452`	`452`	`if (this.tree) {`
`453`	`453`	`const parentNode = this.tree.getHTMLElement();`
`454`		`- const childNodes = ([] as Element[]).slice.call(parentNode.querySelectorAll('.outline-item-label > a'));`
	`454`	`+ const childNodes = ([] as HTMLElement[]).slice.call(parentNode.querySelectorAll('.outline-item-label > a'));`
`455`	`455`	`return DOM.getLargestChildWidth(parentNode, childNodes);`
`456`	`456`	`}`
`457`	`457`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ function patches(originals: typeof http \| typeof https, agent: http.Agent, setti`
`227`	`227`
`228`	`228`	`const config = onRequest && ((<any>options)._vscodeProxySupport \|\| /* LS */ (<any>options)._vscodeSystemProxy) \|\| setting.config;`
`229`	`229`	`if (config === 'off') {`
`230`		`- return original.apply(null, arguments);`
	`230`	`+ return original.apply(null, arguments as unknown as any[]);`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`if (!options.socketPath && (config === 'override' \|\| config === 'on' && !options.agent) && options.agent !== agent) {`
`@@ -247,7 +247,7 @@ function patches(originals: typeof http \| typeof https, agent: http.Agent, setti`
`247`	`247`	`return original(options, callback);`
`248`	`248`	`}`
`249`	`249`
`250`		`- return original.apply(null, arguments);`
	`250`	`+ return original.apply(null, arguments as unknown as any[]);`
`251`	`251`	`}`
`252`	`252`	`return patched;`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView`
`472`	`472`
`473`	`473`	`public getOptimalWidth(): number {`
`474`	`474`	`const parentNode = this.explorerViewer.getHTMLElement();`
`475`		`- const childNodes = ([] as Element[]).slice.call(parentNode.querySelectorAll('.explorer-item .label-name')); // select all file labels`
	`475`	`+ const childNodes = ([] as HTMLElement[]).slice.call(parentNode.querySelectorAll('.explorer-item .label-name')); // select all file labels`
`476`	`476`
`477`	`477`	`return DOM.getLargestChildWidth(parentNode, childNodes);`
`478`	`478`	`}`