Preserve :file

Author: borkdude

src/sci/core.cljc

@@ -83,12 +83,16 @@
             name# (or ~nm (:name m#))
             tag# (:tag m#)
             private# (:private m#)
+            file# (:file m#)
+            line# (:line m#)
             new-m# (cond-> {:doc (:doc m#)
                             :name name#
                             :arglists (:arglists m#)
                             :ns ns#}
                      tag# (assoc :tag tag#)
-                     private# (assoc :private private#))]
+                     private# (assoc :private private#)
+                     file# (assoc :file file#)
+                     line# (assoc :line line#))]
         (cond (:dynamic m#)
               (new-dynamic-var name# val# new-m#)
               (or (:macro m#) (:sci/macro m#))
@@ -106,14 +110,18 @@
         macro (:macro m)
         private (:private m)
         tag (:tag m)
+        file (:file m)
+        line (:line m)
     new-m (cond-> {:ns sci-ns
                        :name nm}
                 macro (assoc :macro true)
                 doc (assoc :doc doc)
                 arglists (assoc :arglists arglists)
                 dynamic (assoc :dynamic dynamic)
                 private (assoc :private private)
-                tag (assoc :tag tag))]
+                tag (assoc :tag tag)
+                file (assoc :file file)
+                line (assoc :line line))]
     (new-var nm @clojure-var new-m)))
 
 (macros/deftime
@@ -418,7 +426,9 @@
                                    :macro
                                    :sci/macro
                                    :doc
-                                   :dynamic])
+                                   :dynamic
+                                   :file
+                                   :line])
                    normalize-meta)))
 
 (macros/deftime

src/sci/impl/copy_vars.cljc

@@ -57,14 +57,18 @@
                                                   dyn (:dynamic m)
                                                   private (:private m)
                                                   arglists (:arglists m)
-                                                  tag (:tag m)]
+                                                  tag (:tag m)
+                                                  file (:file m)
+                                                  line (:line m)]
                                               (cond-> (if elide-vars {} {:doc (:doc m)})
                                                 dyn (assoc :dynamic dyn)
                                                 private (assoc :private private)
                                                 (if elide-vars false arglists)
                                                 (assoc :arglists (list 'quote (:arglists m)))
                                                 tag (assoc :tag tag)
-                                                fast-path (assoc :sci.impl/fast-path (list 'quote sym))))
+                                                fast-path (assoc :sci.impl/fast-path (list 'quote sym))
+                                                (if elide-vars false file) (assoc :file file)
+                                                (if elide-vars false line) (assoc :line line)))
                                       :cljs nil)
                               :cljs (let [r (cljs-resolve &env fqsym)
                                           m (:meta r)

src/sci/impl/namespaces.cljc

@@ -1219,6 +1219,7 @@
 (macros/usetime
 
  (def clojure-core
+   (merge
    (avoid-method-too-large
     {:obj clojure-core-ns
      '*ns* sci.impl.utils/current-ns
@@ -1569,8 +1570,9 @@
      #?@(:cljs ['js-keys (copy-core-var js-keys)])
      #?@(:cljs ['js-delete (copy-core-var js-delete)])
      #?@(:cljs ['js-in (copy-var js-in clojure-core-ns {:copy-meta-from clojure.core/js-in})])
-     'juxt (copy-core-var juxt)
-     'keep (copy-core-var keep)
+     'juxt (copy-core-var juxt)})
+   (avoid-method-too-large
+    {'keep (copy-core-var keep)
      'keep-indexed (copy-core-var keep-indexed)
      'key (copy-core-var key)
      'keys (copy-core-var keys)
@@ -1862,7 +1864,7 @@
                'ratio? (copy-core-var ratio?)
                'rationalize (copy-core-var rationalize)
                'seque (copy-core-var seque)
-               'xml-seq (copy-core-var xml-seq)])}))
+               'xml-seq (copy-core-var xml-seq)])})))
 
  (defn dir-fn
    [ns]

test/sci/core_test.cljc

@@ -296,6 +296,10 @@
   (testing "metadata isn't evaluated on defn expression"
     (eval* "^{:inverse-of foo} (defn bar [])")))
 
+(deftest source-fn-test
+  (testing "source-fn on built-in var does not throw"
+    (is (nil? (eval* "(clojure.repl/source-fn 'inc)")))))
+
 (deftest defn-kwargs-test
   (is (= {:a 1} (sci/eval-string "(defn foo [& {:keys [a]}] {:a a}) (foo :a 1)")))
   (is (= {:a 1} (sci/eval-string "(defn foo [& {:keys [a]}] {:a a}) (foo {:a 1})"))))