Description

What is the problem?

In the inline diff view, inserts/deletes appear on separate lines (if they are more than a single word?).

This leads to output that can look different to the original article and might lead users to think extra newlines have been added.

Original article	Inline diff	Two column diff

In the above example, https://en.wikipedia.org/w/index.php?title=Calais_Conference_%28December_1915%29&diff=prev&oldid=1118137858&diffmode=source&diff-type=inline shows Kitchener on a separate line in the inline diff. This is not the case in the article.

I note that if I remove display: inline-block; from the css it at least partially solves this issue (see below screenshot). It also partially solves the bug in T327642. I am not sure if this is a good solution, though.

css_change_line_breaks.png (140×1 px, 57 KB)

Steps to reproduce problem

Above examples come from https://en.wikipedia.org/w/index.php?title=Calais_Conference_%28December_1915%29&diff=prev&oldid=1118137858&diffmode=source&diff-type=inline.

Many inline diffs show a similar problem.

Environment

Browser: Firefox 91.
Wiki(s): https://en.wikipedia.org MediaWiki 1.40.0-wmf.19 (3ee932e) 02:18, 17 January 2023. (I don't know which version of wikidiff2 is being used.)

Details

	Subject	Repo	Branch	Lines +/-
	diff: add padding to ins and del to avoid whitespace between lines	mediawiki/core	master	+1 -0
	diff: make ins and del elements inline instead of inline-block	mediawiki/core	master	+0 -1

Customize query in gerrit

Related Objects

Mentioned In: T342160: Mobile diff: inline format new line and deleted line markers
T330247: Inline diff: one or more lines added or deleted
Mentioned Here: rMW6853d8b390c3: Merge "tests: Migrate Database::select usages to SelectQueryBuilder"
T327642: Inline diff sometimes ignores inserted/deleted spaces
rMW3ee932ef5f93: Merge "Linker: Add a class for temporary account user name links"

Event Timeline

dom_walden created this task.Jan 23 2023, 11:01 AM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptJan 23 2023, 11:01 AM

HMonroy renamed this task from Insert/delete introduce line breaks in inline diff to Inline Diff: Insert/delete introduce line breaks.Feb 15 2023, 7:08 PM

HMonroy mentioned this in T330247: Inline diff: one or more lines added or deleted.Feb 22 2023, 12:36 AM

MusikAnimal moved this task from New & TBD Tickets to Needs Discussion on the Community-Tech board.Jun 14 2023, 2:08 PM

KSiebert moved this task from Needs Discussion to CommTech-Kanban on the Community-Tech board.Jun 14 2023, 3:16 PM

KSiebert edited projects, added Community-Tech (CommTech-Kanban); removed Community-Tech.

dmaza set the point value for this task to 3.Jun 15 2023, 5:46 PM

HMonroy moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Kanban) board.Jun 28 2023, 5:54 PM

HMonroy moved this task from In Development 💻 to Ready 🎬 on the Community-Tech (CommTech-Kanban) board.

Change 937990 had a related patch set uploaded (by MusikAnimal; author: MusikAnimal):

[mediawiki/core@master] diff: make ins and del elements inline instead of inline-block

https://gerrit.wikimedia.org/r/937990

gerritbot added a project: Patch-For-Review.Jul 13 2023, 4:55 PM

note that if I remove display: inline-block; from the css it at least partially solves this issue

Seems like a fine solution. I'm not sure why this was ever made to be inline-block. After removing that and adding white-space: break-spaces (for T327642), things look good to me.

Change 937990 merged by jenkins-bot:

[mediawiki/core@master] diff: make ins and del elements inline instead of inline-block

https://gerrit.wikimedia.org/r/937990

Maintenance_bot removed a project: Patch-For-Review.Jul 14 2023, 10:10 AM

ReleaseTaggerBot added a project: MW-1.41-notes (1.41.0-wmf.18; 2023-07-18).Jul 14 2023, 11:00 AM

HMonroy moved this task from Review/Feedback 💬 to QA 🐛 on the Community-Tech (CommTech-Kanban) board.Jul 14 2023, 7:16 PM

@MusikAnimal In the inline diff view, inserts/deletes now do not appear on a separate line as seen in the screenshot. The ticket will be moved to Done, thanks for your work!

Skins: Vector, 2022, 2010, Minerva, Monobook, Timeless
Local: http://localhost:8080/w/index.php?title=Calais_Conference_%28December_1915%29&diff=588&oldid=587&diffmode=source&diff-type=inline
MediaWiki- 1.41.0-alpha (6853d8b) 14:45, 17 July 2023
wikidiff2- 1.14.1

