From 4d64561e0618a691016929106b17c9ac580e5c64 Mon Sep 17 00:00:00 2001 From: Phil Cohen Date: Mon, 31 Oct 2022 15:24:30 -0700 Subject: [PATCH 1/2] rebuild PR, tag existing unused imports with `unused-imports/no-unused-imports` --- .eslintrc.json | 3 ++- package.json | 1 + .../commonContainingScopeIfUntypedStages.ts | 2 +- .../modifiers/scopeHandlers/BaseScopeHandler.ts | 2 +- src/typings/target.types.ts | 10 +++++----- src/typings/targetDescriptor.types.ts | 2 +- yarn.lock | 12 ++++++++++++ 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index f4088718bf..a349de18a5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -10,7 +10,7 @@ "ecmaVersion": 6, "sourceType": "module" }, - "plugins": ["@typescript-eslint"], + "plugins": ["@typescript-eslint", "unused-imports"], "rules": { "@typescript-eslint/consistent-type-assertions": [ "error", @@ -22,6 +22,7 @@ "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/no-inferrable-types": "off", "@typescript-eslint/no-non-null-assertion": "off", + "unused-imports/no-unused-imports": "error", "@typescript-eslint/no-unused-vars": [ "warn", { diff --git a/package.json b/package.json index c45665aa4d..3d05bc671d 100644 --- a/package.json +++ b/package.json @@ -598,6 +598,7 @@ "esbuild": "^0.11.12", "eslint": "^8.13.0", "eslint-config-prettier": "^8.5.0", + "eslint-plugin-unused-imports": "^2.0.0", "fast-xml-parser": "^3.20.0", "glob": "^7.1.7", "js-yaml": "^4.1.0", diff --git a/src/processTargets/modifiers/commonContainingScopeIfUntypedStages.ts b/src/processTargets/modifiers/commonContainingScopeIfUntypedStages.ts index f7c56ab2ab..362a1246cd 100644 --- a/src/processTargets/modifiers/commonContainingScopeIfUntypedStages.ts +++ b/src/processTargets/modifiers/commonContainingScopeIfUntypedStages.ts @@ -4,7 +4,7 @@ import ModifyIfUntypedStage from "./ModifyIfUntypedStage"; // switch to `{import("foo")}` syntax in the `{@link}` tag. // - https://github.com/microsoft/TypeScript/issues/43869 // - https://github.com/microsoft/TypeScript/issues/43950 -// eslint-disable-next-line @typescript-eslint/no-unused-vars +// eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports import type { Target } from "../../typings/target.types"; /** diff --git a/src/processTargets/modifiers/scopeHandlers/BaseScopeHandler.ts b/src/processTargets/modifiers/scopeHandlers/BaseScopeHandler.ts index 8402452496..a5e5ee3f50 100644 --- a/src/processTargets/modifiers/scopeHandlers/BaseScopeHandler.ts +++ b/src/processTargets/modifiers/scopeHandlers/BaseScopeHandler.ts @@ -1,4 +1,4 @@ -// eslint-disable-next-line @typescript-eslint/no-unused-vars +// eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports import type { Position, Range, TextEditor } from "vscode"; import type { Direction, diff --git a/src/typings/target.types.ts b/src/typings/target.types.ts index 95665006dd..1f09c87698 100644 --- a/src/typings/target.types.ts +++ b/src/typings/target.types.ts @@ -4,16 +4,16 @@ import type { Range, Selection, TextEditor } from "vscode"; // switch to `{import("foo")}` syntax in the `{@link}` tag. // - https://github.com/microsoft/TypeScript/issues/43869 // - https://github.com/microsoft/TypeScript/issues/43950 -// eslint-disable-next-line @typescript-eslint/no-unused-vars +// eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports import type ModifyIfUntypedStage from "../processTargets/modifiers/ModifyIfUntypedStage"; -// eslint-disable-next-line @typescript-eslint/no-unused-vars +// eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports import type { SnippetVariable, Snippet } from "./snippet"; import type { - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports ScopeTypeTarget, - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports TokenTarget, - // eslint-disable-next-line @typescript-eslint/no-unused-vars + // eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports UntypedTarget, } from "../processTargets/targets"; import type { Position } from "./targetDescriptor.types"; diff --git a/src/typings/targetDescriptor.types.ts b/src/typings/targetDescriptor.types.ts index e039ef09b8..f417e7c9c4 100644 --- a/src/typings/targetDescriptor.types.ts +++ b/src/typings/targetDescriptor.types.ts @@ -1,6 +1,6 @@ import { HatStyleName } from "../core/hatStyles"; // FIXME: See microsoft/TypeScript#43869 -// eslint-disable-next-line @typescript-eslint/no-unused-vars +// eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports import type { Target } from "./target.types"; export interface CursorMark { diff --git a/yarn.lock b/yarn.lock index bdf446c4ef..32878908d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -719,6 +719,18 @@ eslint-config-prettier@^8.5.0: resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== +eslint-plugin-unused-imports@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz#d8db8c4d0cfa0637a8b51ce3fd7d1b6bc3f08520" + integrity sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A== + dependencies: + eslint-rule-composer "^0.3.0" + +eslint-rule-composer@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9" + integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg== + eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" From 38a74984a4d265750e1c6536f7d1e76bdf7812ba Mon Sep 17 00:00:00 2001 From: Pokey Rule <755842+pokey@users.noreply.github.com> Date: Fri, 18 Nov 2022 15:42:35 +0000 Subject: [PATCH 2/2] Fix CI --- src/typings/target.types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/typings/target.types.ts b/src/typings/target.types.ts index 230a82daed..1feb2a4243 100644 --- a/src/typings/target.types.ts +++ b/src/typings/target.types.ts @@ -15,7 +15,7 @@ import type { // eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports UntypedTarget, } from "../processTargets/targets"; -// eslint-disable-next-line @typescript-eslint/no-unused-vars +// eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-imports import type { Snippet, SnippetVariable } from "./snippet"; import type { Position } from "./targetDescriptor.types"; import type { EditWithRangeUpdater } from "./Types";