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)

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

@@ -1,6 +1,5 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeOperators #-}
 
 -- | Exposes the ghcide features as an HLS plugin
 module Development.IDE.Plugin.HLS.GhcIde

ghcide/test/exe/Main.hs

@@ -4724,7 +4724,7 @@ referenceTestSession name thisDoc docs' f = testSessionWithExtraFiles "reference
     loop [] = pure ()
     loop docs = do
       doc <- skipManyTill anyMessage $ satisfyMaybe $ \case
-          FromServerMess (SCustomMethod "ghcide/reference/ready") (NotMess (NotificationMessage{_params = fp})) -> do
+          FromServerMess (SCustomMethod "ghcide/reference/ready") (NotMess NotificationMessage{_params = fp}) -> do
             A.Success fp' <- pure $ fromJSON fp
             find (fp' ==) docs
           _ -> Nothing

haskell-language-server.cabal

@@ -79,12 +79,13 @@ library
     , sqlite-simple
     , unordered-containers
 
-  ghc-options:      -Wall -Wredundant-constraints -Wno-name-shadowing
+  ghc-options:      -Wall -Wredundant-constraints -Wno-name-shadowing -Wno-unticked-promoted-constructors
 
   if flag(pedantic)
     ghc-options: -Werror
 
   default-language: Haskell2010
+  default-extensions: DataKinds, TypeOperators
 
 -- Plugin flags are designed for 'cabal install haskell-language-server':
 -- - Packaged plugins should be manual:False
@@ -306,6 +307,7 @@ executable haskell-language-server
     -- disable idle GC
     -- increase nursery size
     "-with-rtsopts=-I0 -A128M"
+    -Wno-unticked-promoted-constructors
   if flag(pedantic)
     ghc-options: -Werror
 
@@ -344,6 +346,7 @@ executable haskell-language-server
 
   include-dirs:     include
   default-language: Haskell2010
+  default-extensions: DataKinds, TypeOperators
 
 executable haskell-language-server-wrapper
   import:           agpl, common-deps
@@ -462,7 +465,7 @@ test-suite func-test
     Ide.Plugin.Eval.Types
 
   ghc-options:
-    -Wall -Wno-name-shadowing -threaded -rtsopts -with-rtsopts=-N
+    -Wall -Wno-name-shadowing -threaded -rtsopts -with-rtsopts=-N -Wno-unticked-promoted-constructors
 
   if flag(pedantic)
     ghc-options: -Werror -Wredundant-constraints

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

@@ -5,7 +5,6 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE DataKinds #-}
 module Ide.Plugin.Config
     ( getConfigFromNotification
     , Config(..)

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

@@ -7,7 +7,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TupleSections     #-}
 {-# LANGUAGE TypeFamilies      #-}
-{-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE RecordWildCards   #-}
 
 module Ide.Plugin.Example

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

@@ -7,7 +7,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TupleSections     #-}
 {-# LANGUAGE TypeFamilies      #-}
-{-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE RecordWildCards   #-}
 
 module Ide.Plugin.Example2

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

@@ -21,7 +21,7 @@ import qualified EnumSet as S
 import GHC (DynFlags, moduleNameString)
 import GHC.LanguageExtensions.Type (Extension (Cpp))
 import GhcPlugins (HscEnv (hsc_dflags))
-import Ide.PluginUtils (responseError, makeDiffTextEdit)
+import Ide.PluginUtils (makeDiffTextEdit)
 
 import Ide.Types
 import Language.LSP.Server

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

@@ -2,8 +2,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}
-{-# LANGUAGE DataKinds #-}
-{-# OPTIONS_GHC -Wall -Wwarn -fno-warn-type-defaults -fno-warn-unused-binds -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -Wall -Wwarn -fno-warn-type-defaults -fno-warn-unused-binds -fno-warn-unused-imports -Wno-unticked-promoted-constructors #-}
 
 {- | Keep the module name in sync with its file path.
 

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

@@ -3,7 +3,6 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE ViewPatterns          #-}
-{-# LANGUAGE DataKinds             #-}
 
 -- | Provides code actions to add missing pragmas (whenever GHC suggests to)
 module Ide.Plugin.Pragmas

plugins/hls-class-plugin/hls-class-plugin.cabal

@@ -32,3 +32,5 @@ library
                   , unordered-containers
 
   default-language: Haskell2010
+  default-extensions: DataKinds, TypeOperators
+  ghc-options: -Wno-unticked-promoted-constructors

plugins/hls-class-plugin/src/Ide/Plugin/Class.hs

@@ -4,7 +4,6 @@
 {-# LANGUAGE RecordWildCards   #-}
 {-# LANGUAGE TypeFamilies      #-}
 {-# LANGUAGE ViewPatterns      #-}
-{-# LANGUAGE DataKinds         #-}
 module Ide.Plugin.Class
   ( descriptor
   ) where

plugins/hls-eval-plugin/hls-eval-plugin.cabal

@@ -69,9 +69,10 @@ library
     , unordered-containers
     , unliftio
 
-  ghc-options:      -Wall -Wno-name-shadowing
+  ghc-options:      -Wall -Wno-name-shadowing -Wno-unticked-promoted-constructors
 
   if flag(pedantic)
     ghc-options: -Werror
 
   default-language: Haskell2010
+  default-extensions: DataKinds, TypeOperators

plugins/hls-eval-plugin/src/Ide/Plugin/Eval/CodeLens.hs

@@ -12,7 +12,6 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}
 {-# OPTIONS_GHC -fno-warn-type-defaults #-}
 
@@ -66,17 +65,11 @@ import Development.IDE
       GhcSession (..),
       HscEnvEq (envImportPaths),
       IdeState,
-      List (List),
-      NormalizedFilePath,
-      Range (Range),
-      Uri,
       evalGhcEnv,
-      fromNormalizedFilePath,
       hscEnvWithImportPaths,
       runAction,
       textToStringBuffer,
       toNormalizedFilePath',
-      toNormalizedUri,
       uriToFilePath',
       useWithStale_,
       use_, prettyPrint
@@ -170,7 +163,6 @@ import Ide.Plugin.Eval.Util
       response',
       timed,
     )
-import Ide.PluginUtils (mkLspCommand)
 import Ide.Types
 import Language.LSP.Server
 import Language.LSP.Types

plugins/hls-eval-plugin/src/Ide/Plugin/Eval/Parse/Option.hs

@@ -6,7 +6,6 @@ module Ide.Plugin.Eval.Parse.Option (
     parseSetFlags,
 ) where
 
-import Control.Monad.Combinators (many)
 import Text.Megaparsec.Char
 import Text.Megaparsec
 import Data.Void (Void)

plugins/hls-eval-plugin/test/Eval.hs

@@ -11,7 +11,6 @@ module Eval (
 import Control.Applicative.Combinators (
     skipManyTill
  )
-import Data.Function
 import Control.Monad (when)
 import Control.Monad.IO.Class (MonadIO (liftIO))
 import qualified Data.Text as T

plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal

@@ -30,3 +30,4 @@ library
 
   default-language: Haskell2010
   include-dirs:     include
+  default-extensions: DataKinds, TypeOperators

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

@@ -8,7 +8,6 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE DataKinds #-}
 
 #include "ghc-api-version.h"
 

plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal

@@ -17,7 +17,7 @@ bug-reports:   https://github.com/haskell/haskell-language-server/issues
 library
   exposed-modules:  Ide.Plugin.HaddockComments
   hs-source-dirs:   src
-  ghc-options:      -Wall -Wno-name-shadowing -Wredundant-constraints
+  ghc-options:      -Wall -Wno-name-shadowing -Wredundant-constraints -Wno-unticked-promoted-constructors
   build-depends:
     , base                  >=4.12 && <5
     , containers
@@ -30,3 +30,4 @@ library
     , unordered-containers
 
   default-language: Haskell2010
+  default-extensions: DataKinds, TypeOperators

plugins/hls-haddock-comments-plugin/src/Ide/Plugin/HaddockComments.hs

@@ -4,7 +4,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ViewPatterns #-}
-{-# LANGUAGE DataKinds #-}
 
 module Ide.Plugin.HaddockComments (descriptor) where
 

plugins/hls-hlint-plugin/hls-hlint-plugin.cabal

@@ -64,9 +64,10 @@ library
 
     cpp-options:   -DHLINT_ON_GHC_LIB
 
-  ghc-options:      -Wall -Wredundant-constraints -Wno-name-shadowing
+  ghc-options:      -Wall -Wredundant-constraints -Wno-name-shadowing -Wno-unticked-promoted-constructors
 
   if flag(pedantic)
     ghc-options: -Werror
 
   default-language: Haskell2010
+  default-extensions: DataKinds, TypeOperators

plugins/hls-hlint-plugin/src/Ide/Plugin/Hlint.hs

@@ -8,7 +8,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PackageImports    #-}
 {-# LANGUAGE TypeFamilies      #-}
-{-# LANGUAGE DataKinds         #-}
+{-# OPTIONS_GHC -Wno-orphans   #-}
 
 module Ide.Plugin.Hlint
   (

plugins/hls-retrie-plugin/hls-retrie-plugin.cabal

@@ -36,3 +36,5 @@ library
 
   default-language: Haskell2010
   include-dirs:     include
+  default-extensions: DataKinds, TypeOperators
+  ghc-options: -Wno-unticked-promoted-constructors

plugins/hls-retrie-plugin/src/Ide/Plugin/Retrie.hs

@@ -10,7 +10,6 @@
 {-# LANGUAGE StandaloneDeriving  #-}
 {-# LANGUAGE TypeApplications    #-}
 {-# LANGUAGE TypeFamilies        #-}
-{-# LANGUAGE DataKinds           #-}
 
 {-# OPTIONS -Wno-orphans #-}
 #include "ghc-api-version.h"

plugins/hls-splice-plugin/hls-splice-plugin.cabal

@@ -12,7 +12,7 @@ build-type:         Simple
 
 library
   exposed-modules:  Ide.Plugin.Splice
-  ghc-options:      -Wall
+  ghc-options:      -Wall -Wno-unticked-promoted-constructors
   other-modules:    Ide.Plugin.Splice.Types
   hs-source-dirs:   src
   build-depends:    aeson
@@ -35,3 +35,4 @@ library
                   , unliftio-core
 
   default-language: Haskell2010
+  default-extensions: DataKinds, TypeOperators