Use new pretty instances

Author: michaelpj

ghcide/src/Development/IDE/Plugin/HLS.hs

@@ -65,22 +65,15 @@ instance Pretty Log where
     LogPluginError (PluginId pId) err ->
       pretty pId <> ":" <+> pretty err
     LogResponseError (PluginId pId) err ->
-      pretty pId <> ":" <+> prettyResponseError err
+      pretty pId <> ":" <+> pretty err
     LogNoPluginForMethod (Some method) ->
-        "No plugin enabled for " <> pretty (show method)
+        "No plugin enabled for " <> pretty method
     LogInvalidCommandIdentifier-> "Invalid command identifier"
     ExceptionInPlugin plId (Some method) exception ->
         "Exception in plugin " <> viaShow plId <> " while processing "
-          <> viaShow method <> ": " <> viaShow exception
+          <> pretty method <> ": " <> viaShow exception
 instance Show Log where show = renderString . layoutCompact . pretty
 
--- various error message specific builders
-prettyResponseError :: ResponseError -> Doc a
-prettyResponseError err = errorCode <> ":" <+> errorBody
-    where
-        errorCode = pretty $ show $ err ^. L.code
-        errorBody = pretty $ err ^. L.message
-
 noPluginEnabled :: Recorder (WithPriority Log) -> SMethod m -> [PluginId] -> IO (Either ResponseError c)
 noPluginEnabled recorder m fs' = do
   logWith recorder Warning (LogNoPluginForMethod $ Some m)

hls-plugin-api/src/Ide/Plugin/Resolve.hs

@@ -41,7 +41,7 @@ instance Pretty Log where
         DoesNotSupportResolve fallback->
             "Client does not support resolve," <+> pretty fallback
         ApplyWorkspaceEditFailed err ->
-            "ApplyWorkspaceEditFailed:" <+> viaShow err
+            "ApplyWorkspaceEditFailed:" <+> pretty err
 
 -- |When provided with both a codeAction provider and an affiliated codeAction
 -- resolve provider, this function creates a handler that automatically uses

plugins/hls-cabal-plugin/src/Ide/Plugin/Cabal.hs

@@ -75,7 +75,7 @@ instance Pretty Log where
       "Determined completion context:"
         <+> viaShow context
         <+> "for cursor position:"
-        <+> viaShow position
+        <+> pretty position
     LogCompletions logs -> pretty logs
 
 descriptor :: Recorder (WithPriority Log) -> PluginId -> PluginDescriptor IdeState

plugins/hls-cabal-plugin/src/Ide/Plugin/Cabal/Completion/Types.hs

@@ -27,15 +27,15 @@ data Log
 
 instance Pretty Log where
   pretty = \case
-    LogFileSplitError pos -> "An error occured when trying to separate the lines of the cabal file at position:" <+> viaShow pos
+    LogFileSplitError pos -> "An error occured when trying to separate the lines of the cabal file at position:" <+> pretty pos
     LogUnknownKeyWordInContextError kw ->
       "Lookup of key word failed for:" <+> viaShow kw
     LogUnknownStanzaNameInContextError sn ->
       "Lookup of stanza name failed for:" <+> viaShow sn
     LogFilePathCompleterIOError fp ioErr ->
-      "When trying to complete the file path:" <+> viaShow fp <+> "the following unexpected IO error occured" <+> viaShow ioErr
+      "When trying to complete the file path:" <+> pretty fp <+> "the following unexpected IO error occured" <+> viaShow ioErr
     LogUseWithStaleFastNoResult -> "Package description couldn't be read"
-    LogMapLookUpOfKnownKeyFailed key -> "Lookup of key in map failed even though it should exist" <+> viaShow key
+    LogMapLookUpOfKnownKeyFailed key -> "Lookup of key in map failed even though it should exist" <+> pretty key
 
 type instance RuleResult ParseCabal = Parse.GenericPackageDescription
 

plugins/hls-explicit-imports-plugin/src/Ide/Plugin/ExplicitImports.hs

@@ -73,7 +73,7 @@ data Log
 instance Pretty Log where
   pretty = \case
     LogShake logMsg -> pretty logMsg
-    LogWAEResponseError rspErr -> "RequestWorkspaceApplyEdit Failed with " <+> viaShow rspErr
+    LogWAEResponseError rspErr -> "RequestWorkspaceApplyEdit Failed with " <+> pretty rspErr
     LogResolve msg -> pretty msg
 
 -- | The "main" function of a plugin