From c6fc26d897b147d5ac48d0d799230c5a4ddb791d Mon Sep 17 00:00:00 2001
From: alexwl <alexey.a.kiryushin@gmail.com>
Date: Fri, 12 Oct 2018 19:45:12 +0300
Subject: Fix all GHC 8.4.3 compatibility issues.  Needs a bit more testing.

---
 test/Main.hs | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'test/Main.hs')

diff --git a/test/Main.hs b/test/Main.hs
index f2247fb..11b94fb 100644
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -140,17 +140,25 @@ moduleInfoSpec modInfo =
     it "returns valid map of identifiers " $
       let removeLocationInfo :: HCE.LocationInfo -> HCE.LocationInfo
           removeLocationInfo _ = HCE.UnknownLocation ""
-       in U.transformBi
-            removeLocationInfo
-            (HCE.idInfoMap (modInfo :: HCE.ModuleInfo)) `shouldBe`
-          U.transformBi removeLocationInfo testIdInfoMap
+          removePackageVersionFromExternalId :: HCE.ExternalId -> HCE.ExternalId
+          removePackageVersionFromExternalId extId@(HCE.ExternalId textId) = case T.splitOn "|" textId of
+            packageId:rest -> case T.splitOn "-" packageId of
+              packageIdParts@(_:_) -> HCE.ExternalId $ T.intercalate "|" ((T.intercalate "-" (init packageIdParts)) : rest)
+              _ -> extId
+            _ ->  extId
+          cleanup :: HCE.IdentifierInfoMap -> HCE.IdentifierInfoMap
+          cleanup = U.transformBi removeLocationInfo . U.transformBi removePackageVersionFromExternalId
+       in 
+        cleanup (HCE.idInfoMap (modInfo :: HCE.ModuleInfo)) `shouldBe` cleanup testIdInfoMap
 #endif          
     it "returns valid map of identifier occurrences" $
       HCE.idOccMap (modInfo :: HCE.ModuleInfo) `shouldBe` testIdOccMap
 
-stackYamlArg :: [String]   
-#if MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)
+stackYamlArg :: [String]
+#if MIN_VERSION_GLASGOW_HASKELL(8,4,3,0)
 stackYamlArg = []
+#elif MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)
+stackYamlArg = ["--stack-yaml=stack-8.2.2.yaml" ]
 #else
 stackYamlArg = ["--stack-yaml=stack-8.0.2.yaml" ]
 #endif
@@ -177,7 +185,7 @@ buildAndIndexTestPackage currentDir = do
                   _ <-
                     readProcess
                       stackExecutable
-                      (["build", "--test"] ++ stackYamlArg)
+                      (["build", "--test","--force-dirty"] ++ stackYamlArg)
                       ""
                   runLoggingT
                     (createPackageInfo
@@ -1209,3 +1217,5 @@ testIdInfoMap =
           , isExported = False
           })
     ]
+
+
-- 
cgit v1.2.3