Expose shell's environment - bash #237602

anthonykim1 · 2025-01-09T20:05:18Z

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

Part of #227467

Co-authored-by: Daniel Imms <Tyriar@users.noreply.github.com>

…ils for bash Co-authored-by: Daniel Imms <Tyriar@users.noreply.github.com>

Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

…ion.ps1 Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

…ion-rc.zsh Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts

src/vs/platform/terminal/common/capabilities/capabilities.ts

src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts

src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts

Tyriar · 2025-01-10T13:34:04Z

@anthonykim1 updating branch should hopefully simplify the commit list since the pwsh PR was merged.

…g env

Tyriar · 2025-01-10T19:38:31Z

src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts

+		if (!isTrusted) {
+			return;
+		}
+		this._env.clear();


Don't need to clear anymore

I removed them here:
but would we ever have to worry about a case where we start startEnvironmentSingleVar but User requests to access terminal.shellIntegration.env before we go into setEnvironmentSingleVar and endEnvironmentSingleVar?

If that happens I would expect the old state, rather than a partially complete new state

src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts

…Capability.ts Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts

…Capability.ts

vs-code-engineering · 2025-01-11T00:17:56Z

This PR originates from a fork. If the changes appear safe, you can trigger the pipeline by commenting /AzurePipelines run.

aiday-mar · 2025-01-13T09:39:16Z

Hi, the recents builds are failing in the integration tests. I traced the failure to this PR. I will revert this PR so we can release Insiders today, but feel free to rework the PR and merge it again once the issue is resolved.

This reverts commit e6805d7.

Revert "Expose shell's environment - bash (#237602)" This reverts commit e6805d7.

Tyriar · 2025-01-13T14:45:51Z

@anthonykim1 see #237784 for the build that failed.

anthonykim1 and others added 30 commits September 16, 2024 22:20

start terminal shell env proposed

714bb39

fix typo

3c412ff

progress on shellEnvDetectionCapability, mainThreadTerminalSI

f214756

update IShellEnvDetectionCapability interface

3923373

touch up on $shellEnvChange

0465588

adjust IShellEnvDetectionCapability

e1d611a

properly listen to envChangeEvent

98131e7

Co-authored-by: Daniel Imms <Tyriar@users.noreply.github.com>

Serialize env map, expose on exthost

e37f119

Merge remote-tracking branch 'upstream/main' into shellEnvAPI

a0602bc

start adding to zsh script

94c6574

receive environment variable in extension host, properly escape "

e4ab9e8

Co-authored-by: Daniel Imms <Tyriar@users.noreply.github.com>

clean up

e2b4ca1

Add TODO: properly escape double quotes, figure out why JSON parse fa…

1cf51a5

…ils for bash Co-authored-by: Daniel Imms <Tyriar@users.noreply.github.com>

Fix nonce check, ignore PS1 for now in bash

f0b1578

Add some simple PS1 string tests to deserializeMessage

1b2eb1f

New approach of sending env entries separately

0956b86

be able to get EnvSingleVar

bb735f8

few comments

a1503da

add function signature for start, set, end environment var

61653d5

implement EnvStart, EnvEntry, EnvEnd for single env entry

db981ae

deserialize env value for EnvEntry

a25a9a9

Remove unncessary comments

7fe7c26

only leave pwsh in this PR and exclude other shells

338514c

keep exlcuding other shell env - only pwsh should remain

9b97e1b

Update src/vs/workbench/api/common/extHostTerminalShellIntegration.ts

fc9f3f5

Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

Update src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts

bb93fdd

Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

Update src/vs/workbench/contrib/terminal/common/scripts/shellIntegrat…

0ca8a75

…ion.ps1 Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

Update src/vs/workbench/contrib/terminal/common/scripts/shellIntegrat…

935f14a

…ion-rc.zsh Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

Update src/vs/workbench/contrib/terminal/common/scripts/shellIntegrat…

