Bump ESLint packages to v6

.eslintrc.json

@@ -5,19 +5,16 @@
   },
   "extends": [
     "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:@typescript-eslint/recommended-requiring-type-checking",
-    "plugin:@typescript-eslint/strict"
+    "plugin:@typescript-eslint/stylistic-type-checked",
+    "plugin:@typescript-eslint/strict-type-checked"
   ],
   "overrides": [],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaVersion": "latest",
     "sourceType": "module",
     "tsconfigRootDir": ".",
-    "project": [
-      "./tsconfig.json"
-    ]
+    "project": true
   },
   "plugins": [
     "@typescript-eslint",

package.json

@@ -92,13 +92,13 @@
     "@types/ungap__structured-clone": "0.3.0",
     "@types/uuid": "9.0.2",
     "@types/vscode": "1.67.0",
-    "@typescript-eslint/eslint-plugin": "5.61.0",
-    "@typescript-eslint/parser": "5.61.0",
+    "@typescript-eslint/eslint-plugin": "6.1.0",
+    "@typescript-eslint/parser": "6.1.0",
     "@ungap/structured-clone": "1.2.0",
     "@vscode/test-electron": "2.3.3",
     "@vscode/vsce": "2.19.0",
-    "esbuild": "0.18.11",
-    "eslint": "8.44.0",
+    "esbuild": "0.18.13",
+    "eslint": "8.45.0",
     "eslint-plugin-header": "3.1.1",
     "glob": "10.3.3",
     "mocha": "10.2.0",

src/features/DebugSession.ts

@@ -567,7 +567,7 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
                 (resolve, reject) => {
                     this.getLanguageClientResolve = resolve;
 
-                    window
+                    void window
                         .showQuickPick(
                             ["Cancel"],
                             { placeHolder: "Attach to PowerShell host process: Please wait, starting PowerShell..." },
@@ -692,7 +692,7 @@ export class PickRunspaceFeature extends LanguageClientConsumer {
                 (resolve, reject) => {
                     this.getLanguageClientResolve = resolve;
 
-                    window
+                    void window
                         .showQuickPick(
                             ["Cancel"],
                             { placeHolder: "Attach to PowerShell host process: Please wait, starting PowerShell..." },

src/features/ExtensionCommands.ts

@@ -203,7 +203,7 @@ export class ExtensionCommandsFeature extends LanguageClientConsumer {
         this.handlers = [
             this.languageClient.onNotification(
                 ExtensionCommandAddedNotificationType,
-                (command) => this.addExtensionCommand(command)),
+                (command) => { this.addExtensionCommand(command); }),
 
             this.languageClient.onRequest(
                 GetEditorContextRequestType,

src/features/GetCommands.ts

@@ -34,8 +34,8 @@ export class GetCommandsFeature extends LanguageClientConsumer {
         super();
         this.commands = [
             vscode.commands.registerCommand("PowerShell.RefreshCommandsExplorer",
-                async () => await this.CommandExplorerRefresh()),
-            vscode.commands.registerCommand("PowerShell.InsertCommand", async (item) => await this.InsertCommand(item))
+                async () => { await this.CommandExplorerRefresh(); }),
+            vscode.commands.registerCommand("PowerShell.InsertCommand", async (item) => { await this.InsertCommand(item); })
         ];
         this.commandsExplorerProvider = new CommandsExplorerProvider();
 

src/features/RemoteFiles.ts

@@ -69,7 +69,7 @@ export class RemoteFilesFeature extends LanguageClientConsumer {
 
             await vscode.window.showTextDocument(doc);
             await vscode.commands.executeCommand("workbench.action.closeActiveEditor");
-            return await innerCloseFiles();
+            await innerCloseFiles();
         }
 
         void innerCloseFiles();

src/features/UpdatePowerShell.ts

@@ -156,7 +156,8 @@ export class UpdatePowerShell {
         try {
             const tag = await this.maybeGetNewRelease();
             if (tag) {
-                return await this.promptToUpdate(tag);
+                await this.promptToUpdate(tag);
+                return;
             }
         } catch (err) {
             // Best effort. This probably failed to fetch the data from GitHub.

src/process.ts

@@ -114,7 +114,7 @@ export class PowerShellProcess {
         // all terminals and the event itself checks if it's our terminal). This
         // subscription should happen before we create the terminal so if it
         // fails immediately, the event fires.
-        this.consoleCloseSubscription = vscode.window.onDidCloseTerminal((terminal) => this.onTerminalClose(terminal));
+        this.consoleCloseSubscription = vscode.window.onDidCloseTerminal((terminal) => { this.onTerminalClose(terminal); });
         this.consoleTerminal = vscode.window.createTerminal(terminalOptions);
         this.pid = await this.getPid();
         this.logger.write(`PowerShell process started with PID: ${this.pid}`);

src/session.ts

@@ -155,7 +155,8 @@ export class SessionManager implements Middleware {
         case SessionStatus.Starting:
             // A simple lock because this function isn't re-entrant.
             this.logger.writeWarning("Re-entered 'start' so waiting...");
-            return await this.waitWhileStarting();
+            await this.waitWhileStarting();
+            return;
         case SessionStatus.Running:
             // We're started, just return.
             this.logger.writeVerbose("Already started.");

test/features/DebugSession.test.ts

@@ -489,8 +489,8 @@ describe("DebugSessionFeature E2E", () => {
 
             const debugStarted = await debug.startDebugging(undefined, launchScriptConfig);
             assert.ok(debugStarted);
-            const debugStopped = await debug.stopDebugging(undefined);
-            assert.ok(debugStopped);
+
+            await debug.stopDebugging(undefined);
 
             assert.ok(startDebugging.calledTwice);
             assert.ok(startDebugging.calledWith(undefined, launchScriptConfig));
@@ -531,11 +531,11 @@ describe("DebugSessionFeature E2E", () => {
             const dotnetDebugSession = await dotnetDebugSessionActive;
             console.log(debug.activeDebugSession);
             console.log(debug.breakpoints);
-            const debugStopped = await debug.stopDebugging(undefined);
+
+            await debug.stopDebugging(undefined);
 
             assert.ok(debugStarted);
             assert.ok(dotnetDebugSession);
-            assert.ok(debugStopped);
         });
     });
 });

test/runTestsInner.ts

@@ -68,7 +68,8 @@ function runTestsInner(testsRoot: string): Promise<void> {
                     throw new Error(`${failures} tests failed.`);
                 } else {
                     console.log("\n\n=====\nTest Runner STOP\n=====");
-                    return c();
+                    c();
+                    return;
                 }
             });
         } catch (err) {