-
Notifications
You must be signed in to change notification settings - Fork 30.6k
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
Expose shell's environment - bash #237602
Merged
+106
−1
Merged
Changes from 67 commits
Commits
Show all changes
71 commits
Select commit
Hold shift + click to select a range
714bb39
start terminal shell env proposed
anthonykim1 3c412ff
fix typo
anthonykim1 f214756
progress on shellEnvDetectionCapability, mainThreadTerminalSI
anthonykim1 3923373
update IShellEnvDetectionCapability interface
anthonykim1 0465588
touch up on $shellEnvChange
anthonykim1 e1d611a
adjust IShellEnvDetectionCapability
anthonykim1 98131e7
properly listen to envChangeEvent
anthonykim1 e37f119
Serialize env map, expose on exthost
anthonykim1 a0602bc
Merge remote-tracking branch 'upstream/main' into shellEnvAPI
anthonykim1 94c6574
start adding to zsh script
anthonykim1 e4ab9e8
receive environment variable in extension host, properly escape "
anthonykim1 e2b4ca1
clean up
anthonykim1 1cf51a5
Add TODO: properly escape double quotes, figure out why JSON parse fa…
anthonykim1 f0b1578
Fix nonce check, ignore PS1 for now in bash
Tyriar 1b2eb1f
Add some simple PS1 string tests to deserializeMessage
Tyriar 0956b86
New approach of sending env entries separately
Tyriar bb735f8
be able to get EnvSingleVar
anthonykim1 a1503da
few comments
anthonykim1 61653d5
add function signature for start, set, end environment var
anthonykim1 db981ae
implement EnvStart, EnvEntry, EnvEnd for single env entry
anthonykim1 a25a9a9
deserialize env value for EnvEntry
anthonykim1 7fe7c26
Remove unncessary comments
anthonykim1 338514c
only leave pwsh in this PR and exclude other shells
anthonykim1 9b97e1b
keep exlcuding other shell env - only pwsh should remain
anthonykim1 fc9f3f5
Update src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
anthonykim1 bb93fdd
Update src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
anthonykim1 0ca8a75
Update src/vs/workbench/contrib/terminal/common/scripts/shellIntegrat…
anthonykim1 935f14a
Update src/vs/workbench/contrib/terminal/common/scripts/shellIntegrat…
anthonykim1 2f7b969
Update src/vs/workbench/contrib/terminal/common/scripts/shellIntegrat…
anthonykim1 cb997d5
Update src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
anthonykim1 b6b673f
Update src/vs/platform/terminal/common/capabilities/shellEnvDetection…
anthonykim1 0ab7322
Update src/vs/workbench/api/common/extHost.protocol.ts
anthonykim1 fe93145
Update src/vs/workbench/api/browser/mainThreadTerminalShellIntegratio…
anthonykim1 badfb37
Update src/vs/platform/terminal/common/capabilities/shellEnvDetection…
anthonykim1 3f156f9
Update src/vs/platform/terminal/common/capabilities/shellEnvDetection…
anthonykim1 4e8c2cb
Update src/vs/platform/terminal/common/capabilities/shellEnvDetection…
anthonykim1 333c8d5
Update src/vs/platform/terminal/common/capabilities/capabilities.ts
anthonykim1 c68c58a
Update src/vs/workbench/api/browser/mainThreadTerminalShellIntegratio…
anthonykim1 944ce9a
Update src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
anthonykim1 b2afe32
Update src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
anthonykim1 dbbe2df
Update src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
anthonykim1 0b248e2
add comment for ShellEnvDetection
anthonykim1 d246ba7
change envs in shellEnvDetectionCapability to env
anthonykim1 6b081da
Mention escaping character for EnvJSON similar to commandLine
anthonykim1 d555813
Do not fire env event if env has not changed
anthonykim1 3591fa4
add link to CommandLine
anthonykim1 143a4cc
follow main branch format so I avoid merge conflict
anthonykim1 6509fa1
Merge branch 'main' into shellEnvPwshOnly
anthonykim1 03fe326
remove resolved TODO
anthonykim1 d501cee
Update src/vs/workbench/api/browser/mainThreadTerminalShellIntegratio…
anthonykim1 e94cf4d
Update src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
anthonykim1 0b831a5
use vscode object equals
anthonykim1 5f9f2db
Merge branch 'main' into shellEnvPwshOnly
Tyriar f853a1a
add zsh update_env for shellIntegration-zsh.sh
anthonykim1 a438864
add EnvStart, EnvEntry, EnvEnd
anthonykim1 df71492
why doesnt if [ "$__vsc_stable" = "0" ]; work
anthonykim1 2a9d2d7
add test to check shellPath
anthonykim1 2aee3f0
Merge branch 'main' into shellEnvBashOnly
anthonykim1 fac9a74
stop messing with formatting
anthonykim1 e372a9d
try to be more detail in testing
anthonykim1 29b59e5
clean up
anthonykim1 e3ffe10
dont change the format
anthonykim1 6bc4f46
properly use stable/insider flag so update_env on insiders
anthonykim1 5560bdc
modify test after feedback
anthonykim1 9c42014
Merge branch 'main' into shellEnvBashOnly
anthonykim1 9032f16
rename to *EnvironmentSingleVar and make it transactional via _pendin…
anthonykim1 f4c32eb
add docs for *EnvSingle and update bash script to conform to *EnvSingle
anthonykim1 fbde338
Update src/vs/platform/terminal/common/capabilities/shellEnvDetection…
anthonykim1 06c4ce8
Update src/vs/platform/terminal/common/capabilities/shellEnvDetection…
anthonykim1 532ef41
remove _env.clear from start and make _env non-readonly
anthonykim1 9b6a10e
Update src/vs/platform/terminal/common/capabilities/shellEnvDetection…
Tyriar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't need to clear anymore
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed them here:
but would we ever have to worry about a case where we start
startEnvironmentSingleVar
but User requests to accessterminal.shellIntegration.env
before we go intosetEnvironmentSingleVar
andendEnvironmentSingleVar
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If that happens I would expect the old state, rather than a partially complete new state