Make hover work in dependency files

Author: nlander

ghcide/src/Development/IDE/Core/Actions.hs

@@ -124,11 +124,15 @@ getAtPoint file pos = runMaybeT $ do
   opts <- liftIO $ getIdeOptionsIO ide
 
   (hf, mapping) <- useE GetHieAst file
-  env <- hscEnv . fst <$> useE GhcSession file
-  dkMap <- lift $ maybe (DKMap mempty mempty) fst <$> runMaybeT (useE GetDocMap file)
+  (mEnv, mDkMap) <- case getSourceFileOrigin file of
+    FromDependency -> pure (Nothing, Nothing)
+    FromProject -> do
+      env <- hscEnv . fst <$> useE GhcSession file
+      dkMap <- lift $ maybe (DKMap mempty mempty) fst <$> runMaybeT (useE GetDocMap file)
+      pure (Just env, Just dkMap)
 
   !pos' <- MaybeT (return $ fromCurrentPosition mapping pos)
-  MaybeT $ pure $ first (toCurrentRange mapping =<<) <$> AtPoint.atPoint opts hf dkMap env pos'
+  MaybeT $ pure $ first (toCurrentRange mapping =<<) <$> AtPoint.atPoint opts hf mDkMap mEnv pos'
 
 -- | For each Loacation, determine if we have the PositionMapping
 -- for the correct file. If not, get the correct position mapping

ghcide/src/Development/IDE/Core/Rules.hs

@@ -570,19 +570,18 @@ reportImportCyclesRule recorder =
 getHieAstsRule :: Recorder (WithPriority Log) -> Rules ()
 getHieAstsRule recorder =
     define (cmapWithPrio LogShake recorder) $ \GetHieAst f -> do
-        isFoi <- use_ IsFileOfInterest f
-        case isFoi of
-            IsFOI ReadOnly -> do
+        case getSourceFileOrigin f of
+            FromDependency -> do
                 se <- getShakeExtras
                 mHieFile <- liftIO
                     $ runIdeAction "GetHieAst" se
                     $ runMaybeT
                     $ readHieFileForSrcFromDisk recorder f
                 pure ([], makeHieAstResult <$> mHieFile)
-            _ -> do
+            FromProject -> do
                 tmr <- use_ TypeCheck f
                 hsc <- hscEnv <$> use_ GhcSessionDeps f
-                getHieAstRuleDefinition f isFoi hsc tmr
+                getHieAstRuleDefinition f hsc tmr
     where
         makeHieAstResult :: Compat.HieFile -> HieAstResult
         makeHieAstResult hieFile =
@@ -605,11 +604,12 @@ persistentHieFileRule recorder = addPersistentRule GetHieAst $ \file -> runMaybe
       del = deltaFromDiff (T.decodeUtf8 $ Compat.hie_hs_src res) currentSource
   pure (HAR (Compat.hie_module res) (Compat.hie_asts res) refmap mempty (HieFromDisk res),del,ver)
 
-getHieAstRuleDefinition :: NormalizedFilePath -> IsFileOfInterestResult -> HscEnv -> TcModuleResult -> Action (IdeResult HieAstResult)
-getHieAstRuleDefinition f isFoi hsc tmr = do
+getHieAstRuleDefinition :: NormalizedFilePath -> HscEnv -> TcModuleResult -> Action (IdeResult HieAstResult)
+getHieAstRuleDefinition f hsc tmr = do
   (diags, masts) <- liftIO $ generateHieAsts hsc tmr
   se <- getShakeExtras
 
+  isFoi <- use_ IsFileOfInterest f
   diagsWrite <- case isFoi of
     IsFOI Modified{firstOpen = False} -> do
       when (coerce $ ideTesting se) $ liftIO $ mRunLspT (lspEnv se) $

ghcide/src/Development/IDE/Spans/AtPoint.hs

@@ -211,11 +211,11 @@ gotoDefinition withHieDb getHieFile ideOpts imports srcSpans pos
 atPoint
   :: IdeOptions
   -> HieAstResult
-  -> DocAndKindMap
-  -> HscEnv
+  -> Maybe DocAndKindMap
+  -> Maybe HscEnv
   -> Position
   -> Maybe (Maybe Range, [T.Text])
-atPoint IdeOptions{} (HAR _ hf _ _ kind) (DKMap dm km) env pos = listToMaybe $ pointCommand hf pos hoverInfo
+atPoint IdeOptions{} (HAR _ hf _ _ kind) mDkMap mEnv pos = listToMaybe $ pointCommand hf pos hoverInfo
   where
     -- Hover info for values/data
     hoverInfo ast = (Just range, prettyNames ++ pTypes)
@@ -245,22 +245,33 @@ atPoint IdeOptions{} (HAR _ hf _ _ kind) (DKMap dm km) env pos = listToMaybe $ p
         prettyName (Right n, dets) = T.unlines $
           wrapHaskell (printOutputable n <> maybe "" (" :: " <>) ((prettyType <$> identType dets) <|> maybeKind))
           : maybeToList (pretty (definedAt n) (prettyPackageName n))
-          ++ catMaybes [ T.unlines . spanDocToMarkdown <$> lookupNameEnv dm n
+          ++ catMaybes [ T.unlines . spanDocToMarkdown <$> maybeDoc
                        ]
-          where maybeKind = fmap printOutputable $ safeTyThingType =<< lookupNameEnv km n
+          where maybeKind = do
+                  (DKMap _ km) <- mDkMap
+                  nameEnv <- lookupNameEnv km n
+                  printOutputable <$> safeTyThingType nameEnv
+                maybeDoc = do
+                  (DKMap dm _) <- mDkMap
+                  lookupNameEnv dm n
                 pretty Nothing Nothing = Nothing
                 pretty (Just define) Nothing = Just $ define <> "\n"
                 pretty Nothing (Just pkgName) = Just $ pkgName <> "\n"
                 pretty (Just define) (Just pkgName) = Just $ define <> " " <> pkgName <> "\n"
         prettyName (Left m,_) = printOutputable m
 
-        prettyPackageName n = do
-          m <- nameModule_maybe n
-          let pid = moduleUnit m
-          conf <- lookupUnit env pid
-          let pkgName = T.pack $ unitPackageNameString conf
-              version = T.pack $ showVersion (unitPackageVersion conf)
-          pure $ "*(" <> pkgName <> "-" <> version <> ")*"
+        prettyPackageName n = case mEnv of
+          Just env -> do
+            pid <- getUnit n
+            conf <- lookupUnit env pid
+            let pkgName = T.pack $ unitPackageNameString conf
+                version = T.pack $ showVersion (unitPackageVersion conf)
+            pure $ "*(" <> pkgName <> "-" <> version <> ")*"
+          Nothing -> do
+            u <- getUnit n
+            let pkgStr = takeWhile (/= ':') $ show $ toUnitId u
+            pure $ "*(" <> T.pack pkgStr <> ")*"
+        getUnit n = moduleUnit <$> nameModule_maybe n
 
         prettyTypes = map (("_ :: "<>) . prettyType) types
         prettyType t = case kind of