Alignment with upstream #485
Draft
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
Fixes #237564
…roll Scroll to bottom instead of restoring state on run recent
…icate there are higher ranked suggestions (#237577)
Use ICodeMapperService for 'Apply In Editor'
* implement log filtering as a editor contrib * show all log levels by default
* 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]>
inline edits UI changes
…een pushed to the remote (#237605)
…, ctx key (#237513) * fix #10338 * add ctx key for working set, use it for the when clause
* chore - mark disposables from registry#register functions as disposables so that they don't appear as leaking * fix various leaking disposables
- Adds a 🔒 icon that can be toggled on files in the working set - When toggled, extensions with the chatReadonlyPromptReference will see the references is `isReadonly` - Currently the 🔒 icon is only shown when an extension that has the proposal is installed. - I'm not a big fan of the name "isReadonly", it's more like "hintReadonly", at least in my current use case. But "isReadonly" is better existing terminology that we already have in vscode API. 
* 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
Restore the semantics of how it used to be in before the change in microsoft/vscode#144890
Support back and forward keys in default shortcuts These keys can be found on certain keyboards, and on custom layouts like [Extend](https://dreymar.colemak.org/layers-extend.html).
* Tweaks to editFile tool * Fix newlines in json
Try to keep it from printing json blocks with the tool args
- Fix margin css in edits - Fix flickering while lists stream- from rendering the first item as a header, and a line-height discrepency - Fix extra margin in request in Edits - Briefly rendering empty codeblock in Edits
* Revert "Revert Enablement of EditContext on Insiders (#235062)" This reverts commit 45385e1. * adding product import * adding som code * removing console logs * make sure editor selection is observed after keybinding dispatches Co-authored-with: Aiday Mar <[email protected]> * removing empty lines --------- Co-authored-by: João Moreno <[email protected]>
Revert "Expose shell's environment - bash (#237602)" This reverts commit e6805d7.
* Add a Configure option to overflow menu of Open Editors view * Use `@feature:explorer openEditors` for the query
* improve diff for /edits * no double-diff for chat modified entries * align whitespace property * overflow logic for overlay widget * fix compiler
… #237804) (#237805)
vscode-upstream-sha1: 4375521 rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED
|
Click here to review and test in web IDE: |
&message=Dev%20cluster%20(for%20maintainers)&logo=eclipseche&color=525C86&labelColor=FDB940)
|
Pull Request images published ✨ Editor: quay.io/che-incubator-pull-requests/che-code:pr-485-amd64 |
RomanNikitenko
force-pushed
the
alignment-with-upstream
branch
from
289aaed to
5031485
Compare
…is not available Signed-off-by: Roman Nikitenko <[email protected]> rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED
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.
What does this PR do?
What issues does this PR fix?
How to test this PR?
Does this PR contain changes that override default upstream Code-OSS behavior?
git rebasewere added to the .rebase folder