Make queries/find-first private

cinguilherme · Jun 13, 2022 · 495eed9 · 495eed9
1 parent e2758dd
commit 495eed9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/lib/src/clojure_lsp/feature/completion.clj b/lib/src/clojure_lsp/feature/completion.clj
@@ -492,23 +492,18 @@
                                           :name (symbol name)
                                           :to (symbol ns)
                                           :bucket :var-usages})]
-    (if definition
-      (-> item
-          (assoc :documentation (f.hover/hover-documentation definition db*)))
-      item)))
+    (cond-> item
+      definition (assoc :documentation (f.hover/hover-documentation definition db*)))))
 
 (defn ^:private resolve-item-by-definition
   [{{:keys [name filename name-row name-col]} :data :as item} db*]
   (let [db @db*
-        local-analysis (get-in db [:analysis filename])
-        definition (q/find-first #(and (identical? :var-definitions (:bucket %))
-                                       (= name (str (:name %)))
-                                       (= name-row (:name-row %))
-                                       (= name-col (:name-col %))) local-analysis)]
-    (if definition
-      (-> item
-          (assoc :documentation (f.hover/hover-documentation definition db*)))
-      item)))
+        element (q/find-element-under-cursor db filename name-row name-col)
+        definition (when (and (identical? :var-definitions (:bucket element))
+                              (= name (str (:name element))))
+                     element)]
+    (cond-> item
+      definition (assoc :documentation (f.hover/hover-documentation definition db*)))))
 
 (defn resolve-item [{{:keys [ns]} :data :as item} db*]
   (let [item (shared/assoc-some item

diff --git a/lib/src/clojure_lsp/handlers.clj b/lib/src/clojure_lsp/handlers.clj
@@ -228,9 +228,7 @@
     :document-symbol
     (let [db @db/db*
           filename (shared/uri->filename textDocument)
-          analysis (:analysis db)
-          namespace-definition (->> (get analysis filename)
-                                    (q/find-first (comp #{:namespace-definitions} :bucket)))]
+          namespace-definition (q/find-namespace-definition-by-filename db filename)]
       [{:name (or (some-> namespace-definition :name name)
                   filename)
         :kind (f.document-symbol/element->symbol-kind namespace-definition)

diff --git a/lib/src/clojure_lsp/queries.clj b/lib/src/clojure_lsp/queries.clj
@@ -15,7 +15,7 @@
     (.equals ^clojure.lang.Symbol a b)
     (.equals ^String a b)))
 
-(defn find-first [pred coll]
+(defn ^:private find-first [pred coll]
   (reduce
     (fn [_ i]
       (when (pred i)
@@ -612,7 +612,7 @@
     (:analysis db)))
 
 (defn find-namespace-definition-by-filename [db filename]
-  (peek (find-namespace-definitions db filename)))
+  (first (find-namespace-definitions db filename)))
 
 (defn find-namespace-usage-by-alias [db filename alias]
   (->> (get-in db [:analysis filename])