From 392d12f1fcf995d649b1a97ad7707a22f543a490 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Mar 2012 18:20:51 -0700
Subject: [PATCH] When marking a line changed because of internal whitespace in
 "Ignore Most", intraline diff it

Summary:
Currently, we mark some lines that otherwise count as "unchanged" to be "changed" when they have internal whitespace changes.

However, we've already excluded them from the intra-line diff algorithm. Unset the flag so they can get intra-line diffed.

Test Plan: Viewed a change with internal whitespace changes, internal whitespace changes were intraline diffed.

Reviewers: btrahan

Reviewed By: btrahan

CC: aran, epriestley

Maniphest Tasks: T970

Differential Revision: https://secure.phabricator.com/D1871
---
 .../parser/changeset/DifferentialChangesetParser.php           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/applications/differential/parser/changeset/DifferentialChangesetParser.php b/src/applications/differential/parser/changeset/DifferentialChangesetParser.php
index e16a0cf478..8ce058604d 100644
--- a/src/applications/differential/parser/changeset/DifferentialChangesetParser.php
+++ b/src/applications/differential/parser/changeset/DifferentialChangesetParser.php
@@ -422,6 +422,9 @@ class DifferentialChangesetParser {
             // whitespace changes. Mark this line changed.
             $old[$k]['type'] = '-';
             $new[$k]['type'] = '+';
+
+            // Re-mark this line for intraline diffing.
+            unset($skip_intra[$k]);
           }
         }
       }