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: Rebase against upstream #338

Merged
merged 868 commits into from Mar 19, 2024
Merged

chore: Rebase against upstream #338

merged 868 commits into from Mar 19, 2024

Conversation

RomanNikitenko
Copy link
Contributor

@RomanNikitenko RomanNikitenko commented Mar 19, 2024

What does this PR do?

Rebase against the upstream

What issues does this PR fix?

eclipse-che/che#22884

How to test this PR?

  • the 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

rebornix and others added 30 commits March 12, 2024 21:18
* Fix #207450

* Fix #207432

* Fix #207442
Fix #207434
* add message to AI search results

* don't run search if no search results
…lPushStackEleChangesAPI

pushStackElement API in NB Model to be same as same API in Text Model
Reduce volume of inputlatency events to 1% of users
* pushStackElement API in NB Model to be same as same API in Text Model

* More meaningful timeline entries for Notebooks
add `ChatLocation` so that chat participants can contribute to terminal chat
…at to work on Windows (#202762)

* Do not prefix autoImportFileExcludePatterns with `/`

* Fix autoImportFileExcludePatterns format
…ed locations to the cursor navigation histories. (fix #207484) (#207561)
* hide inline chat content widget on blur

* use message controller to show session creation failure
ulugbekna and others added 18 commits March 18, 2024 23:38
* move sparkle to input

* cleanup
Fix terminal chat input background
Adopt buttonConfigProvider for terminal chat actions
From the user's perspective:
* Now the cmd/alt+up/down keybindings that cycle through separators have the following behavior:
  * if a separator is visible, just reveal it without messing with scroll top
  * if a separator is not visible, scroll it up to the top of the view
* When the active item, or your mouse, is over an item, the actions on that section's separator are also visible

Code perspective:
* Separate separators & regular items into their own renderers (there's more to clean up here, but a good start)
* Allow the renderers to know which items are visible and expose that (so that we can determine which separator to show actions on)
* Folded revealing an item into the focus function for ease
* Simplified the call to `setElements` to be used in "tree-like" scenarios or "list-like" scenarios
vscode-upstream-sha1: 770afe0

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

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

github-actions bot commented Mar 19, 2024

Click here to review and test in web IDE: Contribute

Copy link

Pull Request Dev image published:
👉 quay.io/che-incubator-pull-requests/che-code-dev:pr-338-dev-amd64

@RomanNikitenko RomanNikitenko changed the title Fix rebase chore: Rebase against upstream Mar 19, 2024
Copy link

Pull Request Che-Code image published:
👉 quay.io/che-incubator-pull-requests/che-code:pr-338-amd64

@RomanNikitenko RomanNikitenko marked this pull request as ready for review March 19, 2024 12:07
Copy link
Member

@azatsarynnyy azatsarynnyy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@RomanNikitenko RomanNikitenko merged commit 755c43b into main Mar 19, 2024
8 checks passed
@RomanNikitenko RomanNikitenko deleted the fix-rebase branch March 19, 2024 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet