From 6343b113ba0cfae146e2a9d78e02377ef8a70e4e Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 10 Jul 2019 14:08:26 -0700 Subject: [PATCH] Fix implicit index errors and switch to use for-of loops #76442 --- .../common/abstractExtensionService.ts | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts index 6f16a842068..d57fa8b1801 100644 --- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts +++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts @@ -231,14 +231,12 @@ export abstract class AbstractExtensionService extends Disposable implements IEx public readExtensionPointContributions(extPoint: IExtensionPoint): Promise[]> { return this._installedExtensionsReady.wait().then(() => { - let availableExtensions = this._registry.getAllExtensionDescriptions(); - - let result: ExtensionPointContribution[] = [], resultLen = 0; - for (let i = 0, len = availableExtensions.length; i < len; i++) { - let desc = availableExtensions[i]; + const availableExtensions = this._registry.getAllExtensionDescriptions(); + const result: ExtensionPointContribution[] = []; + for (const desc of availableExtensions) { if (desc.contributes && hasOwnProperty.call(desc.contributes, extPoint.name)) { - result[resultLen++] = new ExtensionPointContribution(desc, desc.contributes[extPoint.name]); + result.push(new ExtensionPointContribution(desc, desc.contributes[extPoint.name as keyof typeof desc.contributes])); } } @@ -320,9 +318,9 @@ export abstract class AbstractExtensionService extends Disposable implements IEx const messageHandler = (msg: IMessage) => this._handleExtensionPointMessage(msg); const availableExtensions = this._registry.getAllExtensionDescriptions(); const extensionPoints = ExtensionsRegistry.getExtensionPoints(); - for (let i = 0, len = extensionPoints.length; i < len; i++) { - if (affectedExtensionPoints[extensionPoints[i].name]) { - AbstractExtensionService._handleExtensionPoint(extensionPoints[i], availableExtensions, messageHandler); + for (const extensionPoint of extensionPoints) { + if (affectedExtensionPoints[extensionPoint.name]) { + AbstractExtensionService._handleExtensionPoint(extensionPoint, availableExtensions, messageHandler); } } } @@ -365,16 +363,14 @@ export abstract class AbstractExtensionService extends Disposable implements IEx } private static _handleExtensionPoint(extensionPoint: ExtensionPoint, availableExtensions: IExtensionDescription[], messageHandler: (msg: IMessage) => void): void { - let users: IExtensionPointUser[] = [], usersLen = 0; - for (let i = 0, len = availableExtensions.length; i < len; i++) { - let desc = availableExtensions[i]; - + const users: IExtensionPointUser[] = []; + for (const desc of availableExtensions) { if (desc.contributes && hasOwnProperty.call(desc.contributes, extensionPoint.name)) { - users[usersLen++] = { + users.push({ description: desc, - value: desc.contributes[extensionPoint.name], + value: desc.contributes[extensionPoint.name as keyof typeof desc.contributes], collector: new ExtensionMessageCollector(messageHandler, desc, extensionPoint.name) - }; + }); } } perf.mark(`willHandleExtensionPoint/${extensionPoint.name}`); -- GitLab