Commit 2dd742a

committed

Add attachDotnetDebugger debug option

1 parent 8e4d1c0 commit 2dd742aCopy full SHA for 2dd742a

File tree

+26

-2

lines changed

+26

-2

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -500,6 +500,11 @@`
`500`	`500`	`"type": "boolean",`
`501`	`501`	`"description": "Determines whether a temporary PowerShell Integrated Console is created for each debugging session, useful for debugging PowerShell classes and binary modules. Overrides the user setting 'powershell.debugging.createTemporaryIntegratedConsole'.",`
`502`	`502`	`"default": false`
	`503`	`+ },`
	`504`	`+ "attachDotnetDebugger": {`
	`505`	`+ "type": "boolean",`
	`506`	`+ "description": "If specified, a C# debug session will be started and attach to the new temporary PSIC. This does nothing unless createTemporaryIntegratedConsole is also specified.",`
	`507`	`+ "default": false`
`503`	`508`	`}`
`504`	`509`	`}`
`505`	`510`	`},`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -333,6 +333,19 @@ export class DebugSessionFeature extends LanguageClientConsumer`
`333`	`333`	this.tempSessionDetails = await this.tempDebugProcess.start(`DebugSession-${this.sessionCount++}`);
`334`	`334`	`utils.writeSessionFile(sessionFilePath, this.tempSessionDetails);`
`335`	`335`
	`336`	`+ if (config.attachDotnetDebugger) {`
	`337`	`+ // Will wait until the process is started and available before attaching`
	`338`	`+ const pid = await this.tempDebugProcess.getPid();`
	`339`	`+`
	`340`	`+ await vscode.debug.startDebugging(undefined, {`
	`341`	`+ name: "Dotnet Debugger: PSIC Temporary Console",`
	`342`	`+ type: "coreclr",`
	`343`	`+ request: "attach",`
	`344`	`+ processId: pid`
	`345`	`+ });`
	`346`	+ this.logger.write(`Attached dotnet debugger to process ${pid}`)
	`347`	`+ }`
	`348`	`+`
`336`	`349`	`} else {`
`337`	`350`	`utils.writeSessionFile(sessionFilePath, this.sessionManager.getSessionDetails());`
`338`	`351`	`}`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -136,11 +136,17 @@ export class PowerShellProcess {`
`136`	`136`
`137`	`137`	`// Log that the PowerShell terminal process has been started`
`138`	`138`	`this.log.write("Registering terminal PID log callback");`
`139`		`- this.consoleTerminal.processId.then((pid) => this.logTerminalPid(pid, pwshName));`
`140`		`-`
	`139`	`+ this.consoleTerminal.processId.then((pid) =>`
	`140`	`+ this.logTerminalPid(pid, pwshName)`
	`141`	`+ );`
`141`	`142`	`return sessionDetails;`
`142`	`143`	`}`
`143`	`144`
	`145`	`+ // Returns the process Id of the consoleTerminal`
	`146`	`+ public async getPid() {`
	`147`	`+ return await this.consoleTerminal.processId`
	`148`	`+ }`
	`149`	`+`
`144`	`150`	`public showConsole(preserveFocus: boolean) {`
`145`	`151`	`if (this.consoleTerminal) {`
`146`	`152`	`this.consoleTerminal.show(preserveFocus);`

Comments

(0)