non-formatting plugins

Author: wz1000

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

@@ -37,7 +37,7 @@ withWarnings diagSource action = do
   return (reverse $ concat warns, res)
 
 attachReason :: WarnReason -> Diagnostic -> Diagnostic
-attachReason wr d = d{_code = InR . T.unpack <$> showReason wr}
+attachReason wr d = d{_code = InR <$> showReason wr}
  where
   showReason = \case
     NoReason -> Nothing

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

@@ -175,7 +175,7 @@ findDeclContainingLoc loc = find (\(L l _) -> loc `isInsideSrcSpan` l)
 
 suggestDisableWarning :: ParsedModule -> Maybe T.Text -> Diagnostic -> [(T.Text, [TextEdit])]
 suggestDisableWarning pm contents Diagnostic{..}
-    | Just (InR (T.stripPrefix "-W" . T.pack -> Just w)) <- _code =
+    | Just (InR (T.stripPrefix "-W" -> Just w)) <- _code =
         pure
             ( "Disable \"" <> w <> "\" warnings"
             , [TextEdit (endOfModuleHeader pm contents) $ "{-# OPTIONS_GHC -Wno-" <> w <> " #-}\n"]

haskell-language-server.cabal

@@ -66,7 +66,7 @@ library
     , ghc
     , ghcide                >=0.7
     , gitrev
-    , haskell-lsp           ^>=0.23
+    , lsp
     , hls-plugin-api        >=0.7
     , hie-bios
     , hiedb
@@ -323,7 +323,7 @@ executable haskell-language-server
     , ghcide
     , hashable
     , haskell-language-server
-    , haskell-lsp              ^>=0.23
+    , lsp
     , hie-bios
     , hiedb
     , lens
@@ -386,7 +386,7 @@ common hls-test-utils
     , blaze-markup
     , containers
     , data-default
-    , haskell-lsp
+    , lsp
     , hie-bios
     , hls-plugin-api        >=0.6
     , hslogger

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

@@ -26,8 +26,8 @@ import GHC.Generics (Generic)
 
 -- | Given a DidChangeConfigurationNotification message, this function returns the parsed
 -- Config object if possible.
-getConfigFromNotification :: NotificationMessage WorkspaceDidChangeConfiguration -> Either T.Text Config
-getConfigFromNotification (NotificationMessage _ _ (DidChangeConfigurationParams p)) =
+getConfigFromNotification :: Applicative m => a -> A.Value -> m (Either T.Text Config)
+getConfigFromNotification _ p = pure $
   case fromJSON p of
     A.Success c -> Right c
     A.Error err -> Left $ T.pack err

hls-plugin-api/src/Ide/Types.hs

@@ -218,11 +218,13 @@ instance Semigroup (PluginHandlers a) where
 instance Monoid (PluginHandlers a) where
   mempty = PluginHandlers mempty
 
+type SimpleHandler a m = a -> PluginId -> MessageParams m -> LspM Config (Either ResponseError (ResponseResult m))
+
 -- | Make a handler for plugins with no extra data
 mkPluginHandler
   :: PluginMethod m
   => SClientMethod m
-  -> (ideState -> PluginId -> MessageParams m -> LspM Config (Either ResponseError (ResponseResult m)))
+  -> SimpleHandler ideState m
   -> PluginHandlers ideState
 mkPluginHandler m f = PluginHandlers $ DMap.singleton (IdeMethod m) (PluginHandler f')
   where

plugins/default/src/Ide/Plugin/Brittany.hs

@@ -12,8 +12,8 @@ import qualified Data.Text                             as T
 import           Development.IDE
 import           Development.IDE.GHC.Compat (topDir, ModSummary(ms_hspp_opts))
 import           Language.Haskell.Brittany
-import           Language.Haskell.LSP.Types            as J
-import qualified Language.Haskell.LSP.Types.Lens       as J
+import           Language.LSP.Types            as J
+import qualified Language.LSP.Types.Lens       as J
 import           Ide.PluginUtils
 import           Ide.Types
 

plugins/default/src/Ide/Plugin/Example.hs

@@ -29,7 +29,7 @@ import Development.IDE.Core.Shake (getDiagnostics, getHiddenDiagnostics)
 import GHC.Generics
 import Ide.PluginUtils
 import Ide.Types
-import Language.Haskell.LSP.Types
+import Language.LSP.Types
 import Text.Regex.TDFA.Text()
 
 -- ---------------------------------------------------------------------

plugins/default/src/Ide/Plugin/Example2.hs

@@ -28,7 +28,7 @@ import Development.IDE.Core.Shake
 import GHC.Generics
 import Ide.PluginUtils
 import Ide.Types
-import Language.Haskell.LSP.Types
+import Language.LSP.Types
 import Text.Regex.TDFA.Text()
 
 -- ---------------------------------------------------------------------

plugins/default/src/Ide/Plugin/Floskell.hs

@@ -15,7 +15,7 @@ import           Development.IDE as D
 import           Floskell
 import           Ide.PluginUtils
 import           Ide.Types
-import           Language.Haskell.LSP.Types
+import           Language.LSP.Types
 import           Text.Regex.TDFA.Text()
 
 -- ---------------------------------------------------------------------

plugins/default/src/Ide/Plugin/Fourmolu.hs

@@ -22,12 +22,11 @@ import GHC (DynFlags, moduleNameString)
 import GHC.LanguageExtensions.Type (Extension (Cpp))
 import GhcPlugins (HscEnv (hsc_dflags))
 import Ide.PluginUtils (responseError, makeDiffTextEdit)
-import Language.Haskell.LSP.Messages (FromServerMessage (ReqShowMessage))
 
 import Ide.Types
-import Language.Haskell.LSP.Core
-import Language.Haskell.LSP.Types
-import Language.Haskell.LSP.Types.Lens
+import Language.LSP.Server
+import Language.LSP.Types
+import Language.LSP.Types.Lens
 import "fourmolu" Ormolu
 
 -- ---------------------------------------------------------------------