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

Merged

Conversation

RomanNikitenko
Copy link
Contributor

@RomanNikitenko RomanNikitenko commented Jan 3, 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

What issues does this PR fix?

eclipse-che/che#23291

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

alexdima and others added 30 commits December 16, 2024 17:20
* debt: remove migrations

* remove migration test
Remove workaround for swiftshader upstream issue
* [prompt snippets]: working on recursive file references

* [prompt snippets]: working on file contents codec

* [prompt snippets]: implement the `LinesCodecDecoder`

* [prompt snippets]: working on the `SimpleTokensCodecDecoder`

* [prompt snippets]: implement first version of `PromptSyntaxCodec`

* [prompt snippets]: add `Range` attributes to all the tokens

* [prompt snippets]: refactoring components to standalone files

* [prompt snippets]: move out components to separate files, working on the first unit test

* [prompt snippets]: add the first unit test for `LinesDecoder`

* [prompt snippets]: add first unit test for the `SimpleDecoder`

* [prompt snippets]: refactor `SimpleDecoder` logic

* [prompt snippets]: make `SimpleDecoder` handle `\t` characters and improve unit tests

* [prompt snippets]: add unit tests for the `ChatbotPromptCodec` codec

* [prompt snippets]: add unit test for the `ChatbotPromptReference`

* [prompt snippets]: working on enhancing prompt context

* [prompt snippets]: enahnce working set file references on submit

* [prompt snippets]: cleanup

* [prompt snippets]: implement automatic references resolution on file variable addition

* [prompt snippets]: implement prompt snippets for implicit context files

* [prompt snippets]: improve implicit context file rendering

* [prompt snippets]: remove redundant `ChatReference` class

* [prompt snippets]: `PromptReference` can now subscribe to filesystem changes, added unit test for the `assertDefined` util

* [prompt snippets]: make `LinesDecoder` to also emit `NewLine` tokens, add more unit tests for it

* [prompt snippets]: resolve nested references for dynamic variables and update variable label

* [prompt snippets]: add nested file references to implicit context of prompt request

* [prompt snippets]: variable hover label now includes nested file references

* [prompt snippets]: add the `TestDecoder` and `TestLinesDecoder` reusable test utilities

* [prompt snippets]: add unit tests for `ChatbotPromptDecoder` decoder

* [prompt snippets]: refactor decoders to eliminate static type hacks

* [prompt snippets]: improve `BaseDecoder` logic and docs

* [prompt snippets]: add unit tests for the new reduce-less logic of the stream

* [prompt snippets]: improve doc comments, finish the basic unit test for the `PromptFileReference` class

* [prompt snippets]: finish the main unit test for the `PromptFileReference` class

* [prompt snippets]: make the `PromptFileReference` class ininite-reference-recursion-proof and add approptiate tests

* [prompt snippets]: cleanup

* [prompt snippets]: ensure codecs work well with UTF16 codepoints

* [prompt snippets]: add `randomInt()` utility and related tests

* [prompt snippets]: refactor and add more unit tests

* [prompt snippets]: fix unresolved `Buffer` import reference

* [prompt snippets]: refactor `LinesDecoder` to use `VSBuffer` as underlying data source

* [prompt snippets]: make the `ImplicitContext` to create prompt file reference object only if `prompt-snippets` config value is set

* [prompt snippets]: make the `ChatDynamicVariable` to resolve prompt file reference object only if `prompt-snippets` config value is set

* [prompt snippets]: localize (+N more) labels

* [prompt snippets]: pre PR cleanups

* [prompt snippets]: minor cleanups

* [prompt snippets]: address some PR feedback, fix an unit test issue

* [prompt snippets]: move file to common layers

* [prompt snippets]: move base codec types to base/common

* [prompt snippets]: move more codec files around

* [prompt snippets]: update a code comment

* [prompt snippets]: fix `assert.throws()` API incompatibility issue

* [prompt snippets]: minor cleanup

* [prompt snippets]: improve unit tests for the `PromptFileReference`

* [prompt snippets]: skip unit tests of `PromptFileReference` on Windows for now

* [prompt snippets]: address PR feedback

* [prompt snippets]: add `PromptFileReference.isPromptSnippetFile` getter

* [prompt snippets]: move the `assertDefined` utility to `types.ts`

* use service injection in `PromptFileReference` class

* [prompt snippets]: remove formatting changes

* [prompt snippets]: remove more formatting changes

* [prompt snippets]: revert more formatting changes

* [prompt snippets]: add logic to dispose existing variables in `ChatDynamicVariableModel`

* [prompt snippets]: cleanup

* [prompt snippets]: minor cleanup

* [prompt snippets]: remove redundant disposable registrations, cleanup more formatting changes

* [prompt snippets]: improve cross-platform newline handling, add `vertical tab` and `form feed` tokens

* [prompt snippets]: minor types naming cleanup

* [prompt snippets]: make `ChatPromptCodec` to be a global singleton object and improve doc comments

* [prompt snippets]: address PR feedback

* [prompt snippets]: remove (+N more) label, ensure that `ChatFileReferences` are scoped to files only

* [prompt snippets]: revert changes for the `ImplicitContext`

* [prompt snippets]: cleanup changes in `ChatDynamicVariableModel`

* [prompt snippets]: revert changes in the `ChatRequestParser`

* [prompt snippets]: improve history navigation

* [prompt snippets]: address PR feedback

* [prompt snippets]: allow non-prompt-snippet files to be referenced, but don't parse their contents
These don't add much
Fixes #236122

For css `\0000xx` escaping, if I'm understanding the spec correctly it turns out they eat the space character following them: https://www.w3.org/TR/CSS2/syndata.html#characters

My previous fix didn't account for this. Instead I think a safer fix is to switch to use `Css.escape`. This often over-escapes the string by converting characters that don't need it but should be safe and it fixes the original issue
lszomoru and others added 14 commits December 22, 2024 08:09
…ileNotFound` if the file does not exist (#236863)
And only use Loopback flow when not running in Remote Extension Host.
When we cancel, then the promise should be cancelled. If we don't do this, we hang on the first interaction request until we timeout.

Fixes the 2nd point in microsoft/vscode#236825 (comment)
* Initial implementation

* Refactor editor decoration type
vscode-upstream-sha1: 2bdb3e9

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
Copy link

github-actions bot commented Jan 3, 2025

Click here to review and test in web IDE: Contribute

@RomanNikitenko
Copy link
Contributor Author

VS Code tests are failing in the PR checks, investigating it...

Copy link

github-actions bot commented Jan 6, 2025

@RomanNikitenko RomanNikitenko force-pushed the alignment-with-upstream branch from 82b513a to c97bc9d Compare January 6, 2025 19:57
Copy link

github-actions bot commented Jan 7, 2025

@RomanNikitenko RomanNikitenko force-pushed the alignment-with-upstream branch from 99507b3 to 5572e5d Compare January 7, 2025 16:06
Copy link

github-actions bot commented Jan 7, 2025

@RomanNikitenko RomanNikitenko force-pushed the alignment-with-upstream branch from 5572e5d to f14588e Compare January 7, 2025 19:37
Copy link

github-actions bot commented Jan 7, 2025

@RomanNikitenko RomanNikitenko marked this pull request as ready for review January 8, 2025 04:48
@RomanNikitenko RomanNikitenko merged commit 9e4d087 into che-incubator:main Jan 8, 2025
7 checks passed
@RomanNikitenko RomanNikitenko deleted the alignment-with-upstream branch January 8, 2025 10:16
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.