Import Path Fix

Author: tittoassini

plugins/default/src/Ide/Plugin/Eval/CodeLens.hs

@@ -80,6 +80,7 @@ import Development.IDE.Core.RuleTypes (
     GhcSessionDeps (..),
  )
 import Development.IDE.GHC.Compat (HscEnv)
+import Development.IDE.GHC.Util (moduleImportPath)
 import DynamicLoading (initializePlugins)
 import GHC (
     ExecOptions (
@@ -369,11 +370,18 @@ runEvalCmd lsp state EvalParams{..} =
                                                 -- Install the module pragmas and options
                                                 df <- liftIO $ setupDynFlagsForGHCiLike env $ ms_hspp_opts ms
 
-                                                -- Restore the cradle import paths
-                                                let impPaths =
-                                                        fromMaybe (importPaths df) $ envImportPaths session
+                                                -- Desperately looking for an import path
+                                                let impPaths0 = importPaths df
+                                                    impPaths1 = envImportPaths session
+                                                    impPaths2 = (: []) <$> moduleImportPath nfp modName
+                                                    impPaths = fromMaybe impPaths0 $ impPaths1 <> impPaths2
+                                                dbg "importPaths0" impPaths0
+                                                dbg "importPaths1" impPaths1
+                                                dbg "importPaths2" impPaths2
                                                 dbg "importPaths" impPaths
+                                                -- Restore the cradle import paths
                                                 df <- return df{importPaths = impPaths}
+
                                                 -- Set the modified flags in the session
                                                 _lp <- setSessionDynFlags df