-
Notifications
You must be signed in to change notification settings - Fork 36
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
Alignment with upstream #485
Draft
RomanNikitenko
wants to merge
252
commits into
che-incubator:main
Choose a base branch
from
RomanNikitenko:alignment-with-upstream
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Alignment with upstream #485
RomanNikitenko
wants to merge
252
commits into
che-incubator:main
from
RomanNikitenko:alignment-with-upstream
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
expose source as getter
…ache Fix toggling wrapping sometimes losing track of DOM nodes
Render wrapped lines on GPU
fix #237596
* Loopback does _not_ work in REH or WebWorker * UrlHandler _does_ work in REH
… proxies (#238149) * Attempt to use Electron fetch for github-authentication Also changes fallback from node-fetch to the built-in Node fetch * Remove Content-Length header Electron compatibility It looks like it was set incorrectly to the body contents anyways.
…plication (#238080)
Share GPU device across editors, access sync when possible
This does not yet support colors applied via decorations like find. Part of #227101
Fixes #238175
* support inline vars after cell execution * dispose listeners and cleanup * clear all outputs -> clear inline values + setting mention * feedback
* copy everything from #237624 * try to better word notes in proposed.d.ts * why is test being so flaky * try sending one more text * strictEqual only on isInteractedWith always fails * update the name as recommended * embed to make sure we are selecting event we are interested in as recommended * add node as part of TerminalShellType * getting type ..extHostTypes.TerminalShellType.Bash is not comparable to type ..vscode.TerminalShellType.Bash * just use one enum? * figured out how to get from extHostTypes * clean up
Expose gpu acceleration setting to users
RomanNikitenko
force-pushed
the
alignment-with-upstream
branch
from
January 17, 2025 21:23
1ecef49
to
46d6754
Compare
Get SPAA working against token metadata bg
Pull Request images published ✨ Editor: quay.io/che-incubator-pull-requests/che-code:pr-485-amd64 |
fix #238183
* bump distro * supports vision work * better promise handling, clean up if statements * more ui update * make capabilities optional * some cleanup * fix function
* Respond to layout changes This seems to work fairly well. I think a follow up change I'll make is maybe redoing this to leverage CSS variables instead... like how it's done in the debugToolBar which looks cleaner, but that can come later. Fixes #237627 * use `onDidLayoutContainer`
vscode-upstream-sha1: 909c153 rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED
Signed-off-by: Roman Nikitenko <[email protected]> rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED
RomanNikitenko
force-pushed
the
alignment-with-upstream
branch
from
January 18, 2025 08:32
46d6754
to
2380960
Compare
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?
20.18.1
version is not available in the images that we use to prepareche-code
assemblyvscode/proxy-agent
version to0.28.0
, seecode/package.json
andcode/remote/package.json
.The reason is:
0.29.0
version requires20.18.1
version of the Node.js - it is still not available in theubi
imagesWhat issues does this PR fix?
eclipse-che/che#23310
How to test this PR?
You can use the following links to start a workspace for testing:
ubi8-based
tools container: https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#/https://github.com/RomanNikitenko/web-nodejs-sample/tree/ubi8-basedubi8-nodejs-based
tools container: https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#/https://github.com/RomanNikitenko/web-nodejs-sample/tree/ubi8-nodejs-basedubi9-based
tools container: https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#/https://github.com/RomanNikitenko/web-nodejs-sample/tree/ubi9-basedubi9-nodejs-based
tools container: https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#/https://github.com/RomanNikitenko/web-nodejs-sample/tree/ubi9-nodejs-basedDoes this PR contain changes that override default upstream Code-OSS behavior?
git rebase
were added to the .rebase folder