Differential D21267

Fix an unusual issue with intradiff highlighting of files with uncommon end-of-file modifications
ClosedPublic
Actions

Authored by epriestley on May 19 2020, 4:04 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Sun, Feb 9, 9:20 AM

	Unknown Object (File)
	Sun, Feb 9, 9:20 AM

	Unknown Object (File)
	Sun, Feb 9, 9:20 AM

	Unknown Object (File)
	Sun, Feb 9, 9:20 AM

	Unknown Object (File)
	Fri, Jan 31, 11:10 PM

	Unknown Object (File)
	Mon, Jan 27, 6:13 PM

	Unknown Object (File)
	Sat, Jan 25, 11:06 AM

	Unknown Object (File)
	Sat, Jan 25, 7:46 AM

Subscribers

None

Details

Reviewers: None
Maniphest Tasks: T13539: Obscure end-of-file changes may choke the changeset highlighter
Commits: rP1157f2782277: (stable) Fix an unusual issue with intradiff highlighting of files with…
rP6cf017d68003: Fix an unusual issue with intradiff highlighting of files with uncommon end-of…

Summary

Fixes T13539. See that task for discussion and a reproduction case.

This algorithm currently counts "\ No newline at end of file" lines as though they were normal source lines. This can cause offset issues in the rare case that a diff contains two of these lines (for each side of the file) and has changes between them (because the last line of the file was modified between the diffs).

Instead, don't count "\" as a display line.

Test Plan

See T13539 and PHI1740.
Before: got fatals on the "wild" diff and the synthetic simplified version.
After: clean intradiff rendering in both cases.

Diff Detail

Repository

Branch

idiff1

Lint

Lint Passed

Unit

Tests Passed

Build Status

Buildable 24460
Build 33705: Run Core Tests
Build 33704: arc lint + arc unit

Event Timeline

epriestley created this revision.May 19 2020, 4:04 PM

Harbormaster completed remote builds in B24460: Diff 50641.May 19 2020, 4:05 PM

This revision was not accepted when it landed; it landed in state Needs Review.May 19 2020, 4:05 PM

epriestley requested review of this revision.

Closed by commit rP6cf017d68003: Fix an unusual issue with intradiff highlighting of files with uncommon end-of… (authored by epriestley). · Explain Why

This revision was automatically updated to reflect the committed changes.

epriestley added a commit: rP6cf017d68003: Fix an unusual issue with intradiff highlighting of files with uncommon end-of….

epriestley added a commit: rP1157f2782277: (stable) Fix an unusual issue with intradiff highlighting of files with….

Revision Contents
Changeset List

Path

Size

src/

applications/

differential/

parser/

DifferentialHunkParser.php

38 lines

__tests__/

DifferentialChangesetParserTestCase.php

14 lines

Diff 50641

src/applications/differential/parser/DifferentialHunkParser.php

Loading...

src/applications/differential/parser/tests/DifferentialChangesetParserTestCase.php

Loading...