From 2a7cdcf740ac4948b25a88fda3db9fb9d3f7337e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 31 Oct 2017 13:52:23 -0700
Subject: [PATCH] Fix an issue where the repository symbol index would
 incorrectly activate inside inline comments

Summary:
See PHI185. When looking at a revision, you can Command-Click (Mac) symbols to jump to their definitions (provided the symbol index has been built).

Currently, the code works on any node inside the changeset list, so it activates when clicking links inside inline comments and opening them in a new window.

To avoid this, don't activate if we're inside an inline comment. This technically prevents you from doing a symbol lookup on a symbol inside a codeblock inside an inline, but that seems fine/reasonable.

Test Plan: Wrote `Dxxx` in an inline, command-clicked it. Before: got a symbol lookup. After: just a new tab with the revision.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18753
---
 resources/celerity/map.php                     | 18 +++++++++---------
 .../repository/repository-crossreference.js    | 15 +++++++++++++--
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index c9e1a5b351..30c04ffc92 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@ return array(
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
-    'differential.pkg.js' => 'b71b8c5d',
+    'differential.pkg.js' => 'ae6460e0',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'favicon.ico' => '30672e08',
@@ -444,7 +444,7 @@ return array(
     'rsrc/js/application/releeph/releeph-preview-branch.js' => 'b2b4fbaf',
     'rsrc/js/application/releeph/releeph-request-state-change.js' => 'a0b57eb8',
     'rsrc/js/application/releeph/releeph-request-typeahead.js' => 'de2e896f',
-    'rsrc/js/application/repository/repository-crossreference.js' => 'e5339c43',
+    'rsrc/js/application/repository/repository-crossreference.js' => '7fe9bc12',
     'rsrc/js/application/search/behavior-reorder-profile-menu-items.js' => 'e2e0a072',
     'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
     'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f',
@@ -690,7 +690,7 @@ return array(
     'javelin-behavior-reorder-applications' => '76b9fc3e',
     'javelin-behavior-reorder-columns' => 'e1d25dfb',
     'javelin-behavior-reorder-profile-menu-items' => 'e2e0a072',
-    'javelin-behavior-repository-crossreference' => 'e5339c43',
+    'javelin-behavior-repository-crossreference' => '7fe9bc12',
     'javelin-behavior-scrollbar' => '834a1173',
     'javelin-behavior-search-reorder-queries' => 'e9581f08',
     'javelin-behavior-select-content' => 'bf5374ef',
@@ -1546,6 +1546,12 @@ return array(
     '7f243deb' => array(
       'javelin-install',
     ),
+    '7fe9bc12' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-uri',
+    ),
     '834a1173' => array(
       'javelin-behavior',
       'javelin-scrollbar',
@@ -2073,12 +2079,6 @@ return array(
       'javelin-behavior',
       'javelin-dom',
     ),
-    'e5339c43' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-uri',
-    ),
     'e5822781' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/webroot/rsrc/js/application/repository/repository-crossreference.js b/webroot/rsrc/js/application/repository/repository-crossreference.js
index bfb849c759..138ce4bf3e 100644
--- a/webroot/rsrc/js/application/repository/repository-crossreference.js
+++ b/webroot/rsrc/js/application/repository/repository-crossreference.js
@@ -46,8 +46,19 @@ JX.behavior('repository-crossreference', function(config, statics) {
         if (!isSignalkey(e)) {
           return;
         }
+
+        var target = e.getTarget();
+
+        try {
+          // If we're in an inline comment, don't link symbols.
+          if (JX.DOM.findAbove(target, 'div', 'differential-inline-comment')) {
+            return;
+          }
+        } catch (ex) {
+          // Continue if we're not inside an inline comment.
+        }
+
         if (e.getType() === 'mouseover') {
-          var target = e.getTarget();
           while (target !== document.body) {
             if (JX.DOM.isNode(target, 'span') &&
                (target.className in class_map)) {
@@ -58,7 +69,7 @@ JX.behavior('repository-crossreference', function(config, statics) {
             target = target.parentNode;
           }
         } else if (e.getType() === 'click') {
-          openSearch(e.getTarget(), lang);
+          openSearch(target, lang);
         }
       });
   }