Inline

2 Column Diff

T327645_BetterDiffs_InlineInsert_LineBreaksDiff.png (1×3 px, 583 KB)

GMikesell-WMF moved this task from QA 🐛 to Done 🏁 on the Community-Tech (CommTech-Kanban) board.Jul 17 2023, 10:42 PM

MusikAnimal closed this task as Resolved.Jul 18 2023, 3:23 PM

HMonroy mentioned this in T342160: Mobile diff: inline format new line and deleted line markers.Jul 24 2023, 7:44 PM

Change 940995 had a related patch set uploaded (by MusikAnimal; author: MusikAnimal):

[mediawiki/core@master] diff: add padding to ins and del to avoid whitespace between lines

https://gerrit.wikimedia.org/r/940995

gerritbot added a project: Patch-For-Review.Jul 24 2023, 7:51 PM

Change 940995 merged by jenkins-bot:

[mediawiki/core@master] diff: add padding to ins and del to avoid whitespace between lines

https://gerrit.wikimedia.org/r/940995

ReleaseTaggerBot edited projects, added MW-1.41-notes (1.41.0-wmf.19; 2023-07-25); removed MW-1.41-notes (1.41.0-wmf.18; 2023-07-18).Jul 24 2023, 10:00 PM

Maintenance_bot removed a project: Patch-For-Review.Jul 24 2023, 10:10 PM

Some screenshots for reference:

(this problem was discussed at https://en.wikipedia.org/w/index.php?title=Wikipedia:Village_pump_(technical)&oldid=1166964553#Not_digging_the_new_mobile_diffs)

	Before https://gerrit.wikimedia.org/r/937990	Before https://gerrit.wikimedia.org/r/940995	After both patches
https://en.m.wikipedia.org/wiki/Special:MobileDiff/1166429149
https://en.m.wikipedia.org/wiki/Special:MobileDiff/1166429509

HMonroy reopened this task as Open.Jul 25 2023, 5:08 PM

HMonroy moved this task from Done 🏁 to QA 🐛 on the Community-Tech (CommTech-Kanban) board.

@HMonroy No issues with the padding and whitespace between lines after the latest patch. The ticket will be moved back to Done again, thanks for your work!

OS: macOS 13.4, Windows 11
Browsers: Safari 16.4, Chrome 115, Firefox 115, Edge 114
Skins: Vector, 2022, 2010, Minerva, Monobook, Timeless

Test Links:
2 Column Diff: https://en.wikipedia.beta.wmflabs.org/w/index.php?title=Calais_Conference_%28December_1915%29&diff=595738&oldid=595737
Desktop: https://en.wikipedia.beta.wmflabs.org/w/index.php?title=Calais_Conference_%28December_1915%29&diff=595738&oldid=595737&diffmode=source&diff-type=inline
Mobile: https://en.m.wikipedia.beta.wmflabs.org/w/index.php?title=Special:MobileDiff/595738&diff-type=inline&diffmode=source

2 Column Diff	Desktop: Inline	Mobile: Inline

GMikesell-WMF moved this task from QA 🐛 to Done 🏁 on the Community-Tech (CommTech-Kanban) board.Jul 31 2023, 9:49 PM

MusikAnimal closed this task as Resolved.Aug 2 2023, 6:17 PM

	F37157566: T327645_BetterDiffs_Inline_Mobile.png
	Jul 31 2023, 9:49 PM

	F37157563: T327645_BetterDiffs_Inline_Desktop.png
	Jul 31 2023, 9:49 PM

	F37157561: T327645_BetterDiffs_Inline_2Column.png
	Jul 31 2023, 9:49 PM

	F37148777: Screen Shot 2023-07-25 at 00.30.11.png
	Jul 24 2023, 10:33 PM

	F37148775: Screen Shot 2023-07-25 at 00.29.56.png
	Jul 24 2023, 10:33 PM

	F37148774: Screen Shot 2023-07-25 at 00.30.03.png
	Jul 24 2023, 10:33 PM

	F37148772: Screen Shot 2023-07-25 at 00.29.50.png
	Jul 24 2023, 10:33 PM

	F37148773: Screen Shot 2023-07-25 at 00.29.32.png
	Jul 24 2023, 10:33 PM

Inline Diff: Insert/delete introduce line breaksClosed, ResolvedPublic3 Estimated Story PointsBUG REPORTActions