rebase

Author: wz1000

haskell-language-server.cabal

@@ -197,102 +197,102 @@ flag cabalfmt
   manual:      True
 
 common cabalfmt
-  if flag(cabalfmt)
+  if flag(cabalfmt) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-cabal-fmt-plugin == 2.2.0.0
     cpp-options: -Dhls_cabalfmt
 
 common cabal
-  if flag(cabal)
+  if flag(cabal) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-cabal-plugin == 2.2.0.0
     cpp-options: -Dhls_cabal
 
 common class
-  if flag(class)
+  if flag(class) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-class-plugin == 2.2.0.0
     cpp-options: -Dhls_class
 
 common callHierarchy
-  if flag(callHierarchy)
+  if flag(callHierarchy) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-call-hierarchy-plugin == 2.2.0.0
     cpp-options: -Dhls_callHierarchy
 
 common eval
-  if flag(eval)
+  if flag(eval) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-eval-plugin == 2.2.0.0
     cpp-options: -Dhls_eval
 
 common importLens
-  if flag(importLens)
+  if flag(importLens) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-explicit-imports-plugin == 2.2.0.0
     cpp-options: -Dhls_importLens
 
 common rename
-  if flag(rename)
+  if flag(rename) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-rename-plugin == 2.2.0.0
     cpp-options: -Dhls_rename
 
 common retrie
-  if flag(retrie)
+  if flag(retrie) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-retrie-plugin == 2.2.0.0
     cpp-options: -Dhls_retrie
 
 common hlint
-  if flag(hlint)
+  if flag(hlint) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-hlint-plugin == 2.2.0.0
     cpp-options: -Dhls_hlint
 
 common moduleName
-  if flag(moduleName)
+  if flag(moduleName) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-module-name-plugin == 2.2.0.0
     cpp-options: -Dhls_moduleName
 
 common pragmas
-  if flag(pragmas)
+  if flag(pragmas) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-pragmas-plugin == 2.2.0.0
     cpp-options: -Dhls_pragmas
 
 common splice
-  if flag(splice)
+  if flag(splice) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-splice-plugin == 2.2.0.0
     cpp-options: -Dhls_splice
 
 common alternateNumberFormat
-  if flag(alternateNumberFormat)
+  if flag(alternateNumberFormat) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-alternate-number-format-plugin == 2.2.0.0
     cpp-options: -Dhls_alternateNumberFormat
 
 common qualifyImportedNames
-  if flag(qualifyImportedNames)
+  if flag(qualifyImportedNames) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-qualify-imported-names-plugin == 2.2.0.0
     cpp-options: -Dhls_qualifyImportedNames
 
 common codeRange
-  if flag(codeRange)
+  if flag(codeRange) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-code-range-plugin == 2.2.0.0
     cpp-options: -Dhls_codeRange
 
 common changeTypeSignature
-  if flag(changeTypeSignature)
+  if flag(changeTypeSignature) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-change-type-signature-plugin == 2.2.0.0
     cpp-options: -Dhls_changeTypeSignature
 
 common gadt
-  if flag(gadt)
+  if flag(gadt) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-gadt-plugin == 2.2.0.0
     cpp-options: -Dhls_gadt
 
 common explicitFixity
-  if flag(explicitFixity)
+  if flag(explicitFixity) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-explicit-fixity-plugin == 2.2.0.0
     cpp-options: -DexplicitFixity
 
 common explicitFields
-  if flag(explicitFields)
+  if flag(explicitFields) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-explicit-record-fields-plugin == 2.2.0.0
     cpp-options: -DexplicitFields
 
 common overloadedRecordDot
