feat(sample-web-ui): add link to related node definitions (#3227)

kythe · Nov 6, 2018 · 854ab48 · 854ab48
1 parent c4cb60f
commit 854ab48
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/kythe/web/ui/src-cljs/ui/service.cljs b/kythe/web/ui/src-cljs/ui/service.cljs
@@ -60,13 +60,15 @@
   {:facts (into {}
                 (map (juxt first
                            (comp util/fix-encoding b64/decodeString second))
-                     (:facts node)))})
+                     (:facts node)))
+   :definition (:definition node)})
 
 (defn- unwrap-xrefs-response [resp]
   {:cross-references (if (= 1 (count (:cross_references resp)))
                        (second (first (:cross_references resp)))
                        (:cross_references resp))
    :nodes (into {} (map (juxt first (comp unwrap-node second)) (:nodes resp)))
+   :definition_locations (:definition_locations resp)
    :next (:next_page_token resp)})
 
 (defn get-xrefs
@@ -80,6 +82,7 @@
                       :reference_kind     "NON_CALL_REFERENCES"
                       :caller_kind        "OVERRIDE_CALLERS"
                       :snippets           "DEFAULT"
+                      :node_definitions true
                       :filter [schema/node-kind-fact]
                       :anchor_text true
                       :page_size 20}

diff --git a/kythe/web/ui/src-cljs/ui/xrefs.cljs b/kythe/web/ui/src-cljs/ui/xrefs.cljs
@@ -138,7 +138,7 @@
                             (dom/strong nil relation) " "
                             (apply dom/ul nil
                               (map (fn [{:keys [ticket]}]
-                                     (dom/li nil
+                                     (apply dom/li nil
                                        (str
                                          (or
                                            (get-in (:nodes @state) [(keyword ticket)
@@ -150,7 +150,18 @@
                                                    :onClick (fn [e]
                                                               (.preventDefault e)
                                                               (put! xrefs-to-view ticket))}
-                                         ticket)))
+                                         ticket)
+                                       (when-let [defTicket (get-in (:nodes @state) [(keyword ticket) :definition])]
+                                         (when-let [def (get-in (:definition_locations @state) [(keyword defTicket)])]
+                                           [" "
+                                            (dom/a #js {:href "#"
+                                                        :onClick (fn [e]
+                                                                   (.preventDefault e)
+                                                                   (put! file-to-view
+                                                                         {:ticket (:parent def)
+                                                                          :anchor defTicket
+                                                                          :line (get-in def [:span :start :line_number])}))}
+                                                   "[def]")]))))
                                 nodes))))
                      (group-by :relation_kind (:related_node (:cross-references state))))))))
            (page-navigation xrefs-to-view (cons "" (:pages state)) (or (:current-page-token state) "") (:ticket (:cross-references state)))])))))