Add -Wunused-packages, consolidate warning configs, fix few more warn…

…ings
haskell · Apr 15, 2024 · ad741d4 · ad741d4
1 parent 2390949
commit ad741d4
Show file tree

Hide file tree

Showing 27 changed files with 44 additions and 34 deletions.
diff --git a/cabal.project b/cabal.project
@@ -10,9 +10,6 @@ test-show-details: direct
 
 benchmarks: True
 
-package *
-  ghc-options: -Wunused-packages
-
 package lsp
   flags: +demo
 

diff --git a/lsp-test/bench/SimpleBench.hs b/lsp-test/bench/SimpleBench.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
 
 module Main where
 

diff --git a/lsp-test/example/Test.hs b/lsp-test/example/Test.hs
@@ -6,6 +6,7 @@ import Language.LSP.Protocol.Message
 import Language.LSP.Protocol.Types
 import Language.LSP.Test
 
+main :: IO ()
 main = runSession "lsp-demo-reactor-server" fullCaps "test/data/" $ do
   doc <- openDoc "Rename.hs" "haskell"
 

diff --git a/lsp-test/func-test/FuncTest.hs b/lsp-test/func-test/FuncTest.hs
@@ -15,14 +15,12 @@ import Control.Monad.IO.Class
 import Data.Aeson qualified as J
 import Data.Maybe
 import Data.Proxy
-import Data.Set qualified as Set
 import Language.LSP.Protocol.Lens qualified as L
 import Language.LSP.Protocol.Message
 import Language.LSP.Protocol.Types
 import Language.LSP.Server
 import Language.LSP.Test qualified as Test
 import System.Exit
-import System.IO
 import System.Process
 import Test.Hspec
 import UnliftIO

diff --git a/lsp-test/lsp-test.cabal b/lsp-test/lsp-test.cabal
@@ -31,7 +31,11 @@ source-repository head
   type:     git
   location: https://github.com/haskell/lsp
 
+common warnings
+  ghc-options: -Wunused-packages
+
 library
+  import:             warnings
   hs-source-dirs:     src
   default-language:   GHC2021
   exposed-modules:    Language.LSP.Test
@@ -89,6 +93,7 @@ library
   ghc-options:        -W
 
 test-suite tests
+  import:             warnings
   type:               exitcode-stdio-1.0
   hs-source-dirs:     test
   main-is:            Test.hs
@@ -114,6 +119,7 @@ test-suite tests
     , unliftio
 
 test-suite func-test
+  import:             warnings
   type:               exitcode-stdio-1.0
   hs-source-dirs:     func-test
   default-language:   GHC2021
@@ -122,7 +128,6 @@ test-suite func-test
     , base
     , aeson
     , co-log-core
-    , containers
     , hspec
     , lens
     , lsp
@@ -132,6 +137,7 @@ test-suite func-test
     , unliftio
 
 test-suite example
+  import:             warnings
   type:               exitcode-stdio-1.0
   hs-source-dirs:     example
   default-language:   GHC2021
@@ -144,11 +150,12 @@ test-suite example
   build-tool-depends: lsp:lsp-demo-reactor-server
 
 benchmark simple-bench
+  import:             warnings
   type:               exitcode-stdio-1.0
   hs-source-dirs:     bench
   default-language:   GHC2021
   main-is:            SimpleBench.hs
-  ghc-options:        -Wall -O2 -eventlog -rtsopts
+  ghc-options:        -Wall -O2 -rtsopts
   build-depends:
     , base
     , extra

