Switch to GHC2021 (#550)

* Switch to GHC2021 We don't support GHC < 9.2, so this is safe. * Format
haskell · Feb 4, 2024 · 52607f1 · 52607f1
1 parent 794d689
commit 52607f1
Show file tree

Hide file tree

Showing 41 changed files with 16 additions and 164 deletions.
diff --git a/lsp-test/func-test/FuncTest.hs b/lsp-test/func-test/FuncTest.hs
@@ -1,9 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE ViewPatterns #-}
 
 module Main where

diff --git a/lsp-test/lsp-test.cabal b/lsp-test/lsp-test.cabal
@@ -33,8 +33,7 @@ source-repository head
 
 library
   hs-source-dirs:     src
-  default-language:   Haskell2010
-  default-extensions: ImportQualifiedPost
+  default-language:   GHC2021
   exposed-modules:    Language.LSP.Test
   reexported-modules:
     lsp-types:Language.LSP.Protocol.Types
@@ -93,8 +92,7 @@ test-suite tests
   type:               exitcode-stdio-1.0
   hs-source-dirs:     test
   main-is:            Test.hs
-  default-language:   Haskell2010
-  default-extensions: ImportQualifiedPost
+  default-language:   GHC2021
   ghc-options:        -W
   other-modules:      DummyServer
   build-depends:
@@ -117,8 +115,7 @@ test-suite tests
 test-suite func-test
   type:               exitcode-stdio-1.0
   hs-source-dirs:     func-test
-  default-language:   Haskell2010
-  default-extensions: ImportQualifiedPost
+  default-language:   GHC2021
   main-is:            FuncTest.hs
   build-depends:
     , base
@@ -136,8 +133,7 @@ test-suite func-test
 test-suite example
   type:               exitcode-stdio-1.0
   hs-source-dirs:     example
-  default-language:   Haskell2010
-  default-extensions: ImportQualifiedPost
+  default-language:   GHC2021
   main-is:            Test.hs
   build-depends:
     , base
@@ -149,8 +145,7 @@ test-suite example
 benchmark simple-bench
   type:               exitcode-stdio-1.0
   hs-source-dirs:     bench
-  default-language:   Haskell2010
-  default-extensions: ImportQualifiedPost
+  default-language:   GHC2021
   main-is:            SimpleBench.hs
   ghc-options:        -Wall -O2 -eventlog -rtsopts
   build-depends:

diff --git a/lsp-test/src/Language/LSP/Test.hs b/lsp-test/src/Language/LSP/Test.hs
@@ -1,13 +1,8 @@
 {-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE ExistentialQuantification #-}
-{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeInType #-}
-{-# LANGUAGE TypeOperators #-}
 
 {- |
 Module      : Language.LSP.Test

diff --git a/lsp-test/src/Language/LSP/Test/Compat.hs b/lsp-test/src/Language/LSP/Test/Compat.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE OverloadedLabels #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeOperators #-}
 -- For some reason ghc warns about not using
 -- Control.Monad.IO.Class but it's needed for
 -- MonadIO

diff --git a/lsp-test/src/Language/LSP/Test/Files.hs b/lsp-test/src/Language/LSP/Test/Files.hs
@@ -1,9 +1,6 @@
-{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE TypeInType #-}
-{-# LANGUAGE TypeOperators #-}
 
 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,9 +1,6 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeInType #-}
 
 module Language.LSP.Test.Parsing (

diff --git a/lsp-test/src/Language/LSP/Test/Session.hs b/lsp-test/src/Language/LSP/Test/Session.hs
@@ -3,15 +3,8 @@
 {-# LANGUAGE CPP               #-}
 {-# LANGUAGE GADTs             #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedLabels #-}
-{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE TypeInType #-}
-{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE TypeApplications #-}
 
 module Language.LSP.Test.Session
   ( Session(..)

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

diff --git a/lsp-test/test/Test.hs b/lsp-test/test/Test.hs
@@ -1,8 +1,6 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeInType #-}
 
 import Control.Applicative.Combinators

diff --git a/lsp-types/generator/CodeGen.hs b/lsp-types/generator/CodeGen.hs
@@ -1,10 +1,8 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE ViewPatterns #-}
 
 {- | The main module for generating code from the metamodel

diff --git a/lsp-types/lsp-types.cabal b/lsp-types/lsp-types.cabal
@@ -33,7 +33,7 @@ flag force-ospath
 
 library
   hs-source-dirs:     src generated
-  default-language:   Haskell2010
+  default-language:   GHC2021
 
   -- Various things we want on by default
   -- * syntactic niceties, QOL
@@ -46,27 +46,16 @@ library
   default-extensions:
     DataKinds
     DeriveAnyClass
-    DeriveGeneric
     DerivingStrategies
     DerivingVia
     DuplicateRecordFields
-    FlexibleInstances
     FunctionalDependencies
     GADTs
-    GeneralizedNewtypeDeriving
-    ImportQualifiedPost
-    KindSignatures
-    MultiParamTypeClasses
     NegativeLiterals
     OverloadedStrings
-    PolyKinds
-    ScopedTypeVariables
-    StandaloneDeriving
     StandaloneKindSignatures
     StrictData
-    TypeApplications
     TypeFamilies
-    TypeOperators
     UndecidableInstances
 
   build-depends:
@@ -526,9 +515,8 @@ library metamodel
   -- library, but it's here if people want it
   visibility:         public
   hs-source-dirs:     metamodel
-  default-language:   Haskell2010
+  default-language:   GHC2021
   default-extensions:
-    ImportQualifiedPost
     StrictData
 
   exposed-modules:
@@ -546,14 +534,11 @@ library metamodel
 library lsp-types-quickcheck
   visibility:         public
   hs-source-dirs:     quickcheck generated
-  default-language:   Haskell2010
+  default-language:   GHC2021
   default-extensions:
-    ImportQualifiedPost
     StrictData
     DerivingVia
     DerivingStrategies
-    StandaloneDeriving
-    GeneralizedNewtypeDeriving
 
   exposed-modules:
     Language.LSP.Protocol.QuickCheck
@@ -576,9 +561,8 @@ library lsp-types-quickcheck
 
 executable generator
   hs-source-dirs:     generator
-  default-language:   Haskell2010
+  default-language:   GHC2021
   default-extensions:
-    ImportQualifiedPost
     StrictData
 
   main-is:            Main.hs
@@ -597,8 +581,7 @@ executable generator
 test-suite lsp-types-test
   type:               exitcode-stdio-1.0
   hs-source-dirs:     test
-  default-language:   Haskell2010
-  default-extensions: ImportQualifiedPost
+  default-language:   GHC2021
   main-is:            Main.hs
   other-modules:
     CapabilitiesSpec

diff --git a/lsp-types/metamodel/Language/LSP/MetaModel/Types.hs b/lsp-types/metamodel/Language/LSP/MetaModel/Types.hs
@@ -1,14 +1,10 @@
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveLift #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs #-}
-{-# LANGUAGE KindSignatures #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE TypeApplications #-}
 
 {- |
 This defines the types of the LSP "metamodel", which is a machine-readable format specifying the

diff --git a/lsp-types/quickcheck/Language/LSP/Protocol/QuickCheck/Common.hs b/lsp-types/quickcheck/Language/LSP/Protocol/QuickCheck/Common.hs
@@ -1,8 +1,3 @@
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE PolyKinds #-}
-{-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
 module Language.LSP.Protocol.QuickCheck.Common where

diff --git a/lsp-types/quickcheck/Language/LSP/Protocol/QuickCheck/Message.hs b/lsp-types/quickcheck/Language/LSP/Protocol/QuickCheck/Message.hs
@@ -1,9 +1,4 @@
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE PolyKinds #-}
-{-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 -- See Note [Arbitary Maybe Void]
 {-# OPTIONS_GHC -Wno-simplifiable-class-constraints #-}

diff --git a/lsp-types/src/Data/IxMap.hs b/lsp-types/src/Data/IxMap.hs
@@ -1,6 +1,3 @@
-{-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeInType #-}
 {-# LANGUAGE ViewPatterns #-}

diff --git a/lsp-types/src/Data/Row/Aeson.hs b/lsp-types/src/Data/Row/Aeson.hs
@@ -1,8 +1,3 @@
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 

diff --git a/lsp-types/src/Data/Row/Hashable.hs b/lsp-types/src/Data/Row/Hashable.hs
@@ -1,8 +1,3 @@
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 

diff --git a/lsp-types/src/Language/LSP/Protocol/Capabilities.hs b/lsp-types/src/Language/LSP/Protocol/Capabilities.hs
@@ -1,8 +1,6 @@
 {-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedLabels #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
 
 module Language.LSP.Protocol.Capabilities (
   fullCaps,

diff --git a/lsp-types/src/Language/LSP/Protocol/Message/Method.hs b/lsp-types/src/Language/LSP/Protocol/Message/Method.hs
@@ -1,12 +1,8 @@
-{-# LANGUAGE ConstraintKinds #-}
-{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MagicHash #-}
 {-# LANGUAGE QuantifiedConstraints #-}
-{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeInType #-}
-{-# LANGUAGE TypeOperators #-}
 {-# 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,7 +1,4 @@
-{-# LANGUAGE ConstraintKinds #-}
-{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE TypeInType #-}
 
 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,10 +1,5 @@
 {-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE ExistentialQuantification #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeInType #-}
 

diff --git a/lsp-types/src/Language/LSP/Protocol/Message/Types.hs b/lsp-types/src/Language/LSP/Protocol/Message/Types.hs
@@ -1,8 +1,4 @@
-{-# LANGUAGE ConstraintKinds #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeInType #-}
 
 module Language.LSP.Protocol.Message.Types where

diff --git a/lsp-types/src/Language/LSP/Protocol/Types/Common.hs b/lsp-types/src/Language/LSP/Protocol/Types/Common.hs
@@ -1,12 +1,8 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveTraversable #-}
 {-# LANGUAGE DerivingStrategies #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE TypeOperators #-}
 
 -- | Common types that aren't in the specification
 module Language.LSP.Protocol.Types.Common (

diff --git a/lsp-types/src/Language/LSP/Protocol/Types/Edit.hs b/lsp-types/src/Language/LSP/Protocol/Types/Edit.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeOperators #-}
 
 module Language.LSP.Protocol.Types.Edit where
 

diff --git a/lsp-types/src/Language/LSP/Protocol/Types/SemanticTokens.hs b/lsp-types/src/Language/LSP/Protocol/Types/SemanticTokens.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 
 module Language.LSP.Protocol.Types.SemanticTokens where
 

diff --git a/lsp-types/src/Language/LSP/Protocol/Types/Uri.hs b/lsp-types/src/Language/LSP/Protocol/Types/Uri.hs
@@ -1,10 +1,5 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE InstanceSigs #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE TypeSynonymInstances #-}
 
 module Language.LSP.Protocol.Types.Uri (
   Uri (..),

diff --git a/lsp-types/src/Language/LSP/Protocol/Types/Uri/OsPath.hs b/lsp-types/src/Language/LSP/Protocol/Types/Uri/OsPath.hs
@@ -1,7 +1,6 @@
 {- ORMOLU_DISABLE -}
 
 {-# LANGUAGE CPP                 #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 
 #if MIN_VERSION_filepath(1,4,100)
 #define OS_PATH 1

diff --git a/lsp-types/src/Language/LSP/Protocol/Utils/Misc.hs b/lsp-types/src/Language/LSP/Protocol/Utils/Misc.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Language.LSP.Protocol.Utils.Misc (