Fix type imports and ESLint directives

andyleejordan · andyleejordan · commit 499221972311 · 2025-05-15T14:18:16.000-07:00
diff --git a/src/extension.ts b/src/extension.ts
@@ -10,7 +10,7 @@ import { DebugSessionFeature } from "./features/DebugSession";
 import { ExamplesFeature } from "./features/Examples";
 import { ExpandAliasFeature } from "./features/ExpandAlias";
 import { ExtensionCommandsFeature } from "./features/ExtensionCommands";
-import { ExternalApiFeature, IPowerShellExtensionClient } from "./features/ExternalApi";
+import { ExternalApiFeature, type IPowerShellExtensionClient } from "./features/ExternalApi";
 import { GenerateBugReportFeature } from "./features/GenerateBugReport";
 import { GetCommandsFeature } from "./features/GetCommands";
 import { HelpCompletionFeature } from "./features/HelpCompletion";
@@ -82,7 +82,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<IPower
                     // e.g. /** | */
                     // eslint-disable-next-line no-useless-escape
                     beforeText: /^\s*\/\*\*(?!\/)([^\*]|\*(?!\/))*$/,
-                    // eslint-disable-next-line no-useless-escape
                     afterText: /^\s*\*\/$/,
                     action: { indentAction: vscode.IndentAction.IndentOutdent, appendText: " * " },
                 },
