mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-26 00:32:41 +01:00
Patch rendering fixes
Summary: Not too familiar with the patch rendering code, but diff should fix a few issues: 1) The current didn't seem to handle the case of an insertion only diff (where the original text is empty). Specifically, it would still print a replacement line and would merge the line immediately after the patch location into the patch application. 2) Patches with trailing newlines were rendered with an additional newline. This appears to be due to using ##explode## to break the patch into lines. Test Plan: 1) Verified that this fixed apache license linting for files that had no license. 2) Checked that this didn't affect trailing-whitespace patch application. Reviewers: epriestley, aran Reviewed By: epriestley CC: aran, epriestley Differential Revision: https://secure.phabricator.com/D1715
This commit is contained in:
parent
ee8c8cf4e7
commit
bd3ce3631a
1 changed files with 32 additions and 21 deletions
|
@ -134,28 +134,35 @@ final class ArcanistLintRenderer {
|
|||
$text_lines = explode("\n", $text);
|
||||
$text_length = count($text_lines);
|
||||
|
||||
for (; $cursor < $line_num + $text_length; $cursor++) {
|
||||
$chevron = ($cursor == $line_num);
|
||||
// We may not have any data if, e.g., the old file does not exist.
|
||||
$data = idx($line_data, $cursor, null);
|
||||
if ($text) {
|
||||
for (; $cursor < $line_num + $text_length; $cursor++) {
|
||||
$chevron = ($cursor == $line_num);
|
||||
// We may not have any data if, e.g., the old file does not exist.
|
||||
$data = idx($line_data, $cursor, null);
|
||||
|
||||
// Highlight the problem substring.
|
||||
$text_line = $text_lines[$cursor - $line_num];
|
||||
if (strlen($text_line)) {
|
||||
$data = substr_replace(
|
||||
$data,
|
||||
phutil_console_format('##%s##', $text_line),
|
||||
($cursor == $line_num)
|
||||
? $message->getChar() - 1
|
||||
: 0,
|
||||
strlen($text_line));
|
||||
// Highlight the problem substring.
|
||||
$text_line = $text_lines[$cursor - $line_num];
|
||||
if (strlen($text_line)) {
|
||||
$data = substr_replace(
|
||||
$data,
|
||||
phutil_console_format('##%s##', $text_line),
|
||||
($cursor == $line_num)
|
||||
? $message->getChar() - 1
|
||||
: 0,
|
||||
strlen($text_line));
|
||||
}
|
||||
|
||||
$out[] = $this->renderLine($cursor, $data, $chevron, $diff);
|
||||
}
|
||||
|
||||
$out[] = $this->renderLine($cursor, $data, $chevron, $diff);
|
||||
}
|
||||
|
||||
// Print out replacement text.
|
||||
if ($message->isPatchable()) {
|
||||
// Strip trailing newlines, since "explode" will create an extra patch
|
||||
// line for these.
|
||||
if (idx($patch, strlen($patch) - 1, null) === "\n") {
|
||||
$patch = substr($patch, 0, -1);
|
||||
}
|
||||
$patch_lines = explode("\n", $patch);
|
||||
$patch_length = count($patch_lines);
|
||||
|
||||
|
@ -163,11 +170,15 @@ final class ArcanistLintRenderer {
|
|||
|
||||
$len = isset($text_lines[0]) ? strlen($text_lines[0]) : 0;
|
||||
|
||||
$patched = substr_replace(
|
||||
$line_data[$line_num],
|
||||
phutil_console_format('##%s##', $patch_line),
|
||||
$start,
|
||||
$len);
|
||||
$patched = phutil_console_format('##%s##', $patch_line);
|
||||
|
||||
if ($text) {
|
||||
$patched = substr_replace(
|
||||
$line_data[$line_num],
|
||||
$patched,
|
||||
$start,
|
||||
$len);
|
||||
}
|
||||
|
||||
$out[] = $this->renderLine(null, $patched, false, '+');
|
||||
|
||||
|
|
Loading…
Reference in a new issue