Render conflicts in the VSCode plugin - Githubissues

inkandswitch / vscode-hypermerge

A VSCode plugin to edit Hypermerge documents

28 stars 3 forks source link

Render conflicts in the VSCode plugin #18

Open pvh opened 5 years ago

pvh commented 5 years ago

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.