refactor onlyWorkForGhcVersions

Author: pepeiborra

hls-test-utils/src/Test/Hls/Util.hs

@@ -153,9 +153,9 @@ ignoreForGhcVersions :: [GhcVersion] -> String -> TestTree -> TestTree
 ignoreForGhcVersions vers = ignoreInEnv (map GhcVer vers)
 
 -- | Mark as broken if GHC does not match only work versions.
-onlyWorkForGhcVersions :: [GhcVersion] -> String -> TestTree -> TestTree
-onlyWorkForGhcVersions vers reason =
-    if ghcVersion `elem` vers
+onlyWorkForGhcVersions :: (GhcVersion -> Bool) -> String -> TestTree -> TestTree
+onlyWorkForGhcVersions pred reason =
+    if pred ghcVersion
         then id
         else expectFailBecause reason
 

plugins/hls-gadt-plugin/test/Main.hs

@@ -35,13 +35,13 @@ tests = testGroup "GADT"
     , runTest "ConstuctorContext" "ConstructorContext" 2 0 2 38
     , runTest "Context" "Context" 2 0 4 41
     , runTest "Pragma" "Pragma" 2 0 3 29
-    , onlyWorkForGhcVersions [GHC92] "Single deriving has different output on ghc9.2" $
+    , onlyWorkForGhcVersions (==GHC92) "Single deriving has different output on ghc9.2" $
         runTest "SingleDerivingGHC92" "SingleDerivingGHC92" 2 0 3 14
-    , knownBrokenForGhcVersions [GHC92] "Single deriving has different output on ghc9.2" $
+    , knownBrokenForGhcVersions (==GHC92) "Single deriving has different output on ghc9.2" $
         runTest "SingleDeriving" "SingleDeriving" 2 0 3 14
-    , onlyWorkForGhcVersions [GHC92] "only ghc-9.2 enabled GADTs pragma implicitly" $
+    , onlyWorkForGhcVersions (==GHC92) "only ghc-9.2 enabled GADTs pragma implicitly" $
         gadtPragmaTest "ghc-9.2 don't need to insert GADTs pragma" False
-    , knownBrokenForGhcVersions [GHC92] "ghc-9.2 has enabled GADTs pragma implicitly" $
+    , knownBrokenForGhcVersions (==GHC92) "ghc-9.2 has enabled GADTs pragma implicitly" $
         gadtPragmaTest "insert pragma" True
     ]
 

plugins/hls-pragmas-plugin/test/Main.hs

@@ -116,7 +116,7 @@ completionTests =
   , completionTest "completes language extensions case insensitive" "Completion.hs" "lAnGuaGe Overloaded" "OverloadedStrings" Nothing Nothing Nothing [0, 4, 0, 34, 0, 24]
   , completionTest "completes the Strict language extension" "Completion.hs" "Str" "Strict" Nothing Nothing Nothing [0, 13, 0, 31, 0, 16]
   , completionTest "completes No- language extensions" "Completion.hs" "NoOverload" "NoOverloadedStrings" Nothing Nothing Nothing [0, 13, 0, 31, 0, 23]
-  , onlyWorkForGhcVersions [GHC92] "GHC2021 flag introduced since ghc9.2" $
+  , onlyWorkForGhcVersions (==GHC92) "GHC2021 flag introduced since ghc9.2" $
     completionTest "completes GHC2021 extensions" "Completion.hs" "ghc" "GHC2021" Nothing Nothing Nothing [0, 13, 0, 31, 0, 16]
   ]