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.

Sign up for GitHub

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

Jump to bottom

Expose shell's environment - pwsh #237415

Merged
merged 54 commits into from
Jan 9, 2025
Merged

Expose shell's environment - pwsh #237415

merged 54 commits into from
Jan 9, 2025

Conversation

anthonykim1
Copy link
Contributor

@anthonykim1 anthonykim1 commented Jan 7, 2025 •
edited by Tyriar
Loading

Trying to break #228791 down smaller so that it is easier to review.

Part of #227467

anthonykim1 and others added 24 commits September 16, 2024 22:20
@anthonykim1
start terminal shell env proposed
714bb39
@anthonykim1
fix typo
3c412ff
@anthonykim1
progress on shellEnvDetectionCapability, mainThreadTerminalSI
f214756
@anthonykim1
update IShellEnvDetectionCapability interface
3923373
@anthonykim1
touch up on $shellEnvChange
0465588
@anthonykim1
adjust IShellEnvDetectionCapability
e1d611a
@anthonykim1
properly listen to envChangeEvent
98131e7 
Co-authored-by: Daniel Imms <[email protected]>
@anthonykim1
Serialize env map, expose on exthost
e37f119
@anthonykim1
Merge remote-tracking branch 'upstream/main' into shellEnvAPI
a0602bc
@anthonykim1
start adding to zsh script
94c6574
@anthonykim1
receive environment variable in extension host, properly escape "
e4ab9e8 
Co-authored-by: Daniel Imms <[email protected]>
@anthonykim1
clean up
e2b4ca1
@anthonykim1 @Tyriar
Add TODO: properly escape double quotes, figure out why JSON parse fa…
1cf51a5 
…ils for bash

Co-authored-by: Daniel Imms <[email protected]>
@Tyriar
Fix nonce check, ignore PS1 for now in bash
f0b1578
@Tyriar
Add some simple PS1 string tests to deserializeMessage
1b2eb1f
@Tyriar
New approach of sending env entries separately
0956b86
@anthonykim1
be able to get EnvSingleVar
bb735f8
@anthonykim1
few comments
a1503da
@anthonykim1
add function signature for start, set, end environment var
61653d5
@anthonykim1
implement EnvStart, EnvEntry, EnvEnd for single env entry
db981ae
@anthonykim1
deserialize env value for EnvEntry
a25a9a9
@anthonykim1
Remove unncessary comments
7fe7c26
@anthonykim1
only leave pwsh in this PR and exclude other shells
338514c
@anthonykim1
keep exlcuding other shell env - only pwsh should remain
9b97e1b
@anthonykim1 anthonykim1 self-assigned this Jan 7, 2025
Tyriar
Tyriar requested changes Jan 7, 2025
View reviewed changes
src/vs/platform/terminal/common/capabilities/capabilities.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/common/capabilities/capabilities.ts Show resolved Hide resolved
src/vs/platform/terminal/common/capabilities/capabilities.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts Outdated Show resolved Hide resolved
src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts Outdated Show resolved Hide resolved
src/vs/workbench/api/common/extHostTerminalShellIntegration.ts Outdated Show resolved Hide resolved
src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh Outdated Show resolved Hide resolved
src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh Outdated Show resolved Hide resolved
src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1 Outdated Show resolved Hide resolved
src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts Outdated Show resolved Hide resolved
@Tyriar Tyriar added this to the January 2025 milestone Jan 7, 2025
anthonykim1 and others added 6 commits January 7, 2025 22:46
@anthonykim1 @Tyriar
Update src/vs/platform/terminal/common/capabilities/shellEnvDetection…
4e8c2cb 
…Capability.ts

Co-authored-by: Daniel Imms <[email protected]>
@anthonykim1 @Tyriar
Update src/vs/platform/terminal/common/capabilities/capabilities.ts
333c8d5 
Co-authored-by: Daniel Imms <[email protected]>
@anthonykim1 @Tyriar
Update src/vs/workbench/api/browser/mainThreadTerminalShellIntegratio…
c68c58a 
…n.ts

Co-authored-by: Daniel Imms <[email protected]>
@anthonykim1 @Tyriar
Update src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
944ce9a 
Co-authored-by: Daniel Imms <[email protected]>
@anthonykim1 @Tyriar
Update src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
b2afe32 
Co-authored-by: Daniel Imms <[email protected]>
@anthonykim1 @Tyriar
Update src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
dbbe2df 
Co-authored-by: Daniel Imms <[email protected]>
@microsoft microsoft deleted a comment from agencytop1 Jan 8, 2025
@Tyriar Tyriar marked this pull request as ready for review January 9, 2025 15:54
@Tyriar Tyriar mentioned this pull request Jan 9, 2025
Closed
Tyriar
Tyriar previously approved these changes Jan 9, 2025
View reviewed changes
@Tyriar Tyriar mentioned this pull request Jan 9, 2025
Draft
@anthonykim1 anthonykim1 requested a review from Tyriar January 9, 2025 22:35
@anthonykim1 anthonykim1 enabled auto-merge (squash) January 9, 2025 22:36
@anthonykim1 anthonykim1 dismissed Tyriar’s stale review January 9, 2025 22:37

i cant merge without reapproval

@anthonykim1 anthonykim1 merged commit f74e6be into microsoft:main Jan 9, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Tyriar Tyriar Tyriar approved these changes

Assignees

@anthonykim1 anthonykim1

Labels
None yet
Projects
None yet
Milestone
January 2025
Development

Successfully merging this pull request may close these issues.
2 participants
@anthonykim1 @Tyriar