Use a provided shell integration script directly#2156
Merged
andyleejordan merged 1 commit intomainfrom Apr 3, 2024
Merged
Conversation
Member
Author
|
This was prompted by a) being annoyed at having to keep doing this and b) the changes in microsoft/vscode@d60e424 being much more difficult to incorporate except by doing it this way! /cc @Tyriar |
andyleejordan
commented
Apr 2, 2024
src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs
Outdated
Show resolved
Hide resolved
6 tasks
f85e2f8 to
6342ce8
Compare
22b95ae to
fd1bb23
Compare
andyleejordan
commented
Apr 3, 2024
| _shellIntegrationEnabled = true; | ||
| await EnableShellIntegrationAsync(cancellationToken).ConfigureAwait(false); | ||
| // TODO: Make the __psEditorServices prefix shared (it's used elsewhere too). | ||
| string setupShellIntegration = $$""" |
Member
Author
There was a problem hiding this comment.
I like C# 11's triple-quote double-dollar thing. Very useful.
da3894a to
400dce5
Compare
andyleejordan
commented
Apr 3, 2024
Comment on lines
+1092
to
+1098
| // Invoke the PSConsoleHostReadLine wrapper. We don't write the output because it | ||
| // returns the command line (user input) which would then be duplicate noise. Fortunately | ||
| // it writes the shell integration sequences directly using [Console]::Write. | ||
| InvokePSCommand( | ||
| new PSCommand().AddScript("PSConsoleHostReadLine"), | ||
| new PowerShellExecutionOptions { ThrowOnError = false, WriteOutputToHost = false }, | ||
| cancellationToken); |
Member
Author
There was a problem hiding this comment.
@Tyriar just a heads-up here that your PSConsoleHostReadLine wrapper must continue to write those escape sequences directly, as we're intentionally not emitting the output (like the returned value) to the host. Write-Host might work (though you don't use it), but we'd need to test.
andyleejordan
commented
Apr 3, 2024
| } | ||
|
|
||
| InvokePSCommand( | ||
| new PSCommand().AddScript(input, useLocalScope: false), |
Member
Author
There was a problem hiding this comment.
No real change, it's the default.
400dce5 to
6d6bc34
Compare
SeeminglyScience
requested changes
Apr 3, 2024
Collaborator
SeeminglyScience
left a comment
There was a problem hiding this comment.
Lookin' good, just two fixes real quick
src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs
Outdated
Show resolved
Hide resolved
src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs
Outdated
Show resolved
Hide resolved
Instead of having to maintain an edited copy (which was really annoying) I stubbed out `PSConsoleHostReadLine` to do what's expected. So now we can just use the existing shell integration script directly! Since we can't reliably find the script using `code --locate-shell-integration-path pwsh` we now rely on it being sent by the client on initialization. Its presence implies the feature is on. This is pretty VS Code specific, but not necessarily so. Apply suggestions from code review Thanks Patrick! Co-authored-by: Patrick Meinecke <SeeminglyScience@users.noreply.github.com>
9a9f893 to
f5bc51d
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Instead of having to maintain an edited copy (which was really annoying) I stubbed out
PSConsoleHostReadLineto do what's expected. So now we can just use the existing shell integration script directly!Since we can't reliably find the script using
code --locate-shell-integration-path pwshwe now rely on it being sent by the client on initialization. Its presence implies the feature is on.This is pretty VS Code specific, but not necessarily so.