From f3b0ce602fadc0f31e943965a43bb64096c1b85b Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 8 Jul 2019 18:16:48 -0700 Subject: [PATCH] Add index signatures #76442 --- src/vs/editor/common/config/commonEditorConfig.ts | 4 ++-- src/vs/platform/telemetry/common/telemetryUtils.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts index 3752591e93f..5866654f0ca 100644 --- a/src/vs/editor/common/config/commonEditorConfig.ts +++ b/src/vs/editor/common/config/commonEditorConfig.ts @@ -153,8 +153,8 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed return true; } - private static _subsetEquals(base: object, subset: object): boolean { - for (let key in subset) { + private static _subsetEquals(base: { [key: string]: any }, subset: { [key: string]: any }): boolean { + for (const key in subset) { if (hasOwnProperty.call(subset, key)) { const subsetValue = subset[key]; const baseValue = base[key]; diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts index dd9ef9aeea7..ed1b6622f90 100644 --- a/src/vs/platform/telemetry/common/telemetryUtils.ts +++ b/src/vs/platform/telemetry/common/telemetryUtils.ts @@ -54,7 +54,7 @@ export class LogAppender implements ITelemetryAppender { } log(eventName: string, data: any): void { - const strippedData = {}; + const strippedData: { [key: string]: any } = {}; Object.keys(data).forEach(key => { if (!this.commonPropertiesRegex.test(key)) { strippedData[key] = data[key]; @@ -244,7 +244,7 @@ export function keybindingsTelemetry(telemetryService: ITelemetryService, keybin }); } -function flattenKeys(value: Object): string[] { +function flattenKeys(value: Object | undefined): string[] { if (!value) { return []; } @@ -253,7 +253,7 @@ function flattenKeys(value: Object): string[] { return result; } -function flatKeys(result: string[], prefix: string, value: Object): void { +function flatKeys(result: string[], prefix: string, value: { [key: string]: any } | undefined): void { if (value && typeof value === 'object' && !Array.isArray(value)) { Object.keys(value) .forEach(key => flatKeys(result, prefix ? `${prefix}.${key}` : key, value[key])); @@ -262,7 +262,7 @@ function flatKeys(result: string[], prefix: string, value: Object): void { } } -function flattenValues(value: Object, keys: string[]): { [key: string]: any }[] { +function flattenValues(value: { [key: string]: any } | undefined, keys: string[]): { [key: string]: any }[] { if (!value) { return []; } -- GitLab