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

chore: Align with upstream #373

Merged
merged 218 commits into from
Jun 18, 2024
Merged

chore: Align with upstream #373

merged 218 commits into from
Jun 18, 2024

Conversation

RomanNikitenko
Copy link
Collaborator

What does this PR do?

Rebase against the upstream

What issues does this PR fix?

eclipse-che/che#22965

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

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

r-sargento and others added 30 commits May 20, 2024 14:49
Created two new settings to be added to .vscode/settings.json
('variableDisplayType.watchView' and
'variableDisplayType.variableView') when set
to true it shows the variable type in the
format var_name: type = value in the debug panel and variable panel
respectively and the hover will now display var_name.
When set to false uses the previous
expected behaviour (var_name = value)
and the hover will display the type.

Co-authored-by: Diogo Pinto <[email protected]>
…312)

* Make sure event subscriptions are stored and disposed (#214234)

* fix tests
* allow null value

* allow unsetting color

* undo change

* delete color

* undo changes

* remove unused code

* unset right map

* add function to create nullable color schema

* use nullable schema

* undo change

* fix nullable object

* use default value

* update both schemas on timeout

* simplifications & polish

---------

Co-authored-by: Martin Aeschlimann <[email protected]>
* register theme service

* set color theme

* set default snippet

* remove log

* use type import

* fix formatting

* undo change

* remove log

* fix formatting

* rename interface

* rename function

* update listener

* remove unused code

* inline event listener

* polish

---------

Co-authored-by: Martin Aeschlimann <[email protected]>
colorUtils: fixing typing error caused by merging
* renames, test improvement

* code improvements
* Fix opening select boxes

This fixes a regression caused by #213465

Closes #214303
Closes #214345

* Fix another regression caused by #213465

---------

Co-authored-by: Benjamin Pasero <[email protected]>
* better lightbulb scenario for when we are very close to edge

* fix and change logic for last line

* clean up whitespace

* helper func, check whitespace

* remove extra model check

* add new logic for when blocked above and below

* remove whitespace
bpasero and others added 23 commits June 17, 2024 19:11
Fixes clipping of custom context menus in embedded editors, such as those in the chat view
* Start breaking ChatListRenderer content types into their own classes

* Make renderTextEdit a Part as well

* Add ChatMarkdownContentPart

* Layout codeblock refs
…ering (#215907)" (#216267)

This reverts commit 85e9b07.
Revert ":up: `@parcel/[email protected]` (#215964)"

This reverts commit 406d1d7.
Bumps [ws](https://github.com/websockets/ws) from 7.4.6 to 7.5.10.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@7.4.6...7.5.10)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
vscode-upstream-sha1: a8e00a0

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
Copy link

github-actions bot commented Jun 18, 2024

Click here to review and test in web IDE: Contribute

Copy link

@RomanNikitenko RomanNikitenko merged commit 14370d0 into main Jun 18, 2024
8 checks passed
@RomanNikitenko RomanNikitenko deleted the fix-rebase branch June 18, 2024 11: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.