From 8cd82f57cf861eb323715926cfe8685e3c2ced25 Mon Sep 17 00:00:00 2001 From: Venelin Bakalov Date: Thu, 4 Jul 2024 14:54:13 +0300 Subject: [PATCH] Reflect typing issues --- extension/src/__tests__/memento.spec.ts | 8 ++++---- extension/src/client/lint/rule/ToolchainVersionRule.ts | 2 +- extension/src/client/provider/task/TaskProvider.ts | 10 ++++++---- extension/src/client/storage/ScopedMemento.ts | 2 +- extension/src/client/ui/MultiStepMachine.ts | 4 +++- tsconfig.json | 2 -- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/extension/src/__tests__/memento.spec.ts b/extension/src/__tests__/memento.spec.ts index 0fc250dc..32a519c3 100644 --- a/extension/src/__tests__/memento.spec.ts +++ b/extension/src/__tests__/memento.spec.ts @@ -3,15 +3,15 @@ * SPDX-License-Identifier: MIT */ -import { ExtensionContext, Memento } from "vscode" import { sleep } from "@vmware/vrdt-common" +import { ExtensionContext, Memento } from "vscode" import { ScopedMemento } from "../client/storage/ScopedMemento" import "jest-extended" describe("ScopedMemento", () => { - let storage = {} + let storage = {} as any; const MementoMock = jest.fn(() => ({ get: jest.fn((key: string, defaultValue?: any) => { @@ -218,7 +218,7 @@ describe("ScopedMemento", () => { } for (const k of Object.keys(entries)) { - globalState.set(k, entries[k]) + globalState.set(k, (entries as any)[k]) } const all = globalState.all() @@ -239,7 +239,7 @@ describe("ScopedMemento", () => { } for (const k of Object.keys(entries)) { - globalState.set(k, entries[k]) + globalState.set(k, (entries as any)[k]) } globalState.clear() diff --git a/extension/src/client/lint/rule/ToolchainVersionRule.ts b/extension/src/client/lint/rule/ToolchainVersionRule.ts index a7137277..7a19384e 100644 --- a/extension/src/client/lint/rule/ToolchainVersionRule.ts +++ b/extension/src/client/lint/rule/ToolchainVersionRule.ts @@ -75,7 +75,7 @@ export class ToolchainVersionRule extends PomLintRule { return null } - if (PomFile.ParentGroupByArtifact[artifactId] !== groupId) { + if ((PomFile.ParentGroupByArtifact as any)[artifactId] !== groupId) { this.logger.warn(`Not a valid vRO project parent ID - ${groupId}.${artifactId}`) return null } diff --git a/extension/src/client/provider/task/TaskProvider.ts b/extension/src/client/provider/task/TaskProvider.ts index c3dd71a2..729f21f2 100644 --- a/extension/src/client/provider/task/TaskProvider.ts +++ b/extension/src/client/provider/task/TaskProvider.ts @@ -5,18 +5,18 @@ import * as path from "path" +import { AutoWire, Logger, PomFile, TasksInfo } from "@vmware/vrdt-common" import * as fs from "fs-extra" import * as jsonParser from "jsonc-parser" import * as _ from "lodash" import * as micromatch from "micromatch" -import { AutoWire, Logger, PomFile, TasksInfo } from "@vmware/vrdt-common" import * as vscode from "vscode" -import { extensionShortName } from "../../constants" import { Registrable } from "../../Registrable" -import { TASKS_BY_TOOLCHAIN_PARENT, VrealizeTaskConfiguration } from "./DefaultTasksJson" -import { EnvironmentManager } from "../../system" +import { extensionShortName } from "../../constants" import { ScopedMemento } from "../../storage/ScopedMemento" +import { EnvironmentManager } from "../../system" +import { TASKS_BY_TOOLCHAIN_PARENT, VrealizeTaskConfiguration } from "./DefaultTasksJson" interface VrealizeTaskDefinition extends vscode.TaskDefinition { command: string @@ -109,6 +109,8 @@ export class TaskProvider implements vscode.TaskProvider, Registrable { const pomFile = new PomFile(pomFilePath) if (!micromatch.any(`${pomFile.groupId}:${pomFile.artifactId}`, excludePatterns)) { + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + //@ts-ignore const defaultTasks: VrealizeTaskConfiguration[] = TASKS_BY_TOOLCHAIN_PARENT[pomFile.parentId] || [] for (const task of defaultTasks) { diff --git a/extension/src/client/storage/ScopedMemento.ts b/extension/src/client/storage/ScopedMemento.ts index 6ba9700a..6dbb2715 100644 --- a/extension/src/client/storage/ScopedMemento.ts +++ b/extension/src/client/storage/ScopedMemento.ts @@ -109,7 +109,7 @@ export class ScopedMemento { } all() { - const items = {} + const items = {} as any; for (const key in this.state) { items[key] = this.state[key].value } diff --git a/extension/src/client/ui/MultiStepMachine.ts b/extension/src/client/ui/MultiStepMachine.ts index d4d9631e..1b85618e 100644 --- a/extension/src/client/ui/MultiStepMachine.ts +++ b/extension/src/client/ui/MultiStepMachine.ts @@ -3,8 +3,8 @@ * SPDX-License-Identifier: MIT */ -import { InputBox, QuickInputButton, QuickPick, QuickPickItem } from "vscode" import { Logger } from "@vmware/vrdt-common" +import { InputBox, QuickInputButton, QuickPick, QuickPickItem } from "vscode" export class BreakMultiStep extends Error { constructor() { @@ -25,6 +25,7 @@ export interface QuickInputStep { title?: string maskChars?: boolean value?: string + isHead?: boolean onDidClickButton?(input: InputBox, button: QuickInputButton): void validate?(value: string | undefined): [boolean, string | undefined] | Promise<[boolean, string | undefined]> @@ -48,6 +49,7 @@ export interface QuickPickStep { selectedItems?: T[] title?: string value?: string + isHead?: boolean onDidAccept?(quickpick: QuickPick): boolean | Promise onDidChangeValue?(quickpick: QuickPick): boolean | Promise diff --git a/tsconfig.json b/tsconfig.json index 0393c3e4..872ee9d3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,8 +18,6 @@ "noEmitOnError": false, "noFallthroughCasesInSwitch": true, "forceConsistentCasingInFileNames": true, - "suppressImplicitAnyIndexErrors": true, - "ignoreDeprecations": "5.0", "strictNullChecks": true, "strictBindCallApply": true, "experimentalDecorators": true,