Fix cabal formatter test flags

Author: fendor

haskell-language-server.cabal

@@ -144,6 +144,7 @@ test-suite hls-cabal-fmt-plugin-tests
 
   if flag(isolateCabalfmtTests)
     build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.6
+    cpp-options: -Dhls_isolate_cabalfmt_tests
 
 -----------------------------
 -- cabal-gild plugin
@@ -194,6 +195,7 @@ test-suite hls-cabal-gild-plugin-tests
 
   if flag(isolateCabalGildTests)
     build-tool-depends: cabal-gild:cabal-gild ^>=1.1
+    cpp-options: -Dhls_isolate_cabalgild_tests
 
 -----------------------------
 -- cabal plugin

plugins/hls-cabal-fmt-plugin/test/Main.hs

@@ -12,7 +12,7 @@ import           Test.Hls
 data CabalFmtFound = Found | NotFound
 
 isTestIsolated :: Bool
-#if isolateTests
+#if hls_isolate_cabalfmt_tests
 isTestIsolated = True
 #else
 isTestIsolated = False
@@ -21,7 +21,7 @@ isTestIsolated = False
 isCabalFmtFound :: IO CabalFmtFound
 isCabalFmtFound = case isTestIsolated of
   True -> pure Found
-  False-> do
+  False -> do
     cabalFmt <- findExecutable "cabal-fmt"
     pure $ maybe NotFound (const Found) cabalFmt
 
@@ -51,7 +51,7 @@ cabalFmtGolden :: CabalFmtFound -> TestName -> FilePath -> FilePath -> (TextDocu
 cabalFmtGolden NotFound title _ _ _ =
   testCase title $
     assertFailure $  "Couldn't find cabal-fmt on PATH or this is not an isolated run. "
-                  <> "Use cabal flag 'isolateTests' to make it isolated or install cabal-fmt locally."
+                  <> "Use cabal flag 'isolateCabalFmtTests' to make it isolated or install cabal-fmt locally."
 cabalFmtGolden Found title path desc act = goldenWithCabalDocFormatter def cabalFmtPlugin "cabal-fmt" conf title testDataDir path desc "cabal" act
   where
     conf = def

plugins/hls-cabal-gild-plugin/test/Main.hs

@@ -12,7 +12,7 @@ import           Test.Hls
 data CabalGildFound = Found | NotFound
 
 isTestIsolated :: Bool
-#if isolateTests
+#if hls_isolate_cabalgild_tests
 isTestIsolated = True
 #else
 isTestIsolated = False
@@ -21,7 +21,7 @@ isTestIsolated = False
 isCabalFmtFound :: IO CabalGildFound
 isCabalFmtFound = case isTestIsolated of
   True -> pure Found
-  False-> do
+  False -> do
     cabalGild <- findExecutable "cabal-gild"
     pure $ maybe NotFound (const Found) cabalGild
 
@@ -49,7 +49,7 @@ cabalGildGolden :: CabalGildFound -> TestName -> FilePath -> FilePath -> (TextDo
 cabalGildGolden NotFound title _ _ _ =
   testCase title $
     assertFailure $  "Couldn't find cabal-gild on PATH or this is not an isolated run. "
-                  <> "Use cabal flag 'isolateTests' to make it isolated or install cabal-gild locally."
+                  <> "Use cabal flag 'isolateCabalGildTests' to make it isolated or install cabal-gild locally."
 cabalGildGolden Found title path desc act = goldenWithCabalDocFormatter def cabalGildPlugin "cabal-gild" conf title testDataDir path desc "cabal" act
   where
     conf = def