-
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
Rebase against upstream VS Code to fix the auto-rebase job #56
Merged
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
Part of #150858
* 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
Fixes #151739
vscode-upstream-sha1: a10626e
Signed-off-by: Artem Zatsarynnyi <[email protected]>
Pull Request images published ✨ |
Can't reproduce the above issue anymore. |
azatsarynnyy
requested review from
RomanNikitenko,
vzhukovs and
benoitf
as code owners
June 22, 2022 13:38
RomanNikitenko
approved these changes
Jun 22, 2022
auto-merge was automatically disabled
June 22, 2022 13:50
Rebase failed
benoitf
approved these changes
Jun 22, 2022
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.
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.
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