-
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
chore: Align with upstream #392
Merged
RomanNikitenko
merged 264 commits into
che-incubator:main
from
RomanNikitenko:aligh-with-upstream
Aug 5, 2024
Merged
chore: Align with upstream #392
RomanNikitenko
merged 264 commits into
che-incubator:main
from
RomanNikitenko:aligh-with-upstream
Aug 5, 2024
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
* Have select account picker include accounts that don't match requested scopes (this will run `createSession` for that chosen account) * Implement multi-account GitHub support behind a setting
Don't replace common prefix
fix #214796
…2263) * SCM - remove experimental from the showHistoryGraph setting name * Fix compilation error * Fix setting description
Gentoo provides a framework to define modular code that can be reused between ebuilds and packages; the file extension for Gentoo eclasses should be registered as shell-like syntax in addition to ebuilds. https://wiki.gentoo.org/wiki/Eclass
Fixes #222230
Make sure \ appears at end of dir results on Windows
Cache global pwsh completions across terminals and reloads
* feat: render warnings for partial or omitted references * feat: apply warning foreground color to label for omitted reference * feat: render omitted warning in request attachment widget * feat: allow clicking to open chat attachment
fix: place regex in variables on `shellIntegration-bash.sh` script
Fixes #222408
Complete all variables when it's the fist part
* remote: gracefully disconnect from remote EH Addresses microsoft/vscode#211462 (comment) This applies the same fix seen in #218972 to the extension host. It adds a `disconnect` method that is called and awaited during the lifecycle shutdown, which is implemented by th remote extension host connection. The disconnection is awaited, but I think this is safe because it only awaits `.drain()` and does so in the context of methods which were already async at higher levels. * fix tests * Revert "cli: honor --connection-token-file in serve-web (#219041)" This reverts commit d8ddc28. That commit was incorrectly merged in the branch.
Co-authored-by: decisive <[email protected]>
* make sure the timeout does not run if it has been cleared * use `unknown` --------- Co-authored-by: Benjamin Pasero <[email protected]>
Close button on notebooks is broken (fix #221582)
fix: properly detect node env everywhere Co-authored-by: Loïc Mangeonjean <[email protected]>
… (fix #221014) (#221023) * Show readonly filename decoration after revert * Use a different approach that obeys 'increasing mtime' rule * Also update locked flag * Add tests
…n if it is installed (#224158)
* Make space for tree sitter * Add the tree sitter wasm file * Very naive tree-sitter syntax highlighting for html, with a layer breaker * Update tree when content changes * WIP for making abstract tokens class * Handle theme changes * Replace entire text model value with parse callback * Perf improvements * Add tree-sitter-typescript * Add typescript + better initial parsing * Refactor into tree parsing service and fix flaw in parse callback * Remove things that aren't the parser service * Add yielding * Remove changes that aren't required for PR * Remove more file changes * Reduce yield to 50 ms * Fix incremental parsing * Try update node-abi * Revert "Try update node-abi" This reverts commit df28801e31e3d672a0754eb9edc55a7208d7cde8. * Update text buffer chunk api * fix build * Remove tree-sitter dependency * Adopt new, as yet unpublished, `@vscode/tree-sitter-wasm` package * Use published `@vscode/tree-sitter-wasm` package * Break `TreeSitterTree` and `TreeSitterParserService` into better pieces and: - document the order of editor changes - use service injection where `TextModel` is constructed * Fix tests * Remove unneeded import * Fix missing tree-sitter-wasm in web and remote * Make package.jsons match * Add @vscode/tree-sitter-wasm to web loader config * Try using importAMDNodeModule * PR feedback * Add race condition test for changing language while loading language * Use same timeout * Queue content changes * Remove override dispose * Move queue into TreeSitterTree --------- Co-authored-by: Peng Lyu <[email protected]>
vscode-upstream-sha1: 546567a rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED
Pull Request images published ✨ Editor: quay.io/che-incubator-pull-requests/che-code:pr-392-amd64 |
RomanNikitenko
requested review from
azatsarynnyy and
vitaliy-guliy
as code owners
July 30, 2024 10:28
azatsarynnyy
approved these changes
Aug 5, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you, Roman, for your efforts to keep Che-Code up to date with the upstream Code 🙏
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?
Rebase against the upstream
What issues does this PR fix?
eclipse-che/che#23059
How to test this PR?
Recent changes in the upstream are related to Github authentication, so please test related use cases.
Also:
Does this PR contain changes that override default upstream Code-OSS behavior?
git rebase
were added to the .rebase folder