Commit 1db2283

authored

Support -CustomPipeName (#1775)

1 parent 38bf763 commit 1db2283Copy full SHA for 1db2283

File tree

+13

-5

lines changed

+13

-5

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,6 @@`
`394`	`394`	`"name": "PowerShell Attach to Host Process",`
`395`	`395`	`"type": "PowerShell",`
`396`	`396`	`"request": "attach",`
`397`		`- "processId": "^\"\\${command:PickPSHostProcess}\"",`
`398`	`397`	`"runspaceId": 1`
`399`	`398`	`}`
`400`	`399`	`},`
`@@ -445,12 +444,17 @@`
`445`	`444`	`"processId": {`
`446`	`445`	`"type": "string",`
`447`	`446`	`"description": "The process id of the PowerShell host process to attach to. Works only on PowerShell 5 and above.",`
`448`		`- "default": "${command:PickPSHostProcess}"`
	`447`	`+ "default": null`
`449`	`448`	`},`
`450`	`449`	`"runspaceId": {`
`451`	`450`	`"type": "number",`
`452`	`451`	`"description": "Optional: The ID of the runspace to debug in the attached process. Defaults to 1. Works only on PowerShell 5 and above.",`
`453`	`452`	`"default": 1`
	`453`	`+ },`
	`454`	`+ "customPipeName": {`
	`455`	`+ "type": "string",`
	`456`	`+ "description": "The custom pipe name of the PowerShell host process to attach to. Works only on PowerShell 6.2 and above.",`
	`457`	`+ "default": null`
`454`	`458`	`}`
`455`	`459`	`}`
`456`	`460`	`}`
`@@ -487,7 +491,6 @@`
`487`	`491`	`"name": "PowerShell Attach to Host Process",`
`488`	`492`	`"type": "PowerShell",`
`489`	`493`	`"request": "attach",`
`490`		`- "processId": "${command:PickPSHostProcess}",`
`491`	`494`	`"runspaceId": 1`
`492`	`495`	`},`
`493`	`496`	`{`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,10 @@ export class DebugSessionFeature implements IFeature, DebugConfigurationProvider`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// DebugConfigurationProvider method`
`46`		`- public resolveDebugConfiguration(`
	`46`	`+ public asyncresolveDebugConfiguration(`
`47`	`47`	`folder: WorkspaceFolder \| undefined,`
`48`	`48`	`config: DebugConfiguration,`
`49`		`- token?: CancellationToken): ProviderResult<DebugConfiguration> {`
	`49`	`+ token?: CancellationToken): Promise<DebugConfiguration> {`
`50`	`50`
`51`	`51`	`// Make sure there is a session running before attempting to debug/run a program`
`52`	`52`	`if (this.sessionManager.getSessionStatus() !== SessionStatus.Running) {`
`@@ -76,6 +76,11 @@ export class DebugSessionFeature implements IFeature, DebugConfigurationProvider`
`76`	`76`	`return undefined;`
`77`	`77`	`});`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+ // if nothing is set, prompt for the processId`
	`81`	`+ if (!config.customPipeName && !config.processId) {`
	`82`	`+ config.processId = await vscode.commands.executeCommand("PowerShell.PickPSHostProcess");`
	`83`	`+ }`
`79`	`84`	`}`
`80`	`85`
`81`	`86`	`if (generateLaunchConfig) {`

Comments

(0)