Fix up mistakes from merge, TODO fix merge issues for 9.3.0

Author: dylan-thinnes

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

@@ -365,7 +365,6 @@ tcRnModule hsc_env tc_helpers pmod = do
              do  hscTypecheckRenameWithDiagnostics hscEnvTmp ms $
                           HsParsedModule { hpm_module = parsedSource pmod
                                          , hpm_src_files = pm_extra_src_files pmod
-                                         , hpm_annotations = pm_annotations pmod
                                          }
   let rn_info = case mrn_info of
         Just x  -> x
@@ -708,11 +707,12 @@ tagDiag (w@(Just (WarningWithCategory cat)), fd)
 tagDiag (w@(Just (WarningWithFlags warnings)), fd)
   | tags <- mapMaybe requiresTag (toList warnings)
   = (w, fd & fdLspDiagnosticL %~ \diag -> diag { _tags = Just $ tags ++ concat (_tags diag) })
-tagDiag (w@(Just (WarningWithFlag warning)), (nfp, sh, fd))
+#else
+tagDiag (w@(Just (WarningWithFlag warning)), fd)
   | Just tag <- requiresTag warning
-  = (w, fd & fdLspDiagnosticL %~ \diag -> { _tags = Just $ tag : concat (_tags diag) })
+  = (w, fd & fdLspDiagnosticL %~ \diag -> diag { _tags = Just $ tag : concat (_tags diag) })
 #endif
-  where
+    where
     requiresTag :: WarningFlag -> Maybe DiagnosticTag
 #if !MIN_VERSION_ghc(9,7,0)
     -- doesn't exist on 9.8, we use WarningWithCategory instead
@@ -1111,7 +1111,7 @@ parseFileContents env customPreprocessor filename ms = do
                       sourceParser
                       DiagnosticSeverity_Warning
                       (fmap attachNoStructuredError preproc_warns)
-               (parsed', msgs) <- liftIO $ applyPluginsParsedResultAction env ms hpm_annotations parsed psMessages
+               (parsed', msgs) <- liftIO $ applyPluginsParsedResultAction env ms parsed psMessages
                let (warns, errors) = renderMessages msgs
 
                -- Just because we got a `POk`, it doesn't mean there

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

@@ -318,7 +318,6 @@ renderMessages msgs =
   let renderMsgs extractor = (fmap . fmap) renderDiagnosticMessageWithHints . getMessages $ extractor msgs
 #endif
   in (renderMsgs psWarnings, renderMsgs psErrors)
-  in (renderMsgs psWarnings, renderMsgs psErrors)
 
 #if MIN_VERSION_ghc(9,6,1)
 pattern PFailedWithErrorMessages :: forall a b. (b -> Bag (MsgEnvelope GhcMessage)) -> ParseResult a

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

@@ -123,9 +123,10 @@ pprNoLocMsgEnvelope (MsgEnvelope { errMsgDiagnostic = e
 #if MIN_VERSION_ghc(9,6,1)
 type ErrMsg  = MsgEnvelope GhcMessage
 type WarnMsg  = MsgEnvelope GhcMessage
-#elif MIN_VERSION_ghc(9,3,0)
+#else
 type ErrMsg  = MsgEnvelope DecoratedSDoc
 type WarnMsg  = MsgEnvelope DecoratedSDoc
+#endif
 
 mkPrintUnqualifiedDefault :: HscEnv -> GlobalRdrEnv -> PrintUnqualified
 #if MIN_VERSION_ghc(9,5,0)

ghcide/src/Development/IDE/Types/Diagnostics.hs

@@ -94,23 +94,13 @@ ideErrorFromLspDiag lspDiag fdFilePath origMsg =
 attachedReason :: Traversal' Diagnostic (Maybe JSON.Value)
 attachedReason = data_ . non (JSON.object []) . JSON.atKey "attachedReason"
 
-#if MIN_VERSION_ghc(9,3,0)
 attachReason :: Maybe DiagnosticReason -> Diagnostic -> Diagnostic
 attachReason Nothing = id
 attachReason (Just wr) = attachedReason .~ fmap JSON.toJSON (showReason wr)
  where
   showReason = \case
     WarningWithFlag flag -> showFlag flag
     _                    -> Nothing
-#else
-attachReason :: WarnReason -> Diagnostic -> Diagnostic
-attachReason wr = attachedReason .~ fmap JSON.toJSON (showReason wr)
- where
-  showReason = \case
-    NoReason       -> Nothing
-    Reason flag    -> showFlag flag
-    ErrReason flag -> showFlag =<< flag
-#endif
 
 showFlag :: WarningFlag -> Maybe T.Text
 showFlag flag = ("-W" <>) . T.pack . flagSpecName <$> find ((== flag) . flagSpecFlag) wWarningFlags