-
Notifications
You must be signed in to change notification settings - Fork 520
Add Debug Runspace command #1782
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
TylerLeonhardt
merged 6 commits into
PowerShell:master
from
adamdriscoll:attach-runspace
Mar 13, 2019
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
be326b5
Add Debug Runspace command
adamdriscoll e7d72b5
Update package.json based on feedback.
adamdriscoll e72d1fe
Merge changes for custom pipe name.
adamdriscoll 35deb7a
Update response to match PSES response.
adamdriscoll 64bb51c
Change how we ask for RunspaceId.
adamdriscoll 0a31064
Clean up.
adamdriscoll File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -80,6 +80,20 @@ export class DebugSessionFeature implements IFeature, DebugConfigurationProvider | |
| // if nothing is set, prompt for the processId | ||
| if (!config.customPipeName && !config.processId) { | ||
| config.processId = await vscode.commands.executeCommand("PowerShell.PickPSHostProcess"); | ||
|
|
||
| // No process selected. Cancel attach. | ||
| if (!config.processId) { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| if (!config.runspaceId) { | ||
| config.runspaceId = await vscode.commands.executeCommand("PowerShell.PickRunspace", config.processId); | ||
|
|
||
| // No runspace selected. Cancel attach. | ||
| if (!config.runspaceId) { | ||
| return null; | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -386,3 +400,122 @@ export class PickPSHostProcessFeature implements IFeature { | |
| } | ||
| } | ||
| } | ||
|
|
||
| interface IRunspaceItem extends vscode.QuickPickItem { | ||
| id: string; // payload for the QuickPick UI | ||
| } | ||
|
|
||
| interface IRunspace { | ||
| id: number; | ||
| name: string; | ||
| availability: string; | ||
| } | ||
|
|
||
| export const GetRunspaceRequestType = | ||
| new RequestType<any, IRunspace[], string, void>("powerShell/getRunspace"); | ||
|
|
||
| export class PickRunspaceFeature implements IFeature { | ||
|
|
||
| private command: vscode.Disposable; | ||
| private languageClient: LanguageClient; | ||
| private waitingForClientToken: vscode.CancellationTokenSource; | ||
| private getLanguageClientResolve: (value?: LanguageClient | Thenable<LanguageClient>) => void; | ||
|
|
||
| constructor() { | ||
| this.command = | ||
| vscode.commands.registerCommand("PowerShell.PickRunspace", (processId) => { | ||
| return this.getLanguageClient() | ||
| .then((_) => this.pickRunspace(processId), (_) => undefined); | ||
| }, this); | ||
| } | ||
|
|
||
| public setLanguageClient(languageClient: LanguageClient) { | ||
| this.languageClient = languageClient; | ||
|
|
||
| if (this.waitingForClientToken) { | ||
| this.getLanguageClientResolve(this.languageClient); | ||
| this.clearWaitingToken(); | ||
| } | ||
| } | ||
|
|
||
| public dispose() { | ||
| this.command.dispose(); | ||
| } | ||
|
|
||
| private getLanguageClient(): Thenable<LanguageClient> { | ||
| if (this.languageClient) { | ||
| return Promise.resolve(this.languageClient); | ||
| } else { | ||
| // If PowerShell isn't finished loading yet, show a loading message | ||
| // until the LanguageClient is passed on to us | ||
| this.waitingForClientToken = new vscode.CancellationTokenSource(); | ||
|
|
||
| return new Promise<LanguageClient>( | ||
| (resolve, reject) => { | ||
| this.getLanguageClientResolve = resolve; | ||
|
|
||
| vscode.window | ||
| .showQuickPick( | ||
| ["Cancel"], | ||
| { placeHolder: "Attach to PowerShell host process: Please wait, starting PowerShell..." }, | ||
| this.waitingForClientToken.token) | ||
| .then((response) => { | ||
| if (response === "Cancel") { | ||
| this.clearWaitingToken(); | ||
| reject(); | ||
| } | ||
| }); | ||
|
|
||
| // Cancel the loading prompt after 60 seconds | ||
| setTimeout(() => { | ||
| if (this.waitingForClientToken) { | ||
| this.clearWaitingToken(); | ||
| reject(); | ||
|
|
||
| vscode.window.showErrorMessage( | ||
| "Attach to PowerShell host process: PowerShell session took too long to start."); | ||
| } | ||
| }, 60000); | ||
| }, | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| 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") { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I totally just realized that this should only be filtered out IF in the If we're in a different process, we probably want to attach to runspace 1. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @adamdriscoll can you fix this up? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yep! Will get another PR in. |
||
| continue; | ||
| } | ||
|
|
||
| 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, | ||
| }; | ||
|
|
||
| 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; | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| private clearWaitingToken() { | ||
| if (this.waitingForClientToken) { | ||
| this.waitingForClientToken.dispose(); | ||
| this.waitingForClientToken = undefined; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.