warnings and hlint

Author: wz1000

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

@@ -105,7 +105,7 @@ kick = do
     -- Update the exports map for non FOIs
     -- We can skip this if checkProject is True, assuming they never change under our feet.
     IdeOptions{ optCheckProject = doCheckProject } <- getIdeOptions
-    checkProject <- liftIO $ doCheckProject
+    checkProject <- liftIO doCheckProject
     ifaces <- if checkProject then return Nothing else runMaybeT $ do
         deps <- MaybeT $ sequence <$> uses GetDependencies files
         hiResults <- lift $ uses GetModIface (nubOrd $ foldMap transitiveModuleDeps deps)

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

@@ -1,5 +1,4 @@
 {-# LANGUAGE CPP #-}
-{-# LANGUAGE DataKinds #-}
 #include "ghc-api-version.h"
 module Development.IDE.Core.Tracing
     ( otTracedHandler

ghcide/src/Development/IDE/LSP/HoverDefinition.hs

@@ -2,10 +2,6 @@
 -- SPDX-License-Identifier: Apache-2.0
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE GADTs      #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE ViewPatterns #-}
 
 -- | Display information on hover.
 module Development.IDE.LSP.HoverDefinition

ghcide/src/Development/IDE/LSP/LanguageServer.hs

@@ -4,9 +4,7 @@
 {-# LANGUAGE ExistentialQuantification  #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE PolyKinds #-}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE RankNTypes                 #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes #-}
 
 -- WARNING: A copy of DA.Daml.LanguageServer, try to keep them in sync
 -- This version removes the daml: handling
@@ -142,7 +140,7 @@ runLanguageServer options onConfigurationChange userHandlers getIdeState = do
             liftIO $ logInfo (ideLogger ide) $ T.pack $ "Registering ide configuration: " <> show initConfig
             liftIO $ registerIdeConfiguration (shakeExtras ide) initConfig
 
-            _ <- flip forkFinally (const $ exitClientMsg) $ forever $ do
+            _ <- flip forkFinally (const exitClientMsg) $ forever $ do
                 msg <- readChan clientMsgChan
                 -- We dispatch notifications synchronously and requests asynchronously
                 -- This is to ensure that all file edits and config changes are applied before a request is handled

ghcide/src/Development/IDE/LSP/Outline.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE CPP #-}
 
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE DuplicateRecordFields #-}

ghcide/src/Development/IDE/LSP/Server.hs

@@ -6,9 +6,14 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE KindSignatures #-}
-{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GADTs #-}
-module Development.IDE.LSP.Server where
+module Development.IDE.LSP.Server
+  ( ReactorMessage(..)
+  , ReactorChan
+  , ServerM
+  , requestHandler
+  , notificationHandler
+  ) where
 
 import Language.LSP.Server (LspM, Handlers)
 import Language.LSP.Types

ghcide/src/Development/IDE/Plugin.hs

@@ -1,8 +1,4 @@
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE GADTs      #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-module Development.IDE.Plugin where
+module Development.IDE.Plugin ( Plugin(..) ) where
 
 import Data.Default
 import Development.Shake

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

@@ -2,8 +2,6 @@
 -- SPDX-License-Identifier: Apache-2.0
 
 {-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE GADTs #-}

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

@@ -1,5 +1,4 @@
 {-# LANGUAGE CPP          #-}
-{-# LANGUAGE DataKinds    #-}
 {-# LANGUAGE RankNTypes   #-}
 {-# LANGUAGE TypeFamilies #-}
 #include "ghc-api-version.h"

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

@@ -1,6 +1,4 @@
 {-# LANGUAGE PolyKinds #-}
-{-# LANGUAGE KindSignatures #-}
-{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GADTs #-}
 
 module Development.IDE.Plugin.HLS
@@ -35,6 +33,7 @@ import           Data.Dependent.Sum
 import Data.List.NonEmpty (nonEmpty,NonEmpty,toList)
 import UnliftIO (MonadUnliftIO)
 import Data.String
+import Data.Bifunctor
 
 -- ---------------------------------------------------------------------
 --
@@ -50,7 +49,7 @@ asGhcIdePlugin mp =
 
         mkPlugin :: ([(PluginId, b)] -> Plugin Config) -> (PluginDescriptor IdeState -> b) -> Plugin Config
         mkPlugin maker selector =
-          case map (\(pid, p) -> (pid, selector p)) ls of
+          case map (second selector) ls of
             -- If there are no plugins that provide a descriptor, use mempty to
             -- create the plugin – otherwise we we end up declaring handlers for
             -- capabilities that there are no plugins for
@@ -173,7 +172,7 @@ combineErrors xs = ResponseError InternalError (T.pack (show xs)) Nothing
 
 -- | Combine the 'PluginHandler' for all plugins
 newtype IdeHandler (m :: J.Method FromClient Request)
-  = IdeHandler [(PluginId,(IdeState -> MessageParams m -> LSP.LspM Config (NonEmpty (Either ResponseError (ResponseResult m)))))]
+  = IdeHandler [(PluginId,IdeState -> MessageParams m -> LSP.LspM Config (NonEmpty (Either ResponseError (ResponseResult m))))]
 
 -- | Combine the 'PluginHandlers' for all plugins
 newtype IdeHandlers = IdeHandlers (DMap IdeMethod IdeHandler)