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.

Sign up for GitHub

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

Jump to bottom

Render conflicts in the VSCode plugin #18

Open

pvh opened this issue Nov 30, 2018 · 1 comment

Contributor

pvh commented Nov 30, 2018

No description provided.

Contributor Author

pvh commented Dec 8, 2018

So this should actually be reasonably straight-forward. The steps look like this:

get the list of conflicts
translate that to locations in the JSON representation of the document
translate that into locations in the text buffer
create a "Diagnostic" entry (squigglies) that targets the relevant span
add a "code action" to resolve the conflict one way or another.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment