Fixes lazy code for the blessed implementations hack

gampleman · May 13, 2024 · ab7c86b · ab7c86b
1 parent c2beb99
commit ab7c86b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Internal/Builtin/MiniBillCodec.elm b/src/Internal/Builtin/MiniBillCodec.elm
@@ -27,7 +27,7 @@ codeGen =
         , CodeGenerator.float (val "float")
         , CodeGenerator.string (val "string")
         , CodeGenerator.list (fn1 "list")
-        , CodeGenerator.maybe (fn1 "nullable")
+        , CodeGenerator.use "Codec.nullable"
         , CodeGenerator.dict
             (\key value ->
                 CG.apply

diff --git a/src/Internal/DependencyScanner.elm b/src/Internal/DependencyScanner.elm
@@ -7,6 +7,7 @@ import Elm.Syntax.ModuleName exposing (ModuleName)
 import Elm.Type as T exposing (Type)
 import Internal.CodeGenerator exposing (ConfiguredCodeGenerator, ExistingFunctionProvider)
 import List.Extra
+import Maybe.Extra
 import ResolvedType as RT exposing (ResolvedType)
 import Review.Project.Dependency as Dependency exposing (Dependency)
 import TypePattern as TP exposing (TypePattern)
@@ -105,8 +106,11 @@ heuristicRejectIfMultiplePatternsForSameType codeGens providers =
                     Dict.get provider.codeGenId codeGens
                         |> Maybe.andThen
                             (\codeGen ->
-                                List.Extra.find (\ref -> ref.modulePath == provider.moduleName && ref.name == provider.functionName) codeGen.blessedImplementations
-                                    |> Maybe.map (always provider)
+                                List.Extra.find
+                                    (\{ moduleName, functionName } ->
+                                        Maybe.Extra.isJust (List.Extra.find (\ref -> ref.modulePath == moduleName && ref.name == functionName) codeGen.blessedImplementations)
+                                    )
+                                    (provider :: rest)
                             )
             )