Restore hints in diagnostic messages

Author: wz1000

ghcide/src/Development/IDE/GHC/Compat.hs

@@ -17,7 +17,7 @@ module Development.IDE.GHC.Compat(
     NameCacheUpdater(..),
 #if MIN_VERSION_ghc(9,3,0)
     getMessages,
-    diagnosticMessage,
+    renderDiagnosticMessageWithHints,
     nameEnvElts,
 #else
     upNameCache,
@@ -402,7 +402,7 @@ type WarnMsg  = MsgEnvelope DecoratedSDoc
 getMessages' :: PState -> DynFlags -> (Bag WarnMsg, Bag ErrMsg)
 getMessages' pst dflags =
 #if MIN_VERSION_ghc(9,3,0)
-  bimap (fmap (fmap diagnosticMessage) . getMessages) (fmap (fmap diagnosticMessage) . getMessages) $ getPsMessages pst
+  bimap (fmap (fmap renderDiagnosticMessageWithHints) . getMessages) (fmap (fmap renderDiagnosticMessageWithHints) . getMessages) $ getPsMessages pst
 #else
 #if MIN_VERSION_ghc(9,2,0)
                  bimap (fmap pprWarning) (fmap pprError) $
@@ -413,11 +413,16 @@ getMessages' pst dflags =
 #endif
 #endif
 
+#if MIN_VERSION_ghc(9,3,0)
+renderDiagnosticMessageWithHints :: Diagnostic a => a -> DecoratedSDoc
+renderDiagnosticMessageWithHints a = unionDecoratedSDoc (diagnosticMessage a) (mkDecorated $ map ppr $ diagnosticHints a)
+#endif
+
 #if MIN_VERSION_ghc(9,2,0)
 pattern PFailedWithErrorMessages :: forall a b. (b -> Bag (MsgEnvelope DecoratedSDoc)) -> ParseResult a
 pattern PFailedWithErrorMessages msgs
 #if MIN_VERSION_ghc(9,3,0)
-     <- PFailed (const . fmap (fmap diagnosticMessage) . getMessages . getPsErrorMessages -> msgs)
+     <- PFailed (const . fmap (fmap renderDiagnosticMessageWithHints) . getMessages . getPsErrorMessages -> msgs)
 #else
      <- PFailed (const . fmap pprError . getErrorMessages -> msgs)
 #endif

ghcide/src/Development/IDE/GHC/Error.hs

@@ -174,7 +174,7 @@ catchSrcErrors dflags fromWhere ghcM = do
         ghcExceptionToDiagnostics dflags = return . Left . diagFromGhcException fromWhere dflags
         sourceErrorToDiagnostics dflags = return . Left . diagFromErrMsgs fromWhere dflags
 #if MIN_VERSION_ghc(9,3,0)
-                                        . fmap (fmap Compat.diagnosticMessage) . Compat.getMessages
+                                        . fmap (fmap Compat.renderDiagnosticMessageWithHints) . Compat.getMessages
 #endif
                                         . srcErrorMessages