More maintainable version of stack test

Author: jhrcek

plugins/hls-alternate-number-format-plugin/src/Ide/Plugin/Conversion.hs

@@ -160,9 +160,9 @@ toBase conv header n
   | otherwise = header <> upper (conv n "")
 
 #if MIN_VERSION_base(4,17,0)
-toOctal, toDecimal, toBinary, toHex :: Integral a => a -> String
+toOctal, toBinary, toHex :: Integral a => a -> String
 #else
-toOctal, toDecimal, toBinary, toHex:: (Integral a, Show a) => a -> String
+toOctal, toBinary, toHex:: (Integral a, Show a) => a -> String
 #endif
 
 toBinary = toBase showBin_ "0b"
@@ -172,10 +172,11 @@ toBinary = toBase showBin_ "0b"
 
 toOctal = toBase showOct "0o"
 
-toDecimal = toBase showInt ""
-
 toHex = toBase showHex "0x"
 
+toDecimal :: Integral a => a -> String
+toDecimal = toBase showInt ""
+
 toFloatDecimal :: RealFloat a => a -> String
 toFloatDecimal val = showFFloat Nothing val ""
 

test/wrapper/Main.hs

@@ -9,26 +9,24 @@ main = defaultTestRunner $ testGroup "haskell-language-server-wrapper" [projectG
 
 projectGhcVersionTests :: TestTree
 projectGhcVersionTests = testGroup "--project-ghc-version"
-  [ let ghcVer = case ghcVersion of
-           GHC92 -> "9.2.8"
-           GHC94 -> "9.4.8"
-           GHC96 -> "9.6.4"
-           GHC98 -> "9.8.1"
-        writeStackYaml = writeFile "stack.yaml"
+  [ testCase "stack with global ghc" $ do
+      ghcVer <- ghcNumericVersion
+      let writeStackYaml = writeFile "stack.yaml" $
             -- Use system-ghc and install-ghc to avoid stack downloading ghc in CI
             -- (and use ghcup-managed ghc instead)
-            ("{resolver: ghc-"++ ghcVer ++", system-ghc: true, install-ghc: false}")
-    in testCase ("stack with ghc " ++ ghcVer) $
-          testDir writeStackYaml "test/wrapper/testdata/stack-specific-ghc" ghcVer
+            "{resolver: ghc-" ++ ghcVer ++ ", system-ghc: true, install-ghc: false}"
+      testDir writeStackYaml "test/wrapper/testdata/stack-specific-ghc" ghcVer
   , testCase "cabal with global ghc" $ do
-      ghcVer <- trimEnd <$> readProcess "ghc" ["--numeric-version"] ""
+      ghcVer <- ghcNumericVersion
       testDir (pure ()) "test/wrapper/testdata/cabal-cur-ver" ghcVer
   , testCase "stack with existing cabal build artifact" $ do
       -- Should report cabal as existing build artifacts are more important than
       -- the existence of 'stack.yaml'
       testProjectType "test/wrapper/testdata/stack-with-dist-newstyle"
         ("cradleOptsProg = CradleAction: Cabal" `isInfixOf`)
   ]
+  where
+    ghcNumericVersion = trimEnd <$> readProcess "ghc" ["--numeric-version"] ""
 
 testDir :: IO () -> FilePath -> String -> Assertion
 testDir extraSetup dir expectedVer =