Fix code for updated ESLint rules

Author: andyleejordan

.eslintrc.json

@@ -69,6 +69,13 @@
     "@typescript-eslint/restrict-template-expressions": [
       "off"
     ],
+    "@typescript-eslint/prefer-nullish-coalescing": [
+      "error",
+      {
+        "ignoreConditionalTests": true,
+        "ignoreMixedLogicalExpressions": true
+      }
+    ],
     "header/header": [
       2,
       "line",

src/features/DebugSession.ts

@@ -559,7 +559,7 @@ export class DebugSessionFeature extends LanguageClientConsumer
         }
 
         if (items.length === 0) {
-            return Promise.reject("There are no PowerShell host processes to attach.");
+            return Promise.reject(new Error("There are no PowerShell host processes to attach."));
         }
 
         const options: QuickPickOptions = {

src/features/ExtensionCommands.ts

@@ -478,8 +478,8 @@ export class ExtensionCommandsFeature extends LanguageClientConsumer {
         if (vscode.window.activeTextEditor !== undefined) {
             vscode.window.activeTextEditor.selections = [
                 new vscode.Selection(
-                    asCodePosition(details.selectionRange.start)!,
-                    asCodePosition(details.selectionRange.end)!),
+                    asCodePosition(details.selectionRange.start),
+                    asCodePosition(details.selectionRange.end)),
             ];
             return EditorOperationResponse.Completed;
         }

src/features/NewFileOrProject.ts

@@ -53,7 +53,7 @@ export class NewFileOrProjectFeature extends LanguageClientConsumer {
         if (response.needsModuleInstall) {
             // TODO: Offer to install Plaster
             void this.logger.writeAndShowError("Plaster is not installed!");
-            return Promise.reject<ITemplateQuickPickItem[]>("Plaster needs to be installed");
+            return Promise.reject<ITemplateQuickPickItem[]>(new Error("Plaster needs to be installed"));
         }
 
         let templates = response.templates.map<ITemplateQuickPickItem>(

src/languageClientConsumer.ts

@@ -58,7 +58,7 @@ export abstract class LanguageClientConsumer {
                         // Store the resolve function to be called in resetLanguageClient.
                         LanguageClientConsumer.getLanguageClientResolve = resolve;
                         // Reject the promise if the operation is cancelled.
-                        token.onCancellationRequested(() => { reject(); });
+                        token.onCancellationRequested(() => { reject(new Error("Cancelled PowerShell Extension Terminal start-up.")); });
                     }
                 );
             });

src/session.ts

@@ -332,7 +332,7 @@ export class SessionManager implements Middleware {
         this.debugEventHandler?.dispose();
 
         if (this.PowerShellExeDetails === undefined) {
-            return Promise.reject("Required PowerShellExeDetails undefined!");
+            return Promise.reject(new Error("Required PowerShellExeDetails undefined!"));
         }
 
         // TODO: It might not be totally necessary to update the session

test/core/platform.test.ts

@@ -988,7 +988,7 @@ describe("Platform module", function () {
 
                 function getWinPSPath(systemDir: string): string {
                     return path.join(
-                        testPlatform.environmentVars.windir!,
+                        testPlatform.environmentVars.windir,
                         systemDir,
                         "WindowsPowerShell",
                         "v1.0",

test/runTestsInner.ts

@@ -60,21 +60,16 @@ function runTestsInner(testsRoot: string): Promise<void> {
         }
     });
 
-    return new Promise((c, e) => {
-        try {
-            mocha.run(failures => {
-                console.log(`Mocha Run Finished with ${failures} failures.`);
-                if (failures > 0) {
-                    throw new Error(`${failures} tests failed.`);
-                } else {
-                    console.log("\n\n=====\nTest Runner STOP\n=====");
-                    c();
-                    return;
-                }
-            });
-        } catch (err) {
-            console.error("Failed to run tests");
-            e(err);
-        }
+    return new Promise((resolve) => {
+        mocha.run(failures => {
+            console.log(`Mocha Run Finished with ${failures} failures.`);
+            if (failures > 0) {
+                throw new Error(`${failures} tests failed.`);
+            } else {
+                console.log("\n\n=====\nTest Runner STOP\n=====");
+                resolve();
+                return;
+            }
+        });
     });
 }