Skip to content
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

Better handle shell env api usage for windows conpty #240710

Merged
merged 7 commits into from
Feb 19, 2025
Merged

Conversation

anthonykim1
Copy link
Contributor

Should resolve: #237900
and better handle env api usage for windows, conptydll related.

@anthonykim1 anthonykim1 added this to the February 2025 milestone Feb 13, 2025
@anthonykim1 anthonykim1 requested a review from Tyriar February 13, 2025 19:50
@anthonykim1 anthonykim1 self-assigned this Feb 13, 2025
@anthonykim1 anthonykim1 changed the title Better handle shell env api usage for windows & conpty Better handle shell env api usage for windows conpty Feb 13, 2025
@anthonykim1 anthonykim1 marked this pull request as ready for review February 13, 2025 21:04
@@ -87,8 +87,17 @@ export function getShellIntegrationInjection(
if (options.shellIntegration.nonce) {
envMixin['VSCODE_NONCE'] = options.shellIntegration.nonce;
}

const enableWindowsEnvReporting = options.windowsUseConptyDll || options.windowsEnableConpty && getWindowsBuildNumber() >= 22631;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's stick this inside the isWindows block to avoid unnecessary work

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just like this, right?

@anthonykim1 anthonykim1 requested a review from Tyriar February 19, 2025 01:21
@anthonykim1 anthonykim1 marked this pull request as draft February 19, 2025 01:22
@anthonykim1 anthonykim1 marked this pull request as ready for review February 19, 2025 01:23
@Tyriar Tyriar merged commit ed184ff into main Feb 19, 2025
8 checks passed
@Tyriar Tyriar deleted the anthonykim1/fixPwshBug branch February 19, 2025 10:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pwsh prompt is clutted with unexpected env output
2 participants