Fix or supress more implict index access errors

mjbvz · mjbvz · commit ff6d60429405 · 2019-07-10T14:05:48.000-07:00
For microsoft#76442
diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts
@@ -212,12 +212,12 @@ export class SimpleWorkerClient<W extends object, H extends object> extends Disp
 				this._worker.postMessage(msg);
 			},
 			handleMessage: (method: string, args: any[]): Promise<any> => {
-				if (typeof host[method] !== 'function') {
+				if (typeof (host as any)[method] !== 'function') {
 					return Promise.reject(new Error('Missing method ' + method + ' on main thread host.'));
 				}
 
 				try {
-					return Promise.resolve(host[method].apply(host, args));
+					return Promise.resolve((host as any)[method].apply(host, args));
 				} catch (e) {
 					return Promise.reject(e);
 				}
diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -336,7 +336,7 @@ export class IssueReporter extends Disposable {
 			this.render();
 		});
 
-		['includeSystemInfo', 'includeProcessInfo', 'includeWorkspaceInfo', 'includeExtensions', 'includeSearchedExtensions', 'includeSettingsSearchDetails'].forEach(elementId => {
+		(['includeSystemInfo', 'includeProcessInfo', 'includeWorkspaceInfo', 'includeExtensions', 'includeSearchedExtensions', 'includeSettingsSearchDetails'] as const).forEach(elementId => {
 			this.addEventListener(elementId, 'click', (event: Event) => {
 				event.stopPropagation();
 				this.issueReporterModel.update({ [elementId]: !this.issueReporterModel.getData()[elementId] });
diff --git a/src/vs/editor/common/services/webWorker.ts b/src/vs/editor/common/services/webWorker.ts
@@ -52,13 +52,13 @@ export interface IWebWorkerOptions {
 	/**
 	 * An object that can be used by the web worker to make calls back to the main thread.
 	 */
-	host?: object;
+	host?: any;
 }
 
 class MonacoWebWorkerImpl<T> extends EditorWorkerClient implements MonacoWebWorker<T> {
 
 	private readonly _foreignModuleId: string;
-	private readonly _foreignModuleHost: object | null;
+	private readonly _foreignModuleHost: { [method: string]: Function } | null;
 	private _foreignModuleCreateData: any | null;
 	private _foreignProxy: Promise<T> | null;
 
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -989,7 +989,7 @@ declare namespace monaco.editor {
 		/**
 		 * An object that can be used by the web worker to make calls back to the main thread.
 		 */
-		host?: object;
+		host?: any;
 	}
 
 	/**
diff --git a/src/vs/platform/instantiation/common/instantiationService.ts b/src/vs/platform/instantiation/common/instantiationService.ts
@@ -222,10 +222,10 @@ export class InstantiationService implements IInstantiationService {
 			const idle = new IdleValue(() => this._createInstance<T>(ctor, args, _trace));
 			return <T>new Proxy(Object.create(null), {
 				get(_target: T, prop: PropertyKey): any {
-					return idle.getValue()[prop];
+					return (idle.getValue() as any)[prop];
 				},
 				set(_target: T, p: PropertyKey, value: any): boolean {
-					idle.getValue()[p] = value;
+					(idle.getValue() as any)[p] = value;
 					return true;
 				}
 			});
diff --git a/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts b/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
@@ -163,7 +163,7 @@ export class ReviewController implements IEditorContribution {
 	private _emptyThreadsToAddQueue: [number, IEditorMouseEvent | undefined][] = [];
 	private _computeCommentingRangePromise: CancelablePromise<ICommentInfo[]> | null;
 	private _computeCommentingRangeScheduler: Delayer<Array<ICommentInfo | null>> | null;
-	private _pendingCommentCache: { [key: number]: { [key: string]: string } };
+	private _pendingCommentCache: { [key: string]: { [key: string]: string } };
 
 	constructor(
 		editor: ICodeEditor,
@@ -396,7 +396,7 @@ export class ReviewController implements IEditorContribution {
 					return;
 				}
 
-				const pendingCommentText = this._pendingCommentCache[e.owner] && this._pendingCommentCache[e.owner][thread.threadId];
+				const pendingCommentText = this._pendingCommentCache[e.owner] && this._pendingCommentCache[e.owner][thread.threadId!];
 				this.displayCommentThread(e.owner, thread, pendingCommentText);
 				this._commentInfos.filter(info => info.owner === e.owner)[0].threads.push(thread);
 			});
@@ -624,7 +624,7 @@ export class ReviewController implements IEditorContribution {
 			info.threads.forEach(thread => {
 				let pendingComment: string | null = null;
 				if (providerCacheStore) {
-					pendingComment = providerCacheStore[thread.threadId];
+					pendingComment = providerCacheStore[thread.threadId!];
 				}
 
 				if (pendingComment) {
@@ -658,10 +658,10 @@ export class ReviewController implements IEditorContribution {
 						this._pendingCommentCache[zone.owner] = {};
 					}
 
-					this._pendingCommentCache[zone.owner][zone.commentThread.threadId] = pendingComment;
+					this._pendingCommentCache[zone.owner][zone.commentThread.threadId!] = pendingComment;
 				} else {
 					if (providerCacheStore) {
-						delete providerCacheStore[zone.commentThread.threadId];
+						delete providerCacheStore[zone.commentThread.threadId!];
 					}
 				}
 
diff --git a/src/vs/workbench/contrib/experiments/electron-browser/experimentService.ts b/src/vs/workbench/contrib/experiments/electron-browser/experimentService.ts
@@ -179,7 +179,7 @@ export class ExperimentService extends Disposable implements IExperimentService
 			if (context.res.statusCode !== 200) {
 				return Promise.resolve(null);
 			}
-			return asJson(context).then(result => {
+			return asJson(context).then((result: any) => {
 				return result && Array.isArray(result['experiments']) ? result['experiments'] : [];
 			});
 		}, () => Promise.resolve(null));
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -206,7 +206,7 @@ export const schema = {
 			type: 'object',
 			properties: {
 				// extensions will fill in
-			},
+			} as { [key: string]: any },
 			default: {}
 		},
 		preview: {

Original file line number	Diff line number	Diff line change
`@@ -212,12 +212,12 @@ export class SimpleWorkerClient<W extends object, H extends object> extends Disp`
`212`	`212`	`this._worker.postMessage(msg);`
`213`	`213`	`},`
`214`	`214`	`handleMessage: (method: string, args: any[]): Promise<any> => {`
`215`		`- if (typeof host[method] !== 'function') {`
	`215`	`+ if (typeof (host as any)[method] !== 'function') {`
`216`	`216`	`return Promise.reject(new Error('Missing method ' + method + ' on main thread host.'));`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`try {`
`220`		`- return Promise.resolve(host[method].apply(host, args));`
	`220`	`+ return Promise.resolve((host as any)[method].apply(host, args));`
`221`	`221`	`} catch (e) {`
`222`	`222`	`return Promise.reject(e);`
`223`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -989,7 +989,7 @@ declare namespace monaco.editor {`
`989`	`989`	`/**`
`990`	`990`	`* An object that can be used by the web worker to make calls back to the main thread.`
`991`	`991`	`*/`
`992`		`- host?: object;`
	`992`	`+ host?: any;`
`993`	`993`	`}`
`994`	`994`
`995`	`995`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ export class ExperimentService extends Disposable implements IExperimentService`
`179`	`179`	`if (context.res.statusCode !== 200) {`
`180`	`180`	`return Promise.resolve(null);`
`181`	`181`	`}`
`182`		`- return asJson(context).then(result => {`
	`182`	`+ return asJson(context).then((result: any) => {`
`183`	`183`	`return result && Array.isArray(result['experiments']) ? result['experiments'] : [];`
`184`	`184`	`});`
`185`	`185`	`}, () => Promise.resolve(null));`