-
-
Notifications
You must be signed in to change notification settings - Fork 371
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
Unified merge view - improve what text is in cm-deletedText #1376
Comments
Deleted text is highlighted. I'm not sure how that screenshot was made, it seems to use different styling than the default (compare). Maybe some mistake was made in the custom styles? |
Oh, right, unified view, I was looking at the split merge view. That indeed doesn't seem to render changed spans separately. |
One unrelated question: how can I expect |
|
I have the same issue. An example: I expect only the words @marijnh Would you say there's a good chance of this getting fixed in the near future? Obviously it's not something we can demand of you, it would just be helpful to know, to decide if we should consider Monaco instead, because I think this issue would be a blocker for our scenario unfortunately. |
This was supposed to already work, but the highlighting code was a bit confused. Attached patch should help. |
It does indeed, works in 6.6.4 🎉 - thank you! |
Describe the issue
Hello,
I'm really grateful that CM6 includes unifiedMergeView. When I started a project that needs it, I had no idea whether I'll have to spend several days implementing my own (inferior) solution, but fortunately I found
@codemirror/merge
.I have a suggestion: in the diff like this:
I'd like if
-next-line
part of the deleted line was insidecm-deletedText
so that it'd also be highlighted similarly toidentical.alwaysFalse, booleanAnd.alwaysFalse
part of the added line.This is currently how the DOM looks like:
I'd prefer if it looked something like this:
Thank you for considering this.
Browser and platform
No response
Reproduction link
No response
The text was updated successfully, but these errors were encountered: