Enable 'strictNullChecks' (with some necessary refactoring)

Author: andyleejordan

src/controls/checkboxQuickPick.ts

@@ -18,23 +18,17 @@ export interface ICheckboxQuickPickOptions {
     confirmPlaceHolder: string;
 }
 
-const defaultOptions: ICheckboxQuickPickOptions = { confirmPlaceHolder: defaultPlaceHolder};
+const defaultOptions: ICheckboxQuickPickOptions = { confirmPlaceHolder: defaultPlaceHolder };
 
-export function showCheckboxQuickPick(
+export async function showCheckboxQuickPick(
     items: ICheckboxQuickPickItem[],
-    options: ICheckboxQuickPickOptions = defaultOptions): Thenable<ICheckboxQuickPickItem[]> {
-
-    return showInner(items, options).then(
-        (selectedItem) => {
-            // We're mutating the original item list so just return it for now.
-            // If 'selectedItem' is undefined it means the user cancelled the
-            // inner showQuickPick UI so pass the undefined along.
-            return selectedItem !== undefined ? items : undefined;
-        });
+    options: ICheckboxQuickPickOptions = defaultOptions): Promise<ICheckboxQuickPickItem[] | undefined> {
+
+    const selectedItem = await showInner(items, options);
+    return selectedItem !== undefined ? items : undefined;
 }
 
 function getQuickPickItems(items: ICheckboxQuickPickItem[]): vscode.QuickPickItem[] {
-
     const quickPickItems: vscode.QuickPickItem[] = [];
     quickPickItems.push({ label: confirmItemLabel, description: "" });
 
@@ -48,40 +42,35 @@ function getQuickPickItems(items: ICheckboxQuickPickItem[]): vscode.QuickPickIte
     return quickPickItems;
 }
 
-function showInner(
+async function showInner(
     items: ICheckboxQuickPickItem[],
-    options: ICheckboxQuickPickOptions): Thenable<vscode.QuickPickItem> {
-
-    const quickPickThenable: Thenable<vscode.QuickPickItem> =
-        vscode.window.showQuickPick(
-            getQuickPickItems(items),
-            {
-                ignoreFocusOut: true,
-                matchOnDescription: true,
-                placeHolder: options.confirmPlaceHolder,
-            });
-
-    return quickPickThenable.then(
-        (selection) => {
-            if (!selection) {
-                return Promise.resolve<vscode.QuickPickItem>(undefined);
-            }
-
-            if (selection.label === confirmItemLabel) {
-                return selection;
-            }
-
-            const index: number = getItemIndex(items, selection.label);
-
-            if (index >= 0) {
-                toggleSelection(items[index]);
-            } else {
-                // tslint:disable-next-line:no-console
-                console.log(`Couldn't find CheckboxQuickPickItem for label '${selection.label}'`);
-            }
-
-            return showInner(items, options);
+    options: ICheckboxQuickPickOptions): Promise<vscode.QuickPickItem | undefined> {
+
+    const selection = await vscode.window.showQuickPick(
+        getQuickPickItems(items),
+        {
+            ignoreFocusOut: true,
+            matchOnDescription: true,
+            placeHolder: options.confirmPlaceHolder,
         });
+
+    if (selection === undefined) {
+        return undefined;
+    }
+
+    if (selection.label === confirmItemLabel) {
+        return selection;
+    }
+
+    const index: number = getItemIndex(items, selection.label);
+    if (index >= 0) {
+        toggleSelection(items[index]);
+    } else {
+        // tslint:disable-next-line:no-console
+        console.log(`Couldn't find CheckboxQuickPickItem for label '${selection.label}'`);
+    }
+
+    return showInner(items, options);
 }
 
 function getItemIndex(items: ICheckboxQuickPickItem[], itemLabel: string): number {

src/features/CodeActions.ts

@@ -11,7 +11,7 @@ export class CodeActionsFeature implements vscode.Disposable {
 
     constructor(private log: ILogger) {
         this.applyEditsCommand = vscode.commands.registerCommand("PowerShell.ApplyCodeActionEdits", (edit: any) => {
-            Window.activeTextEditor.edit((editBuilder) => {
+            Window.activeTextEditor?.edit((editBuilder) => {
                 editBuilder.replace(
                     new vscode.Range(
                         edit.StartLineNumber - 1,

src/features/Console.ts

@@ -50,12 +50,12 @@ interface IShowChoicePromptRequestArgs {
 }
 
 interface IShowChoicePromptResponseBody {
-    responseText: string;
+    responseText: string | undefined;
     promptCancelled: boolean;
 }
 
 interface IShowInputPromptResponseBody {
-    responseText: string;
+    responseText: string | undefined;
     promptCancelled: boolean;
 }
 
@@ -119,11 +119,12 @@ function showChoicePrompt(promptDetails: IShowChoicePromptRequestArgs): Thenable
     return resultThenable;
 }
 
-function showInputPrompt(promptDetails: IShowInputPromptRequestArgs): Thenable<IShowInputPromptResponseBody> {
-    return vscode.window.showInputBox({ placeHolder: promptDetails.name + ": " }).then(onInputEntered);
+async function showInputPrompt(promptDetails: IShowInputPromptRequestArgs): Promise<IShowInputPromptResponseBody> {
+    const responseText = await vscode.window.showInputBox({ placeHolder: promptDetails.name + ": " });
+    return onInputEntered(responseText);
 }
 
-function onItemsSelected(chosenItems: ICheckboxQuickPickItem[]): IShowChoicePromptResponseBody {
+function onItemsSelected(chosenItems: ICheckboxQuickPickItem[] | undefined): IShowChoicePromptResponseBody {
     if (chosenItems !== undefined) {
         return {
             promptCancelled: false,
@@ -138,7 +139,7 @@ function onItemsSelected(chosenItems: ICheckboxQuickPickItem[]): IShowChoiceProm
     }
 }
 
-function onItemSelected(chosenItem: vscode.QuickPickItem): IShowChoicePromptResponseBody {
+function onItemSelected(chosenItem: vscode.QuickPickItem | undefined): IShowChoicePromptResponseBody {
     if (chosenItem !== undefined) {
         return {
             promptCancelled: false,
@@ -153,7 +154,7 @@ function onItemSelected(chosenItem: vscode.QuickPickItem): IShowChoicePromptResp
     }
 }
 
-function onInputEntered(responseText: string): IShowInputPromptResponseBody {
+function onInputEntered(responseText: string | undefined): IShowInputPromptResponseBody {
     if (responseText !== undefined) {
         return {
             promptCancelled: false,
@@ -190,6 +191,10 @@ export class ConsoleFeature extends LanguageClientConsumer {
                 }
 
                 const editor = vscode.window.activeTextEditor;
+                if (editor === undefined) {
+                    return;
+                }
+
                 let selectionRange: vscode.Range;
 
                 if (!editor.selection.isEmpty) {