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

Merged
merged 180 commits into from
Apr 9, 2024
Merged

chore: Align with upstream #342

merged 180 commits into from
Apr 9, 2024

Conversation

RomanNikitenko
Copy link
Contributor

@RomanNikitenko RomanNikitenko commented Apr 4, 2024

What does this PR do?

Rebase against the upstream

What issues does this PR fix?

eclipse-che/che#22905

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

marvinthepa and others added 30 commits November 7, 2021 22:52
Continuation of microsoft/vscode#193937 and microsoft/vscode#197442

This adds the command descriptions of editor actions to the ICommandQuickPick results so that those results can be picked up by the "similar commands" feature.

Example:

I can add:
```
metadata: {
    description: nls.localize2('test', "xyz"),
}
```
to the [AddLineCommentAction](https://github.com/microsoft/vscode/blob/7d788e70b95c79718b565ff9e255858db4cc74b3/src/vs/editor/contrib/comment/browser/comment.ts#L105)... and then when I search "xyz" it'll show up.
Use IconSelectBox to change terminal icon, remove dupes
This is important information for the command so we should include it in this response.
Introduce ITerminalConfigurationService, move TerminalConfigHelper.config to it
meganrogge and others added 18 commits April 3, 2024 15:40
move speech accessibility signals to contribution file
* Fix injected services becoming public by mistake

Fixes cases of `@IFooService readonly foo: IFooService`. This makes the service public, which is likely not expected and also means we can't mangle it

* Fix name

* Remove unused props
- use diff editor hiding of unchanged regions
- simpler code compare block (for now)
* first snap

* sent the comments to the shadow realm

* one comment we forgot to remove :(
Add support for `ChatResponseTextEditPart`
vscode-upstream-sha1: a52d0d9

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

github-actions bot commented Apr 4, 2024

Click here to review and test in web IDE: Contribute

Copy link

github-actions bot commented Apr 4, 2024

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

Copy link

github-actions bot commented Apr 4, 2024

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

@RomanNikitenko RomanNikitenko changed the title Align with upstream chore: Align with upstream Apr 5, 2024
@RomanNikitenko RomanNikitenko marked this pull request as ready for review April 5, 2024 08:48
@RomanNikitenko RomanNikitenko merged commit 2c42cb1 into main Apr 9, 2024
8 checks passed
@RomanNikitenko RomanNikitenko deleted the align-with-upstream branch April 9, 2024 06:20
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.