towards solution

Author: borkdude

src/sci/impl/analyzer.cljc

@@ -596,12 +596,16 @@
                    binding-name (if t (vary-meta binding-name
                                                  assoc :tag t)
                                     binding-name)
-                   binding-meta (meta binding-name)
-                   t (when m (:tag binding-meta))
-                   binding-name (if (symbol? t)
-                                  (vary-meta binding-name
-                                             assoc :tag-class (interop/resolve-type-hint ctx t))
-                                  binding-name)
+                   #?@(:clj [binding-meta (meta binding-name)
+                             t (when m (:tag binding-meta))
+                             binding-name (if (symbol? t)
+                                            (vary-meta binding-name
+                                                       assoc :tag-class
+                                                       (or (interop/resolve-type-hint ctx t)
+                                                           (records/resolve-record-class ctx t)
+                                                           (throw-error-with-location
+                                                            (str "Unable to resolve classname: " t) t)))
+                                            binding-name)])
                    v (analyze ctx binding-value)
                    new-iden (gensym)
                    cb (:closure-bindings ctx)

src/sci/impl/doseq_macro.cljc

@@ -36,7 +36,7 @@
                                                  ~@(when needrec [recform]))
                                                ~recform)]))
                      (let [seq- (gensym "seq_")
-                           chunk- (with-meta (gensym "chunk_")
+                           chunk- (gensym "chunk_") #_(with-meta (gensym "chunk_")
                                     {:tag 'clojure.lang.IChunk})
                            count- (gensym "count_")
                            i- (gensym "i_")

src/sci/impl/interop.cljc

@@ -159,9 +159,10 @@
       'char Character/TYPE
       'chars (Class/forName "[C")}))
 
-(defn resolve-type-hint [ctx sym]
-  (or (get prim->class sym)
-      (:class (resolve-class-opts ctx sym))))
+#?(:clj
+   (defn resolve-type-hint [ctx sym]
+     (or (get prim->class sym)
+         (:class (resolve-class-opts ctx sym)))))
 
 #?(:clj
    (def ->array-class

src/sci/impl/resolve.cljc

@@ -195,7 +195,10 @@
                             #?@(:clj [tag (with-meta
                                             {:tag tag
                                              :tag-class (or tag-class
-                                                            (interop/resolve-type-hint ctx tag))})])
+                                                            (interop/resolve-type-hint ctx tag)
+                                                            (records/resolve-record-class ctx tag)
+                                                            (throw-error-with-location
+                                                             (str "Unable to resolve classname: " tag) tag))})])
                             mutable? (vary-meta assoc :mutable true))]
                     v))]
           [k v]))

test/sci/interop_test.cljc

@@ -332,3 +332,13 @@
 
 #?(:cljs (deftest local-interop-test
            (is (= 1 (tu/eval* "(let [j #js {:a (fn [] 1)}] (j.a))" nil)))))
+
+(deftest type-hint-test
+  (testing "type hinting with runnable returns nil on futuretask get"
+    #?(:clj
+       (let [config {:classes {'java.util.concurrent.Executors java.util.concurrent.Executors 'java.util.concurrent.ThreadPoolExecutor java.util.concurrent.ThreadPoolExecutor 'java.util.concurrent.Callable java.util.concurrent.Callable 'java.util.concurrent.FutureTask java.util.concurrent.FutureTask 'java.lang.Runnable java.lang.Runnable}}]
+         (is (nil? (sci/eval-string "(def fut (let [^java.lang.Runnable f (fn [] 3)] (.submit (java.util.concurrent.Executors/newCachedThreadPool) f))) (.get fut)" config))))))
+  (testing "type hinting with callable returns nil on futuretask get"
+    #?(:clj
+       (let [config {:classes {'java.util.concurrent.Executors java.util.concurrent.Executors 'java.util.concurrent.ThreadPoolExecutor java.util.concurrent.ThreadPoolExecutor 'java.util.concurrent.Callable java.util.concurrent.Callable 'java.util.concurrent.FutureTask java.util.concurrent.FutureTask 'java.lang.Runnable java.lang.Runnable}}]
+         (is (= 3 (sci/eval-string "(def fut (let [^java.util.concurrent.Callable f (fn [] 3)] (.submit (java.util.concurrent.Executors/newCachedThreadPool) f))) (.get fut)" config)))))))