diff --git a/lsp-test/src/Language/LSP/Test.hs b/lsp-test/src/Language/LSP/Test.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 {- |
 Module      : Language.LSP.Test

diff --git a/lsp-test/src/Language/LSP/Test/Decoding.hs b/lsp-test/src/Language/LSP/Test/Decoding.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 module Language.LSP.Test.Decoding where
 

diff --git a/lsp-test/src/Language/LSP/Test/Files.hs b/lsp-test/src/Language/LSP/Test/Files.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 module Language.LSP.Test.Files (
   swapFiles,

diff --git a/lsp-test/src/Language/LSP/Test/Parsing.hs b/lsp-test/src/Language/LSP/Test/Parsing.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 module Language.LSP.Test.Parsing (
   -- $receiving

diff --git a/lsp-test/src/Language/LSP/Test/Session.hs b/lsp-test/src/Language/LSP/Test/Session.hs
@@ -5,7 +5,7 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE OverloadedLabels #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 module Language.LSP.Test.Session
   ( Session(..)

diff --git a/lsp-test/test/DummyServer.hs b/lsp-test/test/DummyServer.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 module DummyServer where
 

diff --git a/lsp-test/test/Test.hs b/lsp-test/test/Test.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 import Control.Applicative.Combinators
 import Control.Concurrent

diff --git a/lsp-types/lsp-types.cabal b/lsp-types/lsp-types.cabal
@@ -31,7 +31,11 @@ flag force-ospath
   description:
     Force a version bound on filepath library, to enable 'OsPath'.
 
+common warnings
+  ghc-options: -Wunused-packages
+
 library
+  import:             warnings
   hs-source-dirs:     src generated
   default-language:   GHC2021
 
@@ -53,7 +57,6 @@ library
     GADTs
     NegativeLiterals
     OverloadedStrings
-    StandaloneKindSignatures
     StrictData
     TypeFamilies
     UndecidableInstances
@@ -563,6 +566,7 @@ library
     Language.LSP.Protocol.Internal.Types.WorkspaceOptions
 
 library metamodel
+  import:             warnings
   -- We don't currently re-export this from the main
   -- library, but it's here if people want it
   visibility:         public
@@ -584,6 +588,7 @@ library metamodel
     , text              >=1       && <2.2
 
 library lsp-types-quickcheck
+  import:             warnings
   visibility:         public
   hs-source-dirs:     quickcheck generated
   default-language:   GHC2021
@@ -630,6 +635,7 @@ executable generator
     , witherable
 
 test-suite lsp-types-test
+  import:             warnings
   type:               exitcode-stdio-1.0
   hs-source-dirs:     test
   default-language:   GHC2021

diff --git a/lsp-types/metamodel/Language/LSP/MetaModel.hs b/lsp-types/metamodel/Language/LSP/MetaModel.hs
@@ -5,7 +5,6 @@ module Language.LSP.MetaModel (module Export, metaModel) where
 import Language.LSP.MetaModel.Types as Export
 
 import Data.FileEmbed (makeRelativeToProject)
-import Language.Haskell.TH qualified as TH
 
 -- | The metamodel used to generate the LSP types in this package.
 metaModel :: MetaModel

diff --git a/lsp-types/quickcheck/Language/LSP/Protocol/QuickCheck/Common.hs b/lsp-types/quickcheck/Language/LSP/Protocol/QuickCheck/Common.hs
@@ -5,7 +5,6 @@ module Language.LSP.Protocol.QuickCheck.Common where
 import Data.Foldable
 import Data.Row qualified as R
 import Data.Row.Records qualified as R
-import Data.Void
 import GHC.TypeLits
 import Language.LSP.Protocol.Message
 import Language.LSP.Protocol.Types

diff --git a/lsp-types/src/Data/IxMap.hs b/lsp-types/src/Data/IxMap.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE ViewPatterns #-}
 
 module Data.IxMap where

diff --git a/lsp-types/src/Language/LSP/Protocol/Message/LspId.hs b/lsp-types/src/Language/LSP/Protocol/Message/LspId.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 module Language.LSP.Protocol.Message.LspId where
 

diff --git a/lsp-types/src/Language/LSP/Protocol/Message/Method.hs b/lsp-types/src/Language/LSP/Protocol/Message/Method.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE MagicHash #-}
 {-# LANGUAGE QuantifiedConstraints #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE UndecidableSuperClasses #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 

diff --git a/lsp-types/src/Language/LSP/Protocol/Message/Parsing.hs b/lsp-types/src/Language/LSP/Protocol/Message/Parsing.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 module Language.LSP.Protocol.Message.Parsing where
 

diff --git a/lsp-types/src/Language/LSP/Protocol/Message/Registration.hs b/lsp-types/src/Language/LSP/Protocol/Message/Registration.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 module Language.LSP.Protocol.Message.Registration where
 

diff --git a/lsp-types/src/Language/LSP/Protocol/Message/Types.hs b/lsp-types/src/Language/LSP/Protocol/Message/Types.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 module Language.LSP.Protocol.Message.Types where
 

diff --git a/lsp-types/test/JsonSpec.hs b/lsp-types/test/JsonSpec.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE UndecidableInstances #-}
 -- we're using some deprecated stuff from the LSP spec, that's fine
 {-# OPTIONS_GHC -fno-warn-deprecations #-}

diff --git a/lsp/example/Reactor.hs b/lsp/example/Reactor.hs
@@ -3,7 +3,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 
 {- |
 This is an example language server built with haskell-lsp using a 'Reactor'

diff --git a/lsp/lsp.cabal b/lsp/lsp.cabal
@@ -26,10 +26,14 @@ source-repository head
   type:     git
   location: https://github.com/haskell/lsp
 
+common warnings
+  ghc-options: -Wall -Wunused-packages -Wno-unticked-promoted-constructors
+
 library
+  import: warnings
   hs-source-dirs:     src
   default-language:   GHC2021
-  ghc-options:        -Wall -fprint-explicit-kinds
+  ghc-options:        -fprint-explicit-kinds
   reexported-modules:
     , Language.LSP.Protocol.Types
     , Language.LSP.Protocol.Lens
@@ -47,7 +51,6 @@ library
     Language.LSP.Server.Core
     Language.LSP.Server.Processing
 
-  ghc-options:        -Wall
   build-depends:
     , aeson                 >=2      && <2.3
     , async                 ^>=2.2
@@ -78,10 +81,10 @@ library
     , uuid                  >=1.3
 
 executable lsp-demo-reactor-server
+  import:             warnings
   main-is:            Reactor.hs
   hs-source-dirs:     example
   default-language:   GHC2021
-  ghc-options:        -Wall -Wno-unticked-promoted-constructors
   build-depends:
     , aeson
     , base
@@ -97,10 +100,10 @@ executable lsp-demo-reactor-server
     buildable: False
 
 executable lsp-demo-simple-server
+  import:             warnings
   main-is:            Simple.hs
   hs-source-dirs:     example
   default-language:   GHC2021
-  ghc-options:        -Wall -Wno-unticked-promoted-constructors
   build-depends:
     , base
     , lsp
@@ -115,6 +118,7 @@ flag demo
   default:     False
 
 test-suite lsp-test
+  import:             warnings
   type:               exitcode-stdio-1.0
   hs-source-dirs:     test
   main-is:            Main.hs
@@ -134,5 +138,5 @@ test-suite lsp-test
     , unordered-containers
 
   build-tool-depends: hspec-discover:hspec-discover
-  ghc-options:        -threaded -rtsopts -with-rtsopts=-N -Wall
+  ghc-options:        -threaded -rtsopts -with-rtsopts=-N
   default-language:   GHC2021
diff --git a/lsp/src/Language/LSP/Server/Core.hs b/lsp/src/Language/LSP/Server/Core.hs
@@ -5,7 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RoleAnnotations #-}
 {-# LANGUAGE TypeFamilyDependencies #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE CUSKs #-}
 {-# OPTIONS_GHC -Wno-unticked-promoted-constructors #-}

diff --git a/lsp/src/Language/LSP/Server/Processing.hs b/lsp/src/Language/LSP/Server/Processing.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE RecursiveDo #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 -- there's just so much!
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
 {-# OPTIONS_GHC -Wno-unticked-promoted-constructors #-}

diff --git a/lsp/src/Language/LSP/VFS.hs b/lsp/src/Language/LSP/VFS.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE OverloadedLabels #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE ViewPatterns #-}
 
 {- |