@@ -201,7 +200,7 @@ function registerWaitForPsesActivationCommand(context: vscode.ExtensionContext):
             const pidFile = vscode.Uri.joinPath(context.globalStorageUri, "sessions", pidFileName);
             const fs = vscode.workspace.fs;
             // Wait for the file to be created
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition, no-constant-condition
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
             while (true) {
                 try {
                     const pidContent = await fs.readFile(pidFile);
diff --git a/src/features/CodeActions.ts b/src/features/CodeActions.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import vscode = require("vscode");
-import { ILogger } from "../logging";
+import type { ILogger } from "../logging";
 
 export class CodeActionsFeature implements vscode.Disposable {
     private command: vscode.Disposable;
diff --git a/src/features/Console.ts b/src/features/Console.ts
@@ -4,8 +4,11 @@
 import vscode = require("vscode");
 import { NotificationType, RequestType } from "vscode-languageclient";
 import { LanguageClient } from "vscode-languageclient/node";
-import { ICheckboxQuickPickItem, showCheckboxQuickPick } from "../controls/checkboxQuickPick";
-import { ILogger } from "../logging";
+import {
+  type ICheckboxQuickPickItem,
+  showCheckboxQuickPick,
+} from "../controls/checkboxQuickPick";
+import type { ILogger } from "../logging";
 import { getSettings } from "../settings";
 import { LanguageClientConsumer } from "../languageClientConsumer";
 
diff --git a/src/features/DebugSession.ts b/src/features/DebugSession.ts
@@ -2,39 +2,39 @@
 // Licensed under the MIT License.
 
 import {
-    debug,
-    CancellationToken,
-    CancellationTokenSource,
-    DebugAdapterDescriptor,
-    DebugAdapterDescriptorFactory,
-    DebugAdapterExecutable,
-    DebugAdapterNamedPipeServer,
-    DebugConfiguration,
-    DebugConfigurationProvider,
-    DebugSession,
-    ExtensionContext,
-    WorkspaceFolder,
-    Disposable,
-    window,
-    extensions,
-    workspace,
-    commands,
-    InputBoxOptions,
-    QuickPickItem,
-    QuickPickOptions,
-    DebugConfigurationProviderTriggerKind,
-    DebugAdapterTrackerFactory,
-    DebugAdapterTracker,
-    LogOutputChannel
+  debug,
+  type CancellationToken,
+  CancellationTokenSource,
+  type DebugAdapterDescriptor,
+  type DebugAdapterDescriptorFactory,
+  DebugAdapterExecutable,
+  DebugAdapterNamedPipeServer,
+  type DebugConfiguration,
+  type DebugConfigurationProvider,
+  type DebugSession,
+  type ExtensionContext,
+  type WorkspaceFolder,
+  Disposable,
+  window,
+  extensions,
+  workspace,
+  commands,
+  type InputBoxOptions,
+  type QuickPickItem,
+  type QuickPickOptions,
+  DebugConfigurationProviderTriggerKind,
+  type DebugAdapterTrackerFactory,
+  type DebugAdapterTracker,
+  type LogOutputChannel,
 } from "vscode";
 import type { DebugProtocol } from "@vscode/debugprotocol";
 import { NotificationType, RequestType } from "vscode-languageclient";
 import { LanguageClient } from "vscode-languageclient/node";
 import { LanguageClientConsumer } from "../languageClientConsumer";
-import { ILogger } from "../logging";
+import type { ILogger } from "../logging";
 import { OperatingSystem, getPlatformDetails } from "../platform";
 import { PowerShellProcess } from "../process";
-import { IEditorServicesSessionDetails, SessionManager } from "../session";
+import { type IEditorServicesSessionDetails, SessionManager } from "../session";
 import { getSettings } from "../settings";
 import path from "path";
 import { checkIfFileExists } from "../utils";
@@ -703,7 +703,6 @@ interface IProcessItem extends QuickPickItem {
     processId: number; // payload for the QuickPick UI
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 interface IGetPSHostProcessesArguments {
 }
 
@@ -722,7 +721,6 @@ interface IRunspaceItem extends QuickPickItem {
     id: number; // payload for the QuickPick UI
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 interface IGetRunspaceRequestArguments {
 }
 
diff --git a/src/features/ExpandAlias.ts b/src/features/ExpandAlias.ts
@@ -6,11 +6,9 @@ import { RequestType } from "vscode-languageclient";
 import { LanguageClientConsumer } from "../languageClientConsumer";
 import type { LanguageClient } from "vscode-languageclient/node";
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 interface IExpandAliasRequestArguments {
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 interface IExpandAliasRequestResponse {
     text: string
 }
diff --git a/src/features/ExtensionCommands.ts b/src/features/ExtensionCommands.ts
@@ -8,7 +8,7 @@ import {
     Position, Range, RequestType
 } from "vscode-languageclient";
 import { LanguageClient } from "vscode-languageclient/node";
-import { ILogger } from "../logging";
+import type { ILogger } from "../logging";
 import { getSettings, validateCwdSetting } from "../settings";
 import { LanguageClientConsumer } from "../languageClientConsumer";
 import { DebugConfig, DebugConfigurations } from "./DebugSession";
@@ -64,7 +64,6 @@ export const GetEditorContextRequestType =
     new RequestType<IGetEditorContextRequestArguments, IEditorContext, void>(
         "editor/getEditorContext");
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface IGetEditorContextRequestArguments {
 }
 
diff --git a/src/features/ExternalApi.ts b/src/features/ExternalApi.ts
@@ -3,7 +3,7 @@
 
 import * as vscode from "vscode";
 import { v4 as uuidv4 } from "uuid";
-import { ILogger } from "../logging";
+import type { ILogger } from "../logging";
 import { SessionManager } from "../session";
 
 export interface IExternalPowerShellDetails {
diff --git a/src/features/HelpCompletion.ts b/src/features/HelpCompletion.ts
@@ -3,18 +3,16 @@
 
 import {
     Disposable, EndOfLine, Range, SnippetString,
-    TextDocument, TextDocumentChangeEvent, window, workspace
+    type TextDocument, type TextDocumentChangeEvent, window, workspace
 } from "vscode";
 import { RequestType } from "vscode-languageclient";
 import { LanguageClient } from "vscode-languageclient/node";
 import { Settings, CommentType, getSettings } from "../settings";
 import { LanguageClientConsumer } from "../languageClientConsumer";
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 interface ICommentHelpRequestArguments {
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 interface ICommentHelpRequestResponse {
     content: string[]
 }
diff --git a/src/features/PesterTests.ts b/src/features/PesterTests.ts
@@ -3,7 +3,7 @@
 
 import * as path from "path";
 import vscode = require("vscode");
-import { ILogger } from "../logging";
+import type { ILogger } from "../logging";
 import { SessionManager } from "../session";
 import { getSettings, getChosenWorkspace } from "../settings";
 import utils = require("../utils");
@@ -53,9 +53,7 @@ export class PesterTestsFeature implements vscode.Disposable {
         launchType: LaunchType,
         fileUri?: vscode.Uri): Promise<boolean> {
 
-        if (fileUri === undefined) {
-            fileUri = vscode.window.activeTextEditor?.document.uri;
-        }
+        fileUri ??= vscode.window.activeTextEditor?.document.uri;
 
         if (fileUri === undefined) {
             return false;
diff --git a/src/features/ShowHelp.ts b/src/features/ShowHelp.ts
@@ -6,7 +6,6 @@ import { NotificationType } from "vscode-languageclient";
 import { LanguageClientConsumer } from "../languageClientConsumer";
 import type { LanguageClient } from "vscode-languageclient/node";
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 interface IShowHelpNotificationArguments {
 }
 
diff --git a/src/features/UpdatePowerShell.ts b/src/features/UpdatePowerShell.ts
@@ -5,8 +5,8 @@ import fetch from "node-fetch";
 import { SemVer } from "semver";
 import vscode = require("vscode");
 
-import { ILogger } from "../logging";
-import { IPowerShellVersionDetails } from "../session";
+import type { ILogger } from "../logging";
+import type { IPowerShellVersionDetails } from "../session";
 import { changeSetting, Settings } from "../settings";
 
 interface IUpdateMessageItem extends vscode.MessageItem {
diff --git a/src/logging.ts b/src/logging.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { LogOutputChannel, LogLevel, window, Event } from "vscode";
+import { type LogOutputChannel, LogLevel, window, type Event } from "vscode";
 
 /** Interface for logging operations. New features should use this interface for the "type" of logger.
  *  This will allow for easy mocking of the logger during unit tests.
@@ -140,9 +140,7 @@ export class Logger implements ILogger {
 export class LanguageClientOutputChannelAdapter implements LogOutputChannel {
     private _channel: LogOutputChannel | undefined;
     private get channel(): LogOutputChannel {
-        if (!this._channel) {
-            this._channel = window.createOutputChannel(this.channelName, {log: true});
-        }
+        this._channel ??= window.createOutputChannel(this.channelName, {log: true});
         return this._channel;
     }
 
diff --git a/src/platform.ts b/src/platform.ts
@@ -6,12 +6,11 @@ import * as path from "path";
 import * as process from "process";
 import vscode = require("vscode");
 import { integer } from "vscode-languageserver-protocol";
-import { ILogger } from "./logging";
-import { changeSetting, getSettings, PowerShellAdditionalExePathSettings } from "./settings";
+import type { ILogger } from "./logging";
+import { changeSetting, getSettings, type PowerShellAdditionalExePathSettings } from "./settings";
 import untildify from "untildify";
 
 // This uses require so we can rewire it in unit tests!
-// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-var-requires
 const utils = require("./utils");
 
 const WindowsPowerShell64BitLabel = "Windows PowerShell (x64)";
@@ -631,9 +630,7 @@ class PossiblePowerShellExe implements IPossiblePowerShellExe {
         public readonly suppressWarning = false) { }
 
     public async exists(): Promise<boolean> {
-        if (this.knownToExist === undefined) {
-            this.knownToExist = await utils.checkIfFileExists(this.exePath);
-        }
+        this.knownToExist ??= await utils.checkIfFileExists(this.exePath);
         return this.knownToExist ?? false;
     }
 }
diff --git a/src/process.ts b/src/process.ts
@@ -4,10 +4,10 @@
 import cp = require("child_process");
 import path = require("path");
 import vscode = require("vscode");
-import { ILogger } from "./logging";
+import type { ILogger } from "./logging";
 import { Settings, validateCwdSetting } from "./settings";
 import utils = require("./utils");
-import { IEditorServicesSessionDetails } from "./session";
+import type { IEditorServicesSessionDetails } from "./session";
 import { promisify } from "util";
 
 export class PowerShellProcess {
diff --git a/src/session.ts b/src/session.ts
@@ -4,25 +4,49 @@
 import net = require("net");
 import path = require("path");
 import vscode = require("vscode");
-import TelemetryReporter, { TelemetryEventProperties, TelemetryEventMeasurements } from "@vscode/extension-telemetry";
+import TelemetryReporter, {
+  type TelemetryEventProperties,
+  type TelemetryEventMeasurements,
+} from "@vscode/extension-telemetry";
 import { Message } from "vscode-jsonrpc";
-import { ILogger, LanguageClientOutputChannelAdapter, LspTraceParser, PsesParser } from "./logging";
+import {
+  type ILogger,
+  LanguageClientOutputChannelAdapter,
+  LspTraceParser,
+  PsesParser,
+} from "./logging";
 import { PowerShellProcess } from "./process";
-import { Settings, changeSetting, getSettings, getEffectiveConfigurationTarget, validateCwdSetting } from "./settings";
+import {
+  Settings,
+  changeSetting,
+  getSettings,
+  getEffectiveConfigurationTarget,
+  validateCwdSetting,
+} from "./settings";
 import utils = require("./utils");
 
 import {
-    CloseAction, CloseHandlerResult, DocumentSelector, ErrorAction, ErrorHandlerResult,
-    LanguageClientOptions, Middleware, NotificationType,
-    RequestType0, ResolveCodeLensSignature,
-    RevealOutputChannelOn,
+  CloseAction,
+  type CloseHandlerResult,
+  DocumentSelector,
+  ErrorAction,
+  type ErrorHandlerResult,
+  type LanguageClientOptions,
+  type Middleware,
+  NotificationType,
+  RequestType0,
+  type ResolveCodeLensSignature,
+  RevealOutputChannelOn,
 } from "vscode-languageclient";
-import { LanguageClient, StreamInfo } from "vscode-languageclient/node";
+import { LanguageClient, type StreamInfo } from "vscode-languageclient/node";
 
 import { UpdatePowerShell } from "./features/UpdatePowerShell";
 import {
-    getPlatformDetails, IPlatformDetails, IPowerShellExeDetails,
-    OperatingSystem, PowerShellExeFinder
+  getPlatformDetails,
+  type IPlatformDetails,
+  type IPowerShellExeDetails,
+  OperatingSystem,
+  PowerShellExeFinder,
 } from "./platform";
 import { LanguageClientConsumer } from "./languageClientConsumer";
 import { SemVer, satisfies } from "semver";
@@ -1067,6 +1091,7 @@ class SessionMenuItem implements vscode.QuickPickItem {
 
     constructor(
         public readonly label: string,
+
         // eslint-disable-next-line @typescript-eslint/no-empty-function
         public readonly callback = async (): Promise<void> => { }) {
     }
diff --git a/src/settings.ts b/src/settings.ts
@@ -4,7 +4,7 @@
 import vscode = require("vscode");
 import utils = require("./utils");
 import os = require("os");
-import { ILogger } from "./logging";
+import type { ILogger } from "./logging";
 import untildify from "untildify";
 import path = require("path");
 
diff --git a/test/core/paths.test.ts b/test/core/paths.test.ts
@@ -3,7 +3,7 @@
 
 import assert from "assert";
 import * as vscode from "vscode";
-import { IPowerShellExtensionClient } from "../../src/features/ExternalApi";
+import type { IPowerShellExtensionClient } from "../../src/features/ExternalApi";
 import utils = require("../utils");
 import { checkIfDirectoryExists, checkIfFileExists, ShellIntegrationScript } from "../../src/utils";
 
diff --git a/test/features/DebugSession.test.ts b/test/features/DebugSession.test.ts
diff --git a/test/features/ExternalApi.test.ts b/test/features/ExternalApi.test.ts
diff --git a/test/features/UpdatePowerShell.test.ts b/test/features/UpdatePowerShell.test.ts
diff --git a/test/utils.ts b/test/utils.ts

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,9 @@ import { RequestType } from "vscode-languageclient";`
`6`	`6`	`import { LanguageClientConsumer } from "../languageClientConsumer";`
`7`	`7`	`import type { LanguageClient } from "vscode-languageclient/node";`
`8`	`8`
`9`		`-// eslint-disable-next-line @typescript-eslint/no-empty-interface`
`10`	`9`	`interface IExpandAliasRequestArguments {`
`11`	`10`	`}`
`12`	`11`
`13`		`-// eslint-disable-next-line @typescript-eslint/no-empty-interface`
`14`	`12`	`interface IExpandAliasRequestResponse {`
`15`	`13`	`text: string`
`16`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import { NotificationType } from "vscode-languageclient";`
`6`	`6`	`import { LanguageClientConsumer } from "../languageClientConsumer";`
`7`	`7`	`import type { LanguageClient } from "vscode-languageclient/node";`
`8`	`8`
`9`		`-// eslint-disable-next-line @typescript-eslint/no-empty-interface`
`10`	`9`	`interface IShowHelpNotificationArguments {`
`11`	`10`	`}`
`12`	`11`