Fixing / supressing more implict index errors

mjbvz · mjbvz · commit 61168fcf4090 · 2019-07-10T14:31:34.000-07:00
microsoft#76442
diff --git a/src/vs/base/common/types.ts b/src/vs/base/common/types.ts
@@ -170,9 +170,9 @@ export function getAllPropertyNames(obj: object): string[] {
 }
 
 export function getAllMethodNames(obj: object): string[] {
-	let methods: string[] = [];
+	const methods: string[] = [];
 	for (const prop of getAllPropertyNames(obj)) {
-		if (typeof obj[prop] === 'function') {
+		if (typeof (obj as any)[prop] === 'function') {
 			methods.push(prop);
 		}
 	}
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
@@ -584,9 +584,10 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		// Config (combination of process.argv and window configuration)
 		const environment = parseArgs(process.argv);
 		const config = objects.assign(environment, windowConfiguration);
-		for (let key in config) {
-			if (config[key] === undefined || config[key] === null || config[key] === '' || config[key] === false) {
-				delete config[key]; // only send over properties that have a true value
+		for (const key in config) {
+			const configValue = (config as any)[key];
+			if (configValue === undefined || configValue === null || configValue === '' || configValue === false) {
+				delete (config as any)[key]; // only send over properties that have a true value
 			}
 		}
 
diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts
@@ -290,14 +290,11 @@ export interface EncodedTokensProvider {
 }
 
 function isEncodedTokensProvider(provider: TokensProvider | EncodedTokensProvider): provider is EncodedTokensProvider {
-	return provider['tokenizeEncoded'];
+	return 'tokenizeEncoded' in provider;
 }
 
 function isThenable<T>(obj: any): obj is Thenable<T> {
-	if (typeof obj.then === 'function') {
-		return true;
-	}
-	return false;
+	return obj && typeof obj.then === 'function';
 }
 
 /**
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -1018,7 +1018,7 @@ export class ChangeModeAction extends Action {
 
 				// If the association is already being made in the workspace, make sure to target workspace settings
 				let target = ConfigurationTarget.USER;
-				if (fileAssociationsConfig.workspace && !!fileAssociationsConfig.workspace[associationKey]) {
+				if (fileAssociationsConfig.workspace && !!(fileAssociationsConfig.workspace as any)[associationKey]) {
 					target = ConfigurationTarget.WORKSPACE;
 				}
 
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -1117,11 +1117,12 @@ export class SettingsEditor2 extends BaseEditor {
 		const nlpResult = results[SearchResultIdx.Remote];
 		const nlpMetadata = nlpResult && nlpResult.metadata;
 
-		const durations = {};
-		durations['nlpResult'] = nlpMetadata && nlpMetadata.duration;
+		const durations = {
+			nlpResult: nlpMetadata && nlpMetadata.duration
+		};
 
 		// Count unique results
-		const counts = {};
+		const counts: { nlpResult?: number, filterResult?: number } = {};
 		const filterResult = results[SearchResultIdx.Local];
 		if (filterResult) {
 			counts['filterResult'] = filterResult.filterMatches.length;
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -702,17 +702,16 @@ export class SettingExcludeRenderer extends AbstractSettingRenderer implements I
 				}
 			}
 
-			const sortKeys = (obj: Object) => {
-				const keyArray = Object.keys(obj)
-					.map(key => ({ key, val: obj[key] }))
-					.sort((a, b) => a.key.localeCompare(b.key));
-
-				const retVal = {};
-				keyArray.forEach(pair => {
-					retVal[pair.key] = pair.val;
-				});
+			function sortKeys<T extends object>(obj: T) {
+				const sortedKeys = Object.keys(obj)
+					.sort((a, b) => a.localeCompare(b)) as Array<keyof T>;
+
+				const retVal: Partial<T> = {};
+				for (const key of sortedKeys) {
+					retVal[key] = obj[key];
+				}
 				return retVal;
-			};
+			}
 
 			this._onDidChangeSetting.fire({
 				key: template.context.setting.key,
diff --git a/src/vs/workbench/contrib/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/contrib/preferences/electron-browser/preferencesSearch.ts
@@ -19,6 +19,7 @@ import { ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { nullRange } from 'vs/workbench/services/preferences/common/preferencesModels';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { PreferencesSearchService as LocalPreferencesSearchService, SettingMatches } from 'vs/workbench/contrib/preferences/browser/preferencesSearch';
+import { IStringDictionary } from 'vs/base/common/collections';
 
 export interface IEndpointDetails {
 	urlBase?: string;
@@ -252,7 +253,7 @@ class RemoteSearchProvider implements ISearchProvider {
 		}
 
 		const requestType = details.body ? 'post' : 'get';
-		const headers = {
+		const headers: IStringDictionary<string> = {
 			'User-Agent': 'request',
 			'Content-Type': 'application/json; charset=utf-8',
 		};

Original file line number	Diff line number	Diff line change
`@@ -170,9 +170,9 @@ export function getAllPropertyNames(obj: object): string[] {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`export function getAllMethodNames(obj: object): string[] {`
`173`		`- let methods: string[] = [];`
	`173`	`+ const methods: string[] = [];`
`174`	`174`	`for (const prop of getAllPropertyNames(obj)) {`
`175`		`- if (typeof obj[prop] === 'function') {`
	`175`	`+ if (typeof (obj as any)[prop] === 'function') {`
`176`	`176`	`methods.push(prop);`
`177`	`177`	`}`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -584,9 +584,10 @@ export class CodeWindow extends Disposable implements ICodeWindow {`
`584`	`584`	`// Config (combination of process.argv and window configuration)`
`585`	`585`	`const environment = parseArgs(process.argv);`
`586`	`586`	`const config = objects.assign(environment, windowConfiguration);`
`587`		`- for (let key in config) {`
`588`		`- if (config[key] === undefined \|\| config[key] === null \|\| config[key] === '' \|\| config[key] === false) {`
`589`		`- delete config[key]; // only send over properties that have a true value`
	`587`	`+ for (const key in config) {`
	`588`	`+ const configValue = (config as any)[key];`
	`589`	`+ if (configValue === undefined \|\| configValue === null \|\| configValue === '' \|\| configValue === false) {`
	`590`	`+ delete (config as any)[key]; // only send over properties that have a true value`
`590`	`591`	`}`
`591`	`592`	`}`
`592`	`593`
Original file line number	Diff line number	Diff line change
`@@ -290,14 +290,11 @@ export interface EncodedTokensProvider {`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`function isEncodedTokensProvider(provider: TokensProvider \| EncodedTokensProvider): provider is EncodedTokensProvider {`
`293`		`- return provider['tokenizeEncoded'];`
	`293`	`+ return 'tokenizeEncoded' in provider;`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`function isThenable<T>(obj: any): obj is Thenable<T> {`
`297`		`- if (typeof obj.then === 'function') {`
`298`		`- return true;`
`299`		`- }`
`300`		`- return false;`
	`297`	`+ return obj && typeof obj.then === 'function';`
`301`	`298`	`}`
`302`	`299`
`303`	`300`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1018,7 +1018,7 @@ export class ChangeModeAction extends Action {`
`1018`	`1018`
`1019`	`1019`	`// If the association is already being made in the workspace, make sure to target workspace settings`
`1020`	`1020`	`let target = ConfigurationTarget.USER;`
`1021`		`- if (fileAssociationsConfig.workspace && !!fileAssociationsConfig.workspace[associationKey]) {`
	`1021`	`+ if (fileAssociationsConfig.workspace && !!(fileAssociationsConfig.workspace as any)[associationKey]) {`
`1022`	`1022`	`target = ConfigurationTarget.WORKSPACE;`
`1023`	`1023`	`}`
`1024`	`1024`