Finish fixing #80

clj/src/cljd/compiler.cljc

@@ -1192,6 +1192,21 @@
       [dc-Null (dissoc type :nullable)]
       [type])))
 
+(defn- nullable-type? [type]
+  (or (:nullable type)
+    (case (:canon-qname type)
+      dc.dynamic true
+      da.FutureOr (recur (first (:type-parameters type)))
+      false)))
+
+(defn- positive-type
+  [{:keys [canon-qname nullable] :as type}]
+  (case canon-qname
+    dc.dynamic dc-Object
+    da.FutureOr (let [[t] (:type-parameters type)]
+                  (assoc da-FutureOr :type-parameters [(positive-type t)]))
+    (dissoc type :nullable)))
+
 (defn is-assignable?
   "Returns true when a value of type value-type can be used as a value of type slot-type."
   [slot-type value-type]
@@ -1256,9 +1271,16 @@
    (magicast dart-expr expected-type (:dart/type (infer-type dart-expr)) env))
   ([dart-expr expected-type actual-type env]
    (cond
-     (is-assignable? expected-type actual-type) dart-expr
+     (is-assignable? expected-type actual-type) dart-expr ; <1>
      (and (= (:canon-qname expected-type) 'dc.double)
        (= (:canon-qname actual-type) 'dc.int)) dart-expr
+     (and (nullable-type? expected-type) (nullable-type? actual-type))
+     (with-lifted [dart-expr dart-expr] env
+       (list 'dart/if (list 'dart/. nil "!=" dart-expr)
+           ; by construction expected-type can't be dynamic or FutureOr<dynamic>, otherwise
+           ; it would have matched the assignability test <1> above
+           (magicast dart-expr (positive-type expected-type) actual-type env)
+           nil))
      ;; When inlined #dart[], we keep it inlines
      ;; TODO: don't like the (vector? dart-expr) check, it smells bad
      (and (= 'dc.List (:canon-qname expected-type) (:canon-qname actual-type))

clj/test/cljd/test_clojure/core_test_cljd.cljd

@@ -425,4 +425,5 @@
   (let [x (CastNullable.)]
     (is (= "clojuredart" (.text x (cond-> ["coucou"]
                                     true (conj "clojuredart")))))
-    (is (= "worked" (.text x nil)))))
+    (is (= "worked" (.text x nil)))
+    (is (= "worked" (.text x ^List? (identity nil))))))