[pull] main from microsoft:main #404
Merged
Conversation
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
* 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 * add zsh update_env for shellIntegration-zsh.sh * add EnvStart, EnvEntry, EnvEnd * why doesnt if [ "$__vsc_stable" = "0" ]; work * add test to check shellPath * stop messing with formatting * try to be more detail in testing * clean up * dont change the format * properly use stable/insider flag so update_env on insiders * modify test after feedback * rename to *EnvironmentSingleVar and make it transactional via _pending env * add docs for *EnvSingle and update bash script to conform to *EnvSingle * 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]> * remove _env.clear from start and make _env non-readonly * Update src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts --------- Co-authored-by: Daniel Imms <[email protected]> Co-authored-by: Daniel Imms <[email protected]>
* [markdown links]: add II of `MarkdownDecoder` * [markdown links]: add `Colon` and `Hash` simple tokens, implement the new logic inside `ChatPromptDecoder` * [markdown links]: add unit tests for the `MarkdownDecoder`, update other unit tests to account for the new MD links * [markdown links]: refactor and improve docs * [markdown links]: improve unit tests of the `MarkdownDecoder` * [markdown links]: fix recursion issue caused by `##` in `ChatPromptDecoder` and improve unit tests * [markdown links]: improve docs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
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 : )