From 98e0440d459b7a64b02d7976372aa2fca499f8bd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 5 Aug 2020 09:46:51 -0700
Subject: [PATCH] In 1-up source diffs, retain the "No newline at end of file"
 on "\" lines

Summary:
See PHI1839. Currently, the "No newline at end of file" text is dropped in the 1-up diff view for changes that affect a file with no trailing newline.

Track it through the construction of diff primitivies more carefully.

Test Plan: {F7695760}

Differential Revision: https://secure.phabricator.com/D21433
---
 .../render/DifferentialChangesetOneUpRenderer.php         | 8 ++++++--
 .../differential/render/DifferentialChangesetRenderer.php | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
index 186924e359..bcdbf4dd46 100644
--- a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
@@ -83,7 +83,9 @@ final class DifferentialChangesetOneUpRenderer
           $cells = array();
           if ($is_old) {
             if ($p['htype']) {
-              if (empty($p['oline'])) {
+              if ($p['htype'] === '\\') {
+                $class = 'comment';
+              } else if (empty($p['oline'])) {
                 $class = 'left old old-full';
               } else {
                 $class = 'left old';
@@ -129,7 +131,9 @@ final class DifferentialChangesetOneUpRenderer
             $cells[] = $no_coverage;
           } else {
             if ($p['htype']) {
-              if (empty($p['oline'])) {
+              if ($p['htype'] === '\\') {
+                $class = 'comment';
+              } else if (empty($p['oline'])) {
                 $class = 'right new new-full';
               } else {
                 $class = 'right new';
diff --git a/src/applications/differential/render/DifferentialChangesetRenderer.php b/src/applications/differential/render/DifferentialChangesetRenderer.php
index d493c0e886..dcae3b979b 100644
--- a/src/applications/differential/render/DifferentialChangesetRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetRenderer.php
@@ -505,6 +505,8 @@ abstract class DifferentialChangesetRenderer extends Phobject {
         $ospec['htype'] = $old[$ii]['type'];
         if (isset($old_render[$ii])) {
           $ospec['render'] = $old_render[$ii];
+        } else if ($ospec['htype'] === '\\') {
+          $ospec['render'] = $old[$ii]['text'];
         }
       }
 
@@ -514,6 +516,8 @@ abstract class DifferentialChangesetRenderer extends Phobject {
         $nspec['htype'] = $new[$ii]['type'];
         if (isset($new_render[$ii])) {
           $nspec['render'] = $new_render[$ii];
+        } else if ($nspec['htype'] === '\\') {
+          $nspec['render'] = $new[$ii]['text'];
         }
       }