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

fix(types-impl): add toJSON function to Range and Position. fix #9573 #9652

Merged

Conversation

zWingz
Copy link
Contributor

@zWingz zWingz commented Jun 28, 2021

What it does

add toJSON function to Range and Position, fix #9573

How to test

  • start the theia
  • create a merge conflict in workspace
    image
  • click Compare Changes
    image

Review checklist

Reminder for reviewers

@zWingz zWingz force-pushed the bugfix/range-and-position-toJSON branch 3 times, most recently from e92458c to 28be996 Compare June 28, 2021 07:21
Signed-off-by: zwing <zhengzwing@gmail.com>
@zWingz zWingz force-pushed the bugfix/range-and-position-toJSON branch from 28be996 to 9072241 Compare June 28, 2021 11:20
@vince-fugnitto vince-fugnitto added the vscode issues related to VSCode compatibility label Jun 28, 2021
Copy link
Member

@vince-fugnitto vince-fugnitto left a comment

Choose a reason for hiding this comment

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

@zWingz thank you for your first contribution, from investigating to resolving the issue 👍

I confirmed that the changes work, and that merge-conflict diffs are now displayed:

image

The code is also consistent with vscode:

Copy link
Member

@msujew msujew left a comment

Choose a reason for hiding this comment

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

LGTM as well.

@vince-fugnitto vince-fugnitto merged commit 210fa4a into eclipse-theia:master Jun 28, 2021
@vince-fugnitto vince-fugnitto added this to the 1.15.0 milestone Jun 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
vscode issues related to VSCode compatibility
Projects
None yet
Development

Successfully merging this pull request may close these issues.

merge-conflict extension throw error 'Unable to show comparison'
3 participants