Merge pull request #437 from rkeithhill/rkeithhill/process-pick-handle-no-selection

Fix host process picker when session init'd.

Author: daviwil

package.json

@@ -196,12 +196,12 @@
  }
  },
  {
- "label": "PowerShell: Attach to PowerShell Process Configuration",
- "description": "A new configuration for debugging a runspace in another process.",
+ "label": "PowerShell: Attach to PowerShell Host Process Configuration",
+ "description": "A new configuration for debugging a runspace in another host process.",
  "body": {
  "type": "PowerShell",
  "request": "attach",
- "name": "PowerShell Attach to Process",
+ "name": "PowerShell Attach to Host Process",
  "processId": "^\"\\${command.PickPSHostProcess}\"",
  "runspaceId": 1
  }
@@ -251,7 +251,7 @@
  },
  "processId": {
  "type": "string",
- "description": "Id of PowerShell host process to attach to. Works only on PowerShell 5 and above.",
+ "description": "The process id of the PowerShell host process to attach to. Works only on PowerShell 5 and above.",
  "default": "${command.PickPSHostProcess}"
  },
  "runspaceId": {
@@ -274,8 +274,9 @@
  {
  "type": "PowerShell",
  "request": "attach",
- "name": "PowerShell Attach",
- "processId": "12345"
+ "name": "PowerShell Attach to Host Process",
+ "processId": "${command.PickPSHostProcess}",
+ "runspaceId": 1
  },
  {
  "type": "PowerShell",

src/features/DebugSession.ts

@@ -73,26 +73,38 @@ export class PickPSHostProcessFeature implements IFeature {
  vscode.commands.registerCommand('PowerShell.PickPSHostProcess', () => {
 
  if (!this.languageClient && !this.waitingForClientToken) {
+ return new Promise<string>((resolve, reject) => {
+ reject("PowerShell has not fully initialized. Try to attach again after PowerShell has been initialized.");
+ });
 
- // If PowerShell isn't finished loading yet, show a loading message
- // until the LanguageClient is passed on to us
- this.waitingForClientToken = new vscode.CancellationTokenSource();
- vscode.window
- .showQuickPick(
- ["Cancel"],
- { placeHolder: "Select PowerShell Host Process to attach to: Please wait, starting PowerShell..." },
- this.waitingForClientToken.token)
- .then(response => { if (response === "Cancel") { this.clearWaitingToken(); } });
-
- // Cancel the loading prompt after 60 seconds
- setTimeout(() => {
- if (this.waitingForClientToken) {
- this.clearWaitingToken();
-
- vscode.window.showErrorMessage(
- "Select PowerShell Host Process to attach to: PowerShell session took too long to start.");
- }
- }, 60000);
+ // // If PowerShell isn't finished loading yet, show a loading message
+ // // until the LanguageClient is passed on to us
+ // var cancelled = false;
+ // var timedOut = false;
+ // this.waitingForClientToken = new vscode.CancellationTokenSource();
+
+ // vscode.window
+ // .showQuickPick(
+ // ["Cancel"],
+ // { placeHolder: "Attach to PowerShell host process: Please wait, starting PowerShell..." },
+ // this.waitingForClientToken.token)
+ // .then(response => {
+ // if (response === "Cancel") {
+ // this.clearWaitingToken();
+ // }
+ // });
+
+ // // Cancel the loading prompt after 60 seconds
+ // setTimeout(() => {
+ // if (this.waitingForClientToken) {
+ // this.clearWaitingToken();
+
+ // vscode.window.showErrorMessage(
+ // "Attach to PowerShell host process: PowerShell session took too long to start.");
+ // }
+ // }, 60000);
+
+ // // Wait w/timeout on language client to be initialized and then return this.pickPSHostProcess;
  }
  else {
  return this.pickPSHostProcess();
@@ -105,7 +117,7 @@ export class PickPSHostProcessFeature implements IFeature {
 
  if (this.waitingForClientToken) {
  this.clearWaitingToken();
- return this.pickPSHostProcess();
+ // Signal language client initialized
  }
  }
 
@@ -114,37 +126,36 @@ export class PickPSHostProcessFeature implements IFeature {
  }
 
  // In node, the function returned a Promise<string> not sure about "Thenable<string>"
-private pickPSHostProcess(): Thenable<string> {
-return this.languageClient.sendRequest(GetPSHostProcessesRequest.type, null).then(hostProcesses => {
-var items: ProcessItem[] = [];
-
-for(var p in hostProcesses) {
-items.push({
-label: hostProcesses[p].processName,
- description: hostProcesses[p].processId.toString(),
-detail: hostProcesses[p].mainWindowTitle,
-pid: hostProcesses[p].processId
- });
-};
-
- if (items.length === 0) {
- return vscode.window.showInformationMessage(
- "There are no other PowerShell host processes to attach to.").then(_ => {
- return null;
+private pickPSHostProcess(): Promise<string> {
+ return new Promise((resolve, reject) => {
+ this.languageClient.sendRequest(GetPSHostProcessesRequest.type, null).then(hostProcesses => {
+ var items: ProcessItem[] = [];
+
+ for(var p in hostProcesses) {
+ items.push({
+ label: hostProcesses[p].processName,
+ description: hostProcesses[p].processId.toString(),
+ detail: hostProcesses[p].mainWindowTitle,
+ pid: hostProcesses[p].processId
  });
- }
- else {
- let 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 item ? item.pid : null;
- });
- }
-});
+ if (items.length === 0) {
+ reject("There are no PowerShell host processes to attach to.");
+ }
+ else {
+ let options : vscode.QuickPickOptions = {
+ placeHolder: "Select a PowerShell host process to attach to",
+ matchOnDescription: true,
+ matchOnDetail: true
+ };
+
+ return vscode.window.showQuickPick(items, options).then(item => {
+ resolve(item ? item.pid : "");
+ });
+ }
+ });
+ });
 }
 
  private clearWaitingToken() {