revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-19 05:12:41 +01:00
Code Issues Releases Wiki Activity

Fix two parsing issues for diffs with damaged whitespace

Browse source 
Summary:
Fixes T4941. If a diff has had trailing whitespace stripped, we will fail to handle empty lines correctly (previously, these lines had a leading space when the original tool emitted them).

(This probably stopped working around the time we began retaining newlines.)

Test Plan: The diff in T4941 now parses and renders correctly.

Reviewers: asherkin, btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T4941

Differential Revision: https://secure.phabricator.com/D8968
This commit is contained in:
epriestley 2014-05-04 10:48:49 -07:00
parent 58fbb0ae53
commit a272ddcc78
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/applications/differential/parser/DifferentialHunkParser.php
View file

@ -423,16 +423,41 @@ final class DifferentialHunkParser {
$lines = phutil_split_lines($lines); $lines = phutil_split_lines($lines);
$line_type_map = array(); $line_type_map = array();
$line_text = array();
foreach ($lines as $line_index => $line) { foreach ($lines as $line_index => $line) {
if (isset($line[0])) { if (isset($line[0])) {
$char = $line[0]; $char = $line[0];
if ($char == ' ') { switch ($char) {
case " ":
$line_type_map[$line_index] = null; $line_type_map[$line_index] = null;
} else { $line_text[$line_index] = substr($line, 1);
break;
case "\r":
case "\n":
// NOTE: Normally, the first character is a space, plus, minus or
// backslash, but it may be a newline if it used to be a space and
// trailing whitespace has been stripped via email transmission or
// some similar mechanism. In these cases, we essentially pretend
// the missing space is still there.
$line_type_map[$line_index] = null;
$line_text[$line_index] = $line;
break;
case "+":
case "-":
case "\\":
$line_type_map[$line_index] = $char; $line_type_map[$line_index] = $char;
$line_text[$line_index] = substr($line, 1);
break;
default:
throw new Exception(
pht(
'Unexpected leading character "%s" at line index %s!',
$char,
$line_index));
} }
} else { } else {
$line_type_map[$line_index] = null; $line_type_map[$line_index] = null;
$line_text[$line_index] = '';
} }
} }
@ -444,7 +469,7 @@ final class DifferentialHunkParser {
$type = $line_type_map[$cursor]; $type = $line_type_map[$cursor];
$data = array( $data = array(
'type' => $type, 'type' => $type,
'text' => (string)substr($lines[$cursor], 1), 'text' => $line_text[$cursor],
'line' => $new_line, 'line' => $new_line,
); );
if ($type == '\\') { if ($type == '\\') {