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 #392

Merged
merged 264 commits into from
Aug 5, 2024

Conversation

RomanNikitenko
Copy link
Contributor

@RomanNikitenko RomanNikitenko commented Jul 29, 2024

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:

  • 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

TylerLeonhardt and others added 30 commits July 19, 2024 14:48
* 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
…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
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
Tyriar and others added 22 commits July 26, 2024 16:39
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.
* 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
* 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
Copy link

github-actions bot commented Jul 29, 2024

Click here to review and test in web IDE: Contribute

Copy link

@RomanNikitenko RomanNikitenko marked this pull request as ready for review July 30, 2024 10:28
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.

Thank you, Roman, for your efforts to keep Che-Code up to date with the upstream Code 🙏

@RomanNikitenko RomanNikitenko merged commit afee599 into che-incubator:main Aug 5, 2024
8 checks passed
@RomanNikitenko RomanNikitenko deleted the aligh-with-upstream branch August 5, 2024 09:36
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.