Automatically fix Thenable to Promise in DebugSession.ts

Author: andyleejordan

src/features/DebugSession.ts

@@ -35,7 +35,10 @@ export class DebugSessionFeature extends LanguageClientConsumer
         context.subscriptions.push(vscode.debug.registerDebugAdapterDescriptorFactory("PowerShell", this))
     }
 
-    createDebugAdapterDescriptor(session: vscode.DebugSession, executable: vscode.DebugAdapterExecutable): vscode.ProviderResult<vscode.DebugAdapterDescriptor> {
+    createDebugAdapterDescriptor(
+        session: vscode.DebugSession,
+        _executable: vscode.DebugAdapterExecutable): vscode.ProviderResult<vscode.DebugAdapterDescriptor> {
+
         const sessionDetails = session.configuration.createTemporaryIntegratedConsole
             ? this.tempSessionDetails
             : this.sessionManager.getSessionDetails();
@@ -58,10 +61,11 @@ export class DebugSessionFeature extends LanguageClientConsumer
         languageClient.onNotification(
             StartDebuggerNotificationType,
             () =>
+                // TODO: Use a named debug configuration.
                 vscode.debug.startDebugging(undefined, {
                     request: "launch",
                     type: "PowerShell",
-                    name: "PowerShell Interactive Session",
+                    name: "PowerShell: Interactive Session",
         }));
 
         languageClient.onNotification(
@@ -110,6 +114,7 @@ export class DebugSessionFeature extends LanguageClientConsumer
                 debugConfigPickItems,
                 { placeHolder: "Select a PowerShell debug configuration" });
 
+        // TODO: Make these available in a dictionary and share them.
         switch (launchSelection.id) {
             case DebugConfig.LaunchCurrentFile:
                 return [
@@ -154,10 +159,9 @@ export class DebugSessionFeature extends LanguageClientConsumer
 
     // DebugConfigurationProvider method
     public async resolveDebugConfiguration(
-        folder: WorkspaceFolder | undefined,
+        _folder: WorkspaceFolder | undefined,
         config: DebugConfiguration,
-        token?: CancellationToken): Promise<DebugConfiguration> {
-
+        _token?: CancellationToken): Promise<DebugConfiguration> {
         // Make sure there is a session running before attempting to debug/run a program
         // TODO: Perhaps this should just wait until it's running or aborted.
         if (this.sessionManager.getSessionStatus() !== SessionStatus.Running) {
@@ -213,10 +217,11 @@ export class DebugSessionFeature extends LanguageClientConsumer
             }
         }
 
+        // TODO: Use a named debug configuration.
         if (generateLaunchConfig) {
             // No launch.json, create the default configuration for both unsaved (Untitled) and saved documents.
             config.type = "PowerShell";
-            config.name = "PowerShell Launch Current File";
+            config.name = "PowerShell: Launch Current File";
             config.request = "launch";
             config.args = [];
 
@@ -240,7 +245,6 @@ export class DebugSessionFeature extends LanguageClientConsumer
         }
 
         if (config.request === "launch") {
-
             // For debug launch of "current script" (saved or unsaved), warn before starting the debugger if either
             // A) there is not an active document
             // B) the unsaved document's language type is not PowerShell
@@ -355,7 +359,7 @@ export class SpecifyScriptArgsFeature implements vscode.Disposable {
         this.command.dispose();
     }
 
-    private specifyScriptArguments(): Thenable<string> {
+    private async specifyScriptArguments(): Promise<string> {
         const powerShellDbgScriptArgsKey = "powerShellDebugScriptArgs";
 
         const options: vscode.InputBoxOptions = {
@@ -368,15 +372,13 @@ export class SpecifyScriptArgsFeature implements vscode.Disposable {
             options.value = prevArgs;
         }
 
-        return vscode.window.showInputBox(options).then((text) => {
-            // When user cancel's the input box (by pressing Esc), the text value is undefined.
-            // Let's not blow away the previous settting.
-            if (text !== undefined) {
-                this.context.workspaceState.update(powerShellDbgScriptArgsKey, text);
-            }
-
-            return text;
-        });
+        const text = await vscode.window.showInputBox(options);
+        // When user cancel's the input box (by pressing Esc), the text value is undefined.
+        // Let's not blow away the previous settting.
+        if (text !== undefined) {
+            this.context.workspaceState.update(powerShellDbgScriptArgsKey, text);
+        }
+        return text;
     }
 }
 
@@ -402,7 +404,7 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
 
     private command: vscode.Disposable;
     private waitingForClientToken: vscode.CancellationTokenSource;
-    private getLanguageClientResolve: (value?: LanguageClient | Thenable<LanguageClient>) => void;
+    private getLanguageClientResolve: (value?: LanguageClient | Promise<LanguageClient>) => void;
 
     constructor() {
         super();
@@ -427,7 +429,7 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
         this.command.dispose();
     }
 
-    private getLanguageClient(): Thenable<LanguageClient> {
+    private getLanguageClient(): Promise<LanguageClient> {
         if (this.languageClient) {
             return Promise.resolve(this.languageClient);
         } else {
@@ -466,46 +468,38 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
         }
     }
 
-    private pickPSHostProcess(): Thenable<string> {
-        return this.languageClient.sendRequest(GetPSHostProcessesRequestType, {}).then((hostProcesses) => {
-            // Start with the current PowerShell process in the list.
-            const items: IProcessItem[] = [{
-                label: "Current",
-                description: "The current PowerShell Integrated Console process.",
-                pid: "current",
-            }];
-
-            for (const p in hostProcesses) {
-                if (hostProcesses.hasOwnProperty(p)) {
-                    let windowTitle = "";
-                    if (hostProcesses[p].mainWindowTitle) {
-                        windowTitle = `, Title: ${hostProcesses[p].mainWindowTitle}`;
-                    }
-
-                    items.push({
-                        label: hostProcesses[p].processName,
-                        description: `PID: ${hostProcesses[p].processId.toString()}${windowTitle}`,
-                        pid: hostProcesses[p].processId,
-                    });
+    private async pickPSHostProcess(): Promise<string> {
+        const hostProcesses = await this.languageClient.sendRequest(GetPSHostProcessesRequestType, {});
+        // Start with the current PowerShell process in the list.
+        const items: IProcessItem[] = [{
+            label: "Current",
+            description: "The current PowerShell Integrated Console process.",
+            pid: "current",
+        }];
+        for (const p in hostProcesses) {
+            if (hostProcesses.hasOwnProperty(p)) {
+                let windowTitle = "";
+                if (hostProcesses[p].mainWindowTitle) {
+                    windowTitle = `, Title: ${hostProcesses[p].mainWindowTitle}`;
                 }
-            }
 
-            if (items.length === 0) {
-                return Promise.reject("There are no PowerShell host processes to attach to.");
+                items.push({
+                    label: hostProcesses[p].processName,
+                    description: `PID: ${hostProcesses[p].processId.toString()}${windowTitle}`,
+                    pid: hostProcesses[p].processId,
+                });
             }
-
-            const options: vscode.QuickPickOptions = {
-                placeHolder: "Select a PowerShell host process to attach to",
-                matchOnDescription: true,
-                matchOnDetail: true,
-            };
-
-            return vscode.window.showQuickPick(items, options).then((item) => {
-                // Return undefined when user presses Esc.
-                // This prevents VSCode from opening launch.json in this case which happens if we return "".
-                return item ? `${item.pid}` : undefined;
-            });
-        });
+        }
+        if (items.length === 0) {
+            return Promise.reject("There are no PowerShell host processes to attach to.");
+        }
+        const options: vscode.QuickPickOptions = {
+            placeHolder: "Select a PowerShell host process to attach to",
+            matchOnDescription: true,
+            matchOnDetail: true,
+        };
+        const item = await vscode.window.showQuickPick(items, options);
+        return item ? `${item.pid}` : undefined;
     }
 
     private clearWaitingToken() {
@@ -533,7 +527,7 @@ export class PickRunspaceFeature extends LanguageClientConsumer {
 
     private command: vscode.Disposable;
     private waitingForClientToken: vscode.CancellationTokenSource;
-    private getLanguageClientResolve: (value?: LanguageClient | Thenable<LanguageClient>) => void;
+    private getLanguageClientResolve: (value?: LanguageClient | Promise<LanguageClient>) => void;
 
     constructor() {
         super();
@@ -557,7 +551,7 @@ export class PickRunspaceFeature extends LanguageClientConsumer {
         this.command.dispose();
     }
 
-    private getLanguageClient(): Thenable<LanguageClient> {
+    private getLanguageClient(): Promise<LanguageClient> {
         if (this.languageClient) {
             return Promise.resolve(this.languageClient);
         } else {
@@ -596,36 +590,29 @@ export class PickRunspaceFeature extends LanguageClientConsumer {
         }
     }
 
-    private pickRunspace(processId): Thenable<string> {
-        return this.languageClient.sendRequest(GetRunspaceRequestType, { processId }).then((response) => {
-            const items: IRunspaceItem[] = [];
-
-            for (const runspace of response) {
-                // Skip default runspace
-                if ((runspace.id === 1 || runspace.name === "PSAttachRunspace")
-                    && processId === "current") {
-                    continue;
-                }
-
-                items.push({
-                    label: runspace.name,
-                    description: `ID: ${runspace.id} - ${runspace.availability}`,
-                    id: runspace.id.toString(),
-                });
+    private async pickRunspace(processId: string): Promise<string> {
+        const response = await this.languageClient.sendRequest(GetRunspaceRequestType, { processId });
+        const items: IRunspaceItem[] = [];
+        for (const runspace of response) {
+            // Skip default runspace
+            if ((runspace.id === 1 || runspace.name === "PSAttachRunspace")
+                && processId === "current") {
+                continue;
             }
 
-            const options: vscode.QuickPickOptions = {
-                placeHolder: "Select PowerShell runspace to debug",
-                matchOnDescription: true,
-                matchOnDetail: true,
-            };
-
-            return vscode.window.showQuickPick(items, options).then((item) => {
-                // Return undefined when user presses Esc.
-                // This prevents VSCode from opening launch.json in this case which happens if we return "".
-                return item ? `${item.id}` : undefined;
+            items.push({
+                label: runspace.name,
+                description: `ID: ${runspace.id} - ${runspace.availability}`,
+                id: runspace.id.toString(),
             });
-        });
+        }
+        const options: vscode.QuickPickOptions = {
+            placeHolder: "Select PowerShell runspace to debug",
+            matchOnDescription: true,
+            matchOnDetail: true,
+        };
+        const item = await vscode.window.showQuickPick(items, options);
+        return item ? `${item.id}` : undefined;
     }
 
     private clearWaitingToken() {