Remove the unused parameter from 'ideErrorText'

Author: fendor

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

@@ -165,7 +165,6 @@ computePackageDeps env pkg = do
             [ ideErrorText
                 (toNormalizedFilePath' noFilePath)
                 (T.pack $ "unknown package: " ++ show pkg)
-                Nothing
             ]
         Just pkgInfo -> return $ Right $ unitDepends pkgInfo
 

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

@@ -142,7 +142,7 @@ getModificationTimeImpl missingFileDiags file = do
                 `catch` \(e :: IOException) -> do
                     let err | isDoesNotExistError e = "File does not exist: " ++ file'
                             | otherwise = "IO error while reading " ++ file' ++ ", " ++ displayException e
-                        diag = ideErrorText file (T.pack err) Nothing
+                        diag = ideErrorText file (T.pack err)
                     if isDoesNotExistError e && not missingFileDiags
                         then return (Nothing, ([], Nothing))
                         else return (Nothing, ([diag], Nothing))

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

@@ -1248,7 +1248,7 @@ defineEarlyCutoff' doDiagnostics cmp key file mbOld mode action = do
                 (mbBs, (diags, mbRes)) <- actionCatch
                     (do v <- action staleV; liftIO $ evaluate $ force v) $
                     \(e :: SomeException) -> do
-                        pure (Nothing, ([ideErrorText file (T.pack $ show e) Nothing | not $ isBadDependency e],Nothing))
+                        pure (Nothing, ([ideErrorText file (T.pack $ show e) | not $ isBadDependency e],Nothing))
 
                 ver <- estimateFileVersionUnsafely key mbRes file
                 (bs, res) <- case mbRes of

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

@@ -76,9 +76,12 @@ type IdeResult v = ([FileDiagnostic], Maybe v)
 -- | an IdeResult with a fingerprint
 type IdeResultNoDiagnosticsEarlyCutoff  v = (Maybe ByteString, Maybe v)
 
-ideErrorText :: NormalizedFilePath -> T.Text -> Maybe (MsgEnvelope GhcMessage) -> FileDiagnostic
-ideErrorText fdFilePath msg origMsg =
-  ideErrorWithSource (Just "compiler") (Just DiagnosticSeverity_Error) fdFilePath msg origMsg
+-- | Produce a 'FileDiagnostic' for the given 'NormalizedFilePath'
+-- with an error message.
+ideErrorText :: NormalizedFilePath -> T.Text -> FileDiagnostic
+ideErrorText nfp msg =
+  ideErrorWithSource (Just "compiler") (Just DiagnosticSeverity_Error) nfp msg Nothing
+
 
 ideErrorFromLspDiag
   :: LSP.Diagnostic

test/functional/Config.hs

@@ -89,7 +89,7 @@ genericConfigTests = testGroup "generic plugin config"
                     files <- getFilesOfInterestUntracked
                     void $ uses_ GetTestDiagnostics $ HM.keys files
               define mempty $ \GetTestDiagnostics file -> do
-                let diags = [ideErrorText file "testplugin" Nothing]
+                let diags = [ideErrorText file "testplugin"]
                 return (diags,Nothing)
           }
         -- A config that disables the plugin initially