Make ideErrorWithSource produce FileDiagnostic by adding filepath arg

Author: dylan-thinnes

ghcide/session-loader/Development/IDE/Session.hs

@@ -599,7 +599,7 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
                         this_target_details = TargetDetails (TargetFile _cfp) this_error_env this_dep_info [_cfp]
                         this_flags = (this_error_env, this_dep_info)
                         this_error_env = ([this_error], Nothing)
-                        this_error = uncurry (FileDiagnostic _cfp) $ ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error)
+                        this_error = ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) _cfp
                                        $ T.unlines
                                        [ "No cradle target found. Is this file listed in the targets of your cradle?"
                                        , "If you are using a .cabal file, please ensure that this module is listed in either the exposed-modules or other-modules section"
@@ -923,7 +923,7 @@ newComponentCache recorder exts cradlePath _cfp hsc_env old_cis new_cis dir = do
 
 #if MIN_VERSION_ghc(9,3,0)
     let closure_errs = checkHomeUnitsClosed' (hsc_unit_env hscEnv') (hsc_all_home_unit_ids hscEnv')
-        multi_errs = map (uncurry (FileDiagnostic _cfp) . ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Warning) . T.pack . Compat.printWithoutUniques) closure_errs
+        multi_errs = map (ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Warning) _cfp . T.pack . Compat.printWithoutUniques) closure_errs
         bad_units = OS.fromList $ concat $ do
             x <- bagToList $ mapBag errMsgDiagnostic $ unionManyBags $ map Compat.getMessages closure_errs
             DriverHomePackagesNotClosed us <- pure x
@@ -1311,6 +1311,4 @@ showPackageSetupException PackageSetupException{..} = unwords
 
 renderPackageSetupException :: FilePath -> PackageSetupException -> FileDiagnostic
 renderPackageSetupException fp e =
-  let (showDiag, lspDiag) = ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) (T.pack $ showPackageSetupException e)
-  in
-  FileDiagnostic (toNormalizedFilePath' fp) showDiag lspDiag
+  ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) (toNormalizedFilePath' fp) (T.pack $ showPackageSetupException e)

ghcide/session-loader/Development/IDE/Session/Diagnostics.hs

@@ -27,13 +27,13 @@ data CradleErrorDetails =
   Depicts the cradle error in a user-friendly way.
 -}
 renderCradleError :: CradleError -> Cradle a -> NormalizedFilePath -> FileDiagnostic
-renderCradleError (CradleError deps _ec ms) cradle nfp
-  | HieBios.isCabalCradle cradle =
-      let (showDiag, diag) = ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) $ T.unlines $ map T.pack userFriendlyMessage
-       in FileDiagnostic nfp showDiag diag{_data_ = Just $ Aeson.toJSON CradleErrorDetails{cabalProjectFiles=absDeps}}
-  | otherwise =
-      let (showDiag, diag) = ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) $ T.unlines $ map T.pack userFriendlyMessage
-       in FileDiagnostic nfp showDiag diag
+renderCradleError (CradleError deps _ec ms) cradle nfp =
+  let noDetails =
+        ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) nfp $ T.unlines $ map T.pack userFriendlyMessage
+  in
+  if HieBios.isCabalCradle cradle
+     then flip modifyFdLspDiagnostic noDetails $ \diag -> diag{_data_ = Just $ Aeson.toJSON CradleErrorDetails{cabalProjectFiles=absDeps}}
+     else noDetails
   where
     absDeps = fmap (cradleRootDir cradle </>) deps
     userFriendlyMessage :: [String]

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

@@ -49,17 +49,15 @@ type IdeResultNoDiagnosticsEarlyCutoff  v = (Maybe ByteString, Maybe v)
 
 ideErrorText :: NormalizedFilePath -> T.Text -> FileDiagnostic
 ideErrorText fdFilePath msg =
-  let (fdShouldShowDiagnostic, fdLspDiagnostic) =
-        ideErrorWithSource (Just "compiler") (Just DiagnosticSeverity_Error) msg
-  in
-  FileDiagnostic{..}
+  ideErrorWithSource (Just "compiler") (Just DiagnosticSeverity_Error) fdFilePath msg
 
 ideErrorWithSource
   :: Maybe T.Text
   -> Maybe DiagnosticSeverity
+  -> NormalizedFilePath
   -> T.Text
-  -> (ShowDiagnostic, Diagnostic)
-ideErrorWithSource source sev msg = (ShowDiag, LSP.Diagnostic {
+  -> FileDiagnostic
+ideErrorWithSource source sev fp msg = FileDiagnostic fp ShowDiag LSP.Diagnostic {
     _range = noRange,
     _severity = sev,
     _code = Nothing,
@@ -69,7 +67,7 @@ ideErrorWithSource source sev msg = (ShowDiag, LSP.Diagnostic {
     _tags = Nothing,
     _codeDescription = Nothing,
     _data_ = Nothing
-    })
+    }
 
 -- | Defines whether a particular diagnostic should be reported
 --   back to the user.