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

Alignment with upstream #485

Draft
wants to merge 252 commits into
base: main
Choose a base branch
from

Conversation

RomanNikitenko
Copy link
Contributor

@RomanNikitenko RomanNikitenko commented Jan 13, 2025

What does this PR do?

  • Rebase against the upstream
  • We still can not align Node.js version with upstream as 20.18.1 version is not available in the images that we use to prepare che-code assembly
  • Downgrade vscode/proxy-agent version to 0.28.0, see code/package.json and code/remote/package.json.
    The reason is: 0.29.0 version requires 20.18.1 version of the Node.js - it is still not available in the ubi images

What issues does this PR fix?

eclipse-che/che#23310

How to test this PR?

  • PR jobs should be green
  • testing of any use cases is useful as we pick up a lot of commits from the upstream

You can use the following links to start a workspace for testing:

Does this PR contain changes that override default upstream Code-OSS behavior?

  • the PR contains changes in the code folder (you can skip it if your changes are placed in a che extension )
  • the corresponding items were added to the CHANGELOG.md file
  • rules for automatic git rebase were added to the .rebase folder

jogibear9988 and others added 30 commits January 3, 2025 09:36
…roll

Scroll to bottom instead of restoring state on run recent
…icate there are higher ranked suggestions (#237577)
* 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]>
…, 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
benibenj and others added 18 commits January 17, 2025 11:20
…ache

Fix toggling wrapping sometimes losing track of DOM nodes
* 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.
Share GPU device across editors, access sync when possible
This does not yet support colors applied via decorations like find.

Part of #227101
* 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
@RomanNikitenko RomanNikitenko force-pushed the alignment-with-upstream branch from 1ecef49 to 46d6754 Compare January 17, 2025 21:23
Copy link

meganrogge and others added 3 commits January 17, 2025 14:33
* 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`
@RomanNikitenko RomanNikitenko marked this pull request as draft January 18, 2025 07:48
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 RomanNikitenko force-pushed the alignment-with-upstream branch from 46d6754 to 2380960 Compare January 18, 2025 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.