Fix unexpected blocking for pwsh command activation #952
Conversation
anthonykim1
added
important
anthonykim1
requested review from
DonJayamanne,
Tyriar,
karthiknadig and
rebornix
| "enabledApiProposals": [ | ||
| "terminalShellEnv" | ||
| "terminalShellEnv", | ||
| "terminalDataWriteEvent" |
There was a problem hiding this comment.
This will need an engine version update if the proposed API is not in stable, and a distro change.
There was a problem hiding this comment.
I believe terminalDataWriteEventis pretty old proposed api.
Also updated the distro for env extension to enable this, and updated vscode repo with the new hash: microsoft/vscode#273148.
I'd want to pin vscode version to one from this morning to make sure we have microsoft/vscode#272369 in though --> done see commit below
src/features/terminal/utils.ts
Outdated
|
|
||
| const config = getConfiguration('terminal.integrated'); | ||
| const timeoutValue = config.get<number | undefined>('shellIntegration.timeout'); | ||
| const timeoutMs = timeoutValue === undefined || -1 ? 5000 : timeoutValue; |
There was a problem hiding this comment.
You can make it more consistent with getShellIntegrationTimeout by checking terminal.integrated.shellIntegration.enabled (mostly will match siInjectionEnabled) and the window's remoteAuthority for isRemote.
There was a problem hiding this comment.
Sounds good,, I think the remoteAuthority is from proposed api though: https://github.com/microsoft/vscode/blob/c23478af52b09c278e21e8396a0e120eb134ae3a/src/vscode-dts/vscode.proposed.resolvers.d.ts#L472
Would env.remoteName be good enough? 28f5261
| // Condition 3: Detect prompt patterns in terminal output | ||
| new Promise<boolean>((resolve) => { | ||
| let dataSoFar = ''; | ||
| const debounced = createSimpleDebounce(50, () => { |
There was a problem hiding this comment.
This should be disposable, created #954
Co-authored-by: Daniel Imms <[email protected]>
This reverts commit 73f3f3c.
Resolves: microsoft/vscode#273017