recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Correct an apparent off-by-one error when adjusting inlines across revision changes

Summary:
See PHI1834. It's not obvious why this "+1" is present in the code, but it causes inlines to be adjusted incorrectly when a file is not modified across changes. See D21435.

Remove it, which appears to produce accurate adjustment behavior.

Test Plan:
- See D21435 for instructions to build a change, where a file with lines "A-Z" is unmodified across Diff 1 and Diff 2.
- Left inlines on lines 14, 17-19, and 16-26 (end of the file) on Diff 1.
- Before: saw inlines incorrectly adjusted to lines 15, 18, and 17 on Diff 2. Before D21435, the last inline was culled by the rendering engine.
- After: saw inlines correctly adjusted to lines 14, 17, and 16 (the same lines as the original), render properly, and highlight the correct lines when hovered.

Differential Revision: https://secure.phabricator.com/D21436

epriestley ce0dc9a2 dbdfac1e

+1 -1
+1 -1
src/infrastructure/diff/engine/PhabricatorInlineCommentAdjustmentEngine.php
··· 358 358 list($tail_deleted, $tail_offset, $tail_line) = $tail_info; 359 359 360 360 if ($head_offset !== false) { 361 - $inline->setLineNumber($head_line + 1 + $head_offset); 361 + $inline->setLineNumber($head_line + $head_offset); 362 362 } else { 363 363 $inline->setLineNumber($head_line); 364 364 $inline->setLineLength($tail_line - $head_line);