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

[pull] main from microsoft:main #399

Merged
merged 4 commits into from
Jan 9, 2025
Merged

[pull] main from microsoft:main #399

merged 4 commits into from
Jan 9, 2025

Conversation

pull[bot]
Copy link

@pull pull bot commented Jan 9, 2025

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

meganrogge and others added 4 commits January 9, 2025 21:31
* start terminal shell env proposed

* fix typo

* progress on shellEnvDetectionCapability, mainThreadTerminalSI

* update IShellEnvDetectionCapability interface

* touch up on $shellEnvChange

* adjust IShellEnvDetectionCapability

* properly listen to envChangeEvent
Co-authored-by: Daniel Imms <[email protected]>

* Serialize env map, expose on exthost

* start adding to zsh script

* receive environment variable in extension host, properly escape "
Co-authored-by: Daniel Imms <[email protected]>

* clean up

* Add TODO: properly escape double quotes, figure out why JSON parse fails for bash

Co-authored-by: Daniel Imms <[email protected]>

* Fix nonce check, ignore PS1 for now in bash

* Add some simple PS1 string tests to deserializeMessage

* New approach of sending env entries separately

* be able to get EnvSingleVar

* few comments

* add function signature for start, set, end environment var

* implement EnvStart, EnvEntry, EnvEnd for single env entry

* deserialize env value for EnvEntry

* Remove unncessary comments

* only leave pwsh in this PR and exclude other shells

* keep exlcuding other shell env - only pwsh should remain

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

Co-authored-by: Daniel Imms <[email protected]>

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

Co-authored-by: Daniel Imms <[email protected]>

* Update src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1

Co-authored-by: Daniel Imms <[email protected]>

* Update src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh

Co-authored-by: Daniel Imms <[email protected]>

* Update src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh

Co-authored-by: Daniel Imms <[email protected]>

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

Co-authored-by: Daniel Imms <[email protected]>

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

Co-authored-by: Daniel Imms <[email protected]>

* Update src/vs/workbench/api/common/extHost.protocol.ts

Co-authored-by: Daniel Imms <[email protected]>

* Update src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts

Co-authored-by: Daniel Imms <[email protected]>

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

Co-authored-by: Daniel Imms <[email protected]>

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

Co-authored-by: Daniel Imms <[email protected]>

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

Co-authored-by: Daniel Imms <[email protected]>

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

Co-authored-by: Daniel Imms <[email protected]>

* Update src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts

Co-authored-by: Daniel Imms <[email protected]>

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

Co-authored-by: Daniel Imms <[email protected]>

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

Co-authored-by: Daniel Imms <[email protected]>

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

Co-authored-by: Daniel Imms <[email protected]>

* add comment for ShellEnvDetection

* change envs in shellEnvDetectionCapability to env

* Mention escaping character for EnvJSON similar to commandLine

* Do not fire env event if env has not changed

* add link to CommandLine

* follow main branch format so I avoid merge conflict

* remove resolved TODO

* Update src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts

Co-authored-by: Daniel Imms <[email protected]>

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

Co-authored-by: Daniel Imms <[email protected]>

* use vscode object equals

---------

Co-authored-by: Daniel Imms <[email protected]>
Co-authored-by: Daniel Imms <[email protected]>
@pull pull bot added the ⤵️ pull label Jan 9, 2025
@pull pull bot merged commit a26fe3e into GesuBackups:main Jan 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants