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

Rebase against upstream VS Code to fix the auto-rebase job #56

Merged
merged 261 commits into from
Jun 22, 2022

Conversation

azatsarynnyy
Copy link
Member

@azatsarynnyy azatsarynnyy commented Jun 17, 2022

In the PR, I've rebased Che-Code against upstream VS Code with resolving some conflicts in order to restore the automatic rebase GitHub Workflow.

closes eclipse-che/che#21471

How to test

  1. Run https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#https://github.com/azatsarynnyy/java-spring-petclinic/tree/devfilev2.
  2. Check that Che-Code is started.

bpasero and others added 16 commits June 17, 2022 09:16
* Try aligning external drop handling

Tree views provided the first public drag and drop api. We've since also adopted drag and drop for dropping into editors as well, which resulted in some duplicated code between it and the tree view implementation

This PR tried to better align the two by:

- Use `extractEditorsDropData` to add the uriList
- In the tree view, use `toVSDataTransfer` to convert the event to a `VSDataTransfer`
- Remove `convertKnownMimes` as `extractEditorsDropData` handles this now

* Add uriList for drag

* Also handle 'DataTransfers.RESOURCES'

* Fix monaco
* Use variants of the foreground color as CC border

* use panel border color for CC border default
add `cross-origin-isolated` to web-worker ext host iframe, related microsoft/vscode#137884
Signed-off-by: Artem Zatsarynnyi <[email protected]>
@github-actions
Copy link

Pull Request images published ✨
image: quay.io/che-incubator-pull-requests/che-code:pr-56-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-56-dev-amd64

@azatsarynnyy
Copy link
Member Author

All build errors are fixed.
Investigating why Che-Code is not started
image

@azatsarynnyy
Copy link
Member Author

Can't reproduce the above issue anymore.

@azatsarynnyy azatsarynnyy marked this pull request as ready for review June 22, 2022 13:38
@azatsarynnyy azatsarynnyy enabled auto-merge (rebase) June 22, 2022 13:39
auto-merge was automatically disabled June 22, 2022 13:50

Rebase failed

Copy link
Contributor

@benoitf benoitf left a comment

Choose a reason for hiding this comment

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

image

Tested using the factory

@azatsarynnyy azatsarynnyy merged commit 9c2da4f into main Jun 22, 2022
@azatsarynnyy azatsarynnyy deleted the man-rebase branch June 22, 2022 14:14
@che-bot che-bot added this to the 7.50 milestone Jun 22, 2022
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.

Che-Code automatic rebase against upstream VS Code requires manual conflict resolution