Fix inline comment links for non-visible comments

Summary: Ref T2222. Restore this funky is-visible / inline-is-elsewhere logic.

Test Plan: Updated a revision, saw all the inlines render properly when looking at various diffs and versus-diffs. Clicked inline links.

Reviewers: btrahan

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T2222

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

src/applications/differential/controller/DifferentialRevisionViewController.php

@@ -260,6 +260,8 @@ final class DifferentialRevisionViewController extends DifferentialController {
 
     $comment_view = $this->buildTransactions(
       $revision,
+      $diff_vs ? $diffs[$diff_vs] : $target,
+      $target,
       $all_changesets);
 
     $wrap_id = celerity_generate_unique_node_id();
@@ -931,6 +933,8 @@ final class DifferentialRevisionViewController extends DifferentialController {
 
   private function buildTransactions(
     DifferentialRevision $revision,
+    DifferentialDiff $left_diff,
+    DifferentialDiff $right_diff,
     array $changesets) {
     $viewer = $this->getRequest()->getUser();
 
@@ -947,6 +951,9 @@ final class DifferentialRevisionViewController extends DifferentialController {
       ->setUser($viewer)
       ->setObjectPHID($revision->getPHID())
       ->setChangesets($changesets)
+      ->setRevision($revision)
+      ->setLeftDiff($left_diff)
+      ->setRightDiff($right_diff)
       ->setTransactions($xactions);
 
     // TODO: Make this work and restore edit links. We need to copy

src/applications/differential/editor/DifferentialRevisionEditor.php

@@ -701,10 +701,18 @@ final class DifferentialRevisionEditor extends PhabricatorEditor {
     $template = id(new DifferentialComment())
       ->setAuthorPHID($this->getActorPHID())
       ->setRevision($this->revision);
+
     if ($this->contentSource) {
-      $template->setContentSource($this->contentSource);
+      $content_source = $this->contentSource;
+    } else {
+      $content_source = PhabricatorContentSource::newForSource(
+        PhabricatorContentSource::SOURCE_LEGACY,
+        array());
     }
 
+    $template->setContentSource($content_source);
+
+
     // Write the "update active diff" transaction.
     id(clone $template)
       ->setAction(DifferentialAction::ACTION_UPDATE)

src/applications/differential/view/DifferentialTransactionView.php

@@ -4,6 +4,36 @@ final class DifferentialTransactionView
   extends PhabricatorApplicationTransactionView {
 
   private $changesets;
+  private $revision;
+  private $rightDiff;
+  private $leftDiff;
+
+  public function setLeftDiff(DifferentialDiff $left_diff) {
+    $this->leftDiff = $left_diff;
+    return $this;
+  }
+
+  public function getLeftDiff() {
+    return $this->leftDiff;
+  }
+
+  public function setRightDiff(DifferentialDiff $right_diff) {
+    $this->rightDiff = $right_diff;
+    return $this;
+  }
+
+  public function getRightDiff() {
+    return $this->rightDiff;
+  }
+
+  public function setRevision(DifferentialRevision $revision) {
+    $this->revision = $revision;
+    return $this;
+  }
+
+  public function getRevision() {
+    return $this->revision;
+  }
 
   public function setChangesets(array $changesets) {
     assert_instances_of($changesets, 'DifferentialChangeset');
@@ -100,8 +130,8 @@ final class DifferentialTransactionView
         $by_line = array();
         foreach ($group as $inline) {
           $by_line[] = array(
-            'line' => $inline->getComment()->getLineNumber().','.
+            'line' => ((int)$inline->getComment()->getLineNumber() << 16) +
-                      $inline->getComment()->getLineLength(),
+                      ((int)$inline->getComment()->getLineLength()),
             'inline' => $inline,
           );
         }
@@ -119,7 +149,31 @@ final class DifferentialTransactionView
             'content' => parent::renderTransactionContent($inline),
           );
 
-          // TODO: Fix the where/href stuff for nonlocal inlines.
+          $changeset_diff_id = $changeset->getDiffID();
+          if ($comment->getIsNewFile()) {
+            $visible_diff_id = $this->getRightDiff()->getID();
+          } else {
+            $visible_diff_id = $this->getLeftDiff()->getID();
+          }
+
+          // TODO: We still get one edge case wrong here, when we have a
+          // versus diff and the file didn't exist in the old version. The
+          // comment is visible because we show the left side of the target
+          // diff when there's no corresponding file in the versus diff, but
+          // we incorrectly link it off-page.
+
+          $is_visible = ($changeset_diff_id == $visible_diff_id);
+          if (!$is_visible) {
+            $item['where'] = pht('(On Diff #%d)', $changeset_diff_id);
+
+            $revision_id = $this->getRevision()->getID();
+            $comment_id = $comment->getID();
+
+            $item['href'] =
+              "/D".$revision_id.
+              "?id=".$changeset_diff_id.
+              "#inline-".$comment_id;
+          }
 
           $items[] = $item;
         }