2f7b969

…ion-rc.zsh Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

Update src/vs/workbench/api/common/extHostTerminalShellIntegration.ts

cb997d5

Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

anthonykim1 requested a review from Tyriar January 10, 2025 05:24

Tyriar requested changes Jan 10, 2025

View reviewed changes

Bdiit approved these changes Jan 10, 2025

View reviewed changes

anthonykim1 and others added 5 commits January 10, 2025 12:52

properly use stable/insider flag so update_env on insiders

6bc4f46

modify test after feedback

5560bdc

Merge branch 'main' into shellEnvBashOnly

9c42014

rename to *EnvironmentSingleVar and make it transactional via _pendin…

9032f16

…g env

add docs for *EnvSingle and update bash script to conform to *EnvSingle

f4c32eb

Tyriar requested changes Jan 10, 2025

View reviewed changes

anthonykim1 and others added 3 commits January 10, 2025 15:02

Update src/vs/platform/terminal/common/capabilities/shellEnvDetection…

fbde338

…Capability.ts Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

Update src/vs/platform/terminal/common/capabilities/shellEnvDetection…

06c4ce8

…Capability.ts Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>

remove _env.clear from start and make _env non-readonly

532ef41

Tyriar previously approved these changes Jan 10, 2025

View reviewed changes

src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts Outdated Show resolved Hide resolved

Update src/vs/platform/terminal/common/capabilities/shellEnvDetection…

9b6a10e

…Capability.ts

Tyriar dismissed their stale review via 9b6a10e January 10, 2025 21:23

Tyriar approved these changes Jan 10, 2025

View reviewed changes

Bashirsaba approved these changes Jan 10, 2025

View reviewed changes

anthonykim1 marked this pull request as ready for review January 11, 2025 00:16

anthonykim1 enabled auto-merge (squash) January 11, 2025 00:16

vs-code-engineering bot added this to the January 2025 milestone Jan 11, 2025

justschen approved these changes Jan 11, 2025

View reviewed changes

anthonykim1 merged commit e6805d7 into microsoft:main Jan 11, 2025
7 checks passed

aiday-mar added a commit that referenced this pull request Jan 13, 2025

Revert "Expose shell's environment - bash (#237602)"

f470910

This reverts commit e6805d7.

aiday-mar mentioned this pull request Jan 13, 2025

Revert "Expose shell's environment - bash " #237791

Merged

aiday-mar added a commit that referenced this pull request Jan 13, 2025

Revert "Expose shell's environment - bash " (#237791)

69d97b0

Revert "Expose shell's environment - bash (#237602)" This reverts commit e6805d7.

anthonykim1 mentioned this pull request Jan 13, 2025

Bring back expose shell's environment - bash #237844

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Expose shell's environment - bash #237602

Expose shell's environment - bash #237602

anthonykim1 commented Jan 9, 2025

Tyriar commented Jan 10, 2025

Tyriar Jan 10, 2025

Bdiit Jan 10, 2025

anthonykim1 Jan 10, 2025 •

edited

Loading

Tyriar Jan 10, 2025

vs-code-engineering bot commented Jan 11, 2025

aiday-mar commented Jan 13, 2025

Tyriar commented Jan 13, 2025

Expose shell's environment - bash #237602

Expose shell's environment - bash #237602

Conversation

anthonykim1 commented Jan 9, 2025

Tyriar commented Jan 10, 2025

Tyriar Jan 10, 2025

Choose a reason for hiding this comment

Bdiit Jan 10, 2025

Choose a reason for hiding this comment

anthonykim1 Jan 10, 2025 • edited Loading

Choose a reason for hiding this comment

Tyriar Jan 10, 2025

Choose a reason for hiding this comment

vs-code-engineering bot commented Jan 11, 2025

aiday-mar commented Jan 13, 2025

Tyriar commented Jan 13, 2025

anthonykim1 Jan 10, 2025 •

edited

Loading