-  if flag(overloadedRecordDot) && (impl(ghc >= 9.2.0) || flag(ignore-plugins-ghc-bounds))
+  if flag(overloadedRecordDot) && (impl(ghc >= 9.2.0 && <= 9.8.0 ) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-overloaded-record-dot-plugin == 2.2.0.0
     cpp-options: -Dhls_overloaded_record_dot
 
@@ -304,7 +304,7 @@ common floskell
     cpp-options: -Dhls_floskell
 
 common fourmolu
-  if flag(fourmolu)
+  if flag(fourmolu) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-fourmolu-plugin == 2.2.0.0
     cpp-options: -Dhls_fourmolu
 
@@ -314,12 +314,12 @@ common ormolu
     cpp-options: -Dhls_ormolu
 
 common stylishHaskell
-  if flag(stylishHaskell)
+  if flag(stylishHaskell) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-stylish-haskell-plugin == 2.2.0.0
     cpp-options: -Dhls_stylishHaskell
 
 common refactor
-  if flag(refactor)
+  if flag(refactor) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-refactor-plugin == 2.2.0.0
     cpp-options: -Dhls_refactor
 

plugins/hls-alternate-number-format-plugin/hls-alternate-number-format-plugin.cabal

@@ -22,7 +22,10 @@ source-repository head
     location: https://github.com/haskell/haskell-language-server.git
 
 library
-  buildable: True
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:  Ide.Plugin.AlternateNumberFormat, Ide.Plugin.Conversion
   other-modules:    Ide.Plugin.Literals
   hs-source-dirs:   src
@@ -53,7 +56,10 @@ library
     RecordWildCards
 
 test-suite tests
-  buildable: True
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test

plugins/hls-cabal-fmt-plugin/hls-cabal-fmt-plugin.cabal

@@ -26,6 +26,10 @@ common warnings
   ghc-options: -Wall
 
 library
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   import:           warnings
   exposed-modules:  Ide.Plugin.CabalFmt
   hs-source-dirs:   src
@@ -45,6 +49,10 @@ library
   default-language: Haskell2010
 
 test-suite tests
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   import:             warnings
   type:               exitcode-stdio-1.0
   default-language:   Haskell2010

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

@@ -23,6 +23,10 @@ common warnings
   ghc-options: -Wall
 
 library
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   import:           warnings
   exposed-modules:
     Ide.Plugin.Cabal
@@ -67,6 +71,10 @@ library
   default-language: Haskell2010
 
 test-suite tests
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   import:           warnings
   default-language: Haskell2010
   type:             exitcode-stdio-1.0

plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal

@@ -20,6 +20,10 @@ source-repository head
     location: https://github.com/haskell/haskell-language-server.git
 
 library
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   buildable: True
   exposed-modules:    Ide.Plugin.CallHierarchy
   other-modules:
@@ -46,6 +50,10 @@ library
   default-extensions: DataKinds
 
 test-suite tests
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010

plugins/hls-change-type-signature-plugin/hls-change-type-signature-plugin.cabal

@@ -23,7 +23,10 @@ source-repository head
     location: https://github.com/haskell/haskell-language-server.git
 
 library
-  buildable: True
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:  Ide.Plugin.ChangeTypeSignature
   hs-source-dirs:   src
   build-depends:
@@ -51,7 +54,10 @@ library
 
 
 test-suite tests
-  buildable: True
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test

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

@@ -25,6 +25,10 @@ source-repository head
     location: https://github.com/haskell/haskell-language-server.git
 
 library
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.Class
   other-modules:      Ide.Plugin.Class.CodeAction
                     , Ide.Plugin.Class.CodeLens
@@ -63,6 +67,10 @@ library
   ghc-options:        -Wall -Wno-unticked-promoted-constructors -Wno-name-shadowing
 
 test-suite tests
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test

plugins/hls-code-range-plugin/hls-code-range-plugin.cabal

@@ -23,6 +23,10 @@ source-repository head
     location: https://github.com/haskell/haskell-language-server.git
 
 library
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:
     Ide.Plugin.CodeRange
     Ide.Plugin.CodeRange.Rules
@@ -49,6 +53,10 @@ library
     , vector
 
 test-suite tests
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test

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

@@ -37,6 +37,10 @@ source-repository head
   location: https://github.com/haskell/haskell-language-server
 
 library
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:
     Ide.Plugin.Eval
     Ide.Plugin.Eval.Types
@@ -98,6 +102,10 @@ library
     TypeOperators
 
 test-suite tests
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test

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

@@ -20,7 +20,10 @@ source-repository head
     location: https://github.com/haskell/haskell-language-server.git
 
 library
-  buildable: True
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.ExplicitFixity
 
   hs-source-dirs:     src
@@ -45,7 +48,10 @@ library
   default-extensions: DataKinds
 
 test-suite tests
-  buildable: True
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test

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

@@ -29,7 +29,10 @@ common warnings
 
 library
   import:           warnings
-  buildable: True
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   exposed-modules:    Ide.Plugin.ExplicitImports
   hs-source-dirs:     src
   build-depends:
@@ -58,7 +61,10 @@ library
 
 test-suite tests
   import:           warnings
-  buildable: True
+  if impl(ghc >= 9.8)
+    buildable: False
+  else
+    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test
@@ -73,4 +79,4 @@ test-suite tests
     , lens
     , lsp-types
     , row-types
-    , text
+    , text