Don't use CPP in refactor plugin tests

haskell · Jan 18, 2024 · 3c89823 · 3c89823
1 parent 78e2308
commit 3c89823
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal b/plugins/hls-refactor-plugin/hls-refactor-plugin.cabal
@@ -110,8 +110,6 @@ test-suite tests
     , hls-test-utils      == 2.6.0.0
     , lens
     , lsp-types
-    -- for MIN_VERSION_ghc
-    , ghc
     , text
     , hls-plugin-api
     , parser-combinators

diff --git a/plugins/hls-refactor-plugin/test/Main.hs b/plugins/hls-refactor-plugin/test/Main.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE AllowAmbiguousTypes   #-}
-{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE DataKinds             #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs                 #-}
@@ -701,11 +700,9 @@ typeWildCardActionTests = testGroup "type wildcard actions"
         [ "func :: _"
         , "func x y = x + y"
         ]
-#if MIN_VERSION_ghc(9,7,0)
-        [ "func :: a -> a -> a" -- 9.8 has a different suggestion
-#else
-        [ "func :: Integer -> Integer -> Integer"
-#endif
+        [ if ghcVersion >= GHC98
+          then "func :: a -> a -> a" -- 9.8 has a different suggestion
+          else "func :: Integer -> Integer -> Integer"
         , "func x y = x + y"
         ]
   , testUseTypeSignature "type in parentheses"
@@ -733,11 +730,9 @@ typeWildCardActionTests = testGroup "type wildcard actions"
         [ "func::_"
         , "func x y = x + y"
         ]
-#if MIN_VERSION_ghc(9,7,0)
-        [ "func::a -> a -> a" -- 9.8 has a different suggestion
-#else
-        [ "func::Integer -> Integer -> Integer"
-#endif
+        [ if ghcVersion >= GHC98
+          then "func::a -> a -> a" -- 9.8 has a different suggestion
+          else "func::Integer -> Integer -> Integer"
         , "func x y = x + y"
         ]
   , testGroup "add parens if hole is part of bigger type"