Fix for #47

clj-kondo · Apr 7, 2019 · 5987b5a · 5987b5a
1 parent 8a68f72
commit 5987b5a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/clj_kondo/impl/vars.clj b/src/clj_kondo/impl/vars.clj
@@ -115,7 +115,7 @@
   (loop [[child & rest-children] children
          stripped []]
     (if child
-      (if (contains? '#{:meta} (node/tag child))
+      (if (contains? '#{:meta :meta*} (node/tag child))
         (recur rest-children
                (into stripped (strip-meta* (rest (:children child)))))
         (recur rest-children
@@ -133,6 +133,7 @@
         ;; TODO: add metadata parsing for private
         private? (= 'defn- (some-call expr defn-))
         children (rest children)
+        children (strip-meta* children)
         fn-name (:value (first (filter #(symbol? (:value %)) children)))
         arg-decl (first (filter #(= :vector (:tag %)) children))
         arg-decls (map (fn [x]
@@ -388,7 +389,7 @@
                                  (get-in idacs [:cljc :defns fn-ns (:lang call) fn-name])
                                  (when (and
                                         (not (:clojure-excluded? call))
-                                        (= (:ns call)
+                                        (= caller-ns
                                            fn-ns))
                                    (core-lookup clojure-core-defns cljs-core-defns
                                                 lang fn-name)))
@@ -402,7 +403,7 @@
                              ;; call and the lang of the function def context in
                              ;; the case of in-ns, the bets are off. we may
                              ;; support in-ns in a next version.
-                             valid-order? (if (and (= (:ns call)
+                             valid-order? (if (and (= caller-ns
                                                       fn-ns)
                                                    (= (:base-lang call)
                                                       (:base-lang called-fn)))
@@ -428,7 +429,7 @@
                                                   (str (:arity call) #_#_" " called-fn)
                                                   (:qname called-fn))})
                               (when (and (:private? called-fn)
-                                         (not= (:ns call)
+                                         (not= caller-ns
                                                fn-ns))
                                 {:filename filename
                                  :row (:row call)

diff --git a/test/clj_kondo/impl/vars_test.clj b/test/clj_kondo/impl/vars_test.clj
@@ -24,8 +24,19 @@
   (is (every? true?
               (map submap?
                    '[{:type :defn, :name chunk-buffer, :fixed-arities #{1}}
-                     {:type :call, :name clojure.lang.ChunkBuffer., :arity 1, :row 2, :col 3}](vars/parse-defn :clj #{} (parse-string "(defn ^:static ^clojure.lang.ChunkBuffer chunk-buffer ^clojure.lang.ChunkBuffer [capacity]
-  (clojure.lang.ChunkBuffer. capacity))"))))))
+                     {:type :call, :name clojure.lang.ChunkBuffer., :arity 1, :row 2, :col 3}]
+                   (vars/parse-defn :clj #{}
+                                    (parse-string
+                                     "(defn ^:static ^clojure.lang.ChunkBuffer chunk-buffer ^clojure.lang.ChunkBuffer [capacity]
+  (clojure.lang.ChunkBuffer. capacity))")))))
+  (is (= '({:type :defn,
+            :name get-bytes,
+            :row 1,
+            :col 1,
+            :lang :clj,
+            :fixed-arities #{1}})
+         (vars/parse-defn :clj #{}
+                          (parse-string "(defn get-bytes #^bytes [part] part)")))))
 
 (deftest analyze-ns-test
   (is