Bug 477956 - Word wrap in compare editor
Summary: Word wrap in compare editor
Status: REOPENED
Alias: None
Product: Orion (Archived)
Classification: ECD
Component: Client (show other bugs)
Version: 10.0   Edit
Hardware: PC Mac OS X
: P3 normal with 3 votes (vote)
Target Milestone: ---   Edit
Assignee: libing wang CLA
QA Contact:
URL:
Whiteboard:
Keywords: triaged
: 489578 (view as bug list)
Depends on:
Blocks:
 
Reported: 2015-09-21 10:01 EDT by Mike Wilson CLA
Modified: 2023-05-31 09:34 EDT (History)
9 users (show)

See Also:


Attachments
work in progress (3.80 KB, patch)
2015-09-23 16:29 EDT, Silenio Quarti CLA
no flags Details | Diff
github-compare-with-word-wrap.png (188.12 KB, image/png)
2016-04-23 18:12 EDT, Carolyn MacLeod CLA
no flags Details
orion-compare-viewer.png (115.94 KB, image/png)
2016-04-23 18:16 EDT, Carolyn MacLeod CLA
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Mike Wilson CLA 2015-09-21 10:01:01 EDT
Using the compare editor is difficult when you are comparing content that has long lines of text. Because the normal Orion text editor supports word-wrap, it is easy to build lines like this (e.g. MD files where you use "one line per paragraph"). 

It would be useful to have this feature on the compare editor too, so that, for example, you could more easily check what has been changed before committing changes to the repo.
Comment 1 Silenio Quarti CLA 2015-09-23 16:29:56 EDT
Created attachment 256803 [details]
work in progress
Comment 2 Carolyn MacLeod CLA 2016-04-23 18:12:42 EDT
Created attachment 261195 [details]
github-compare-with-word-wrap.png

The github compare viewer always uses word wrap.

I am reviewing and making changes to the ARIA 1.1 spec, which is mostly HTML, and there are many long lines. I cannot reasonably use the Orion compare viewer to see my changes because not only do I need to scroll... but I need to scroll both sides of the compare viewer to the exact horizontal position in a very long line of text, and then I need to do that for every change, because each change is at a different horizontal scroll point than the change before it. The "unified diff" compare viewer does not help much - it does cut the amount of scrolling down, but it still takes too long to find the exact horizontal position.

I end up dropping down into github every time I need to do a compare.
I have attached a screen snap of the github changes viewer. It is quite nice.
Comment 3 Carolyn MacLeod CLA 2016-04-23 18:16:05 EDT
Created attachment 261196 [details]
orion-compare-viewer.png

For comparison, here is a screen snap of the Orion compare viewer on the same change(s). You can't see the actual change because it is scrolled horizontally to the right.
(The collapsed lines feature is also really nice, because note that you can see multiple changes at once in the github compare viewer, and you can only see the first part of the first changed line in the Orion compare viewer).
Comment 4 Carolyn MacLeod CLA 2016-04-23 18:18:44 EDT
Changing from "enhancement" to "normal" (i.e. "bug") because when comparing javascript or css files, word wrap is an enhancement... but for comparing html files it's an absolute necessity.
Comment 5 Carolyn MacLeod CLA 2016-04-23 18:24:04 EDT
*** Bug 489578 has been marked as a duplicate of this bug. ***
Comment 6 Michael Rennie CLA 2017-01-10 15:41:03 EST
Closing as part of a mass clean up of inactive bugs. Please reopen if this problem still occurs or is relevant to you. For more details see:

https://dev.eclipse.org/mhonarc/lists/orion-dev/msg04002.html
Comment 7 Carolyn MacLeod CLA 2017-08-22 11:13:52 EDT
Reopening, as I am currently comparing changes in a bunch of html files, and it is quite annoying and painful to have to scroll both files to see the changes that are cut off on the right hand side of both the new and old file.
Comment 8 Michael Rennie CLA 2018-04-09 09:38:02 EDT
Closing as part of a mass clean up of inactive bugs. Please reopen if this problem still occurs or is relevant to you. 

For more details see: https://dev.eclipse.org/mhonarc/lists/orion-dev/msg04114.html
Comment 9 Dmitry Katsubo CLA 2018-04-09 16:11:54 EDT
Would be nice to have this feature on board.
Comment 10 Carolyn MacLeod CLA 2018-04-09 18:02:16 EDT
Reopening: triaged.
Comment 11 Matthias Basler CLA 2020-01-09 04:01:25 EST
It is not only the "compare" process which is obstructed by the lack of automatic line wrapping, but also the conflict merging that is hampered.

Just today a coworker of mine asked me to insert manual line breaks in our Asciidoc documentation as a workaround in order to be able to reasonably resolve merge conflicts in Eclipse without resorting to fully manual merging.
This clearly is a waste of time as a result of this editor's limitation.

See Notepad++ compare plugin in contrast, were line wrapping can be enabled.