aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authoralexwl <alexey.a.kiryushin@gmail.com>2018-10-14 18:56:06 +0300
committeralexwl <alexey.a.kiryushin@gmail.com>2018-10-14 18:56:06 +0300
commit9c5cb27828bcc3cbe505fba8ef8e6db0e87d2a9c (patch)
treed558ebcf13b4f5d42d27efea30e5f5697a0f456f /app
parent1b8661d36ce9dcbcd5a833a79357445fe734426d (diff)
parent2b5cbccffa21d9f80f804bd9d95d4527ce3246b7 (diff)
Merge branch 'ghc-8.4.3'
Diffstat (limited to 'app')
-rw-r--r--app/Indexer.hs5
-rw-r--r--app/Server.hs6
2 files changed, 8 insertions, 3 deletions
diff --git a/app/Indexer.hs b/app/Indexer.hs
index 083c94d..3a23df5 100644
--- a/app/Indexer.hs
+++ b/app/Indexer.hs
@@ -73,7 +73,10 @@ data Compression
| NoCompression
deriving (Show, Eq)
-#if MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)
+#if MIN_VERSION_GLASGOW_HASKELL(8,4,3,0)
+ghcVersion :: Version
+ghcVersion = Version {versionBranch = [8, 4, 3, 0], versionTags = []}
+#elif MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)
ghcVersion :: Version
ghcVersion = Version {versionBranch = [8, 2, 2, 0], versionTags = []}
#else
diff --git a/app/Server.hs b/app/Server.hs
index 39f550f..fd70454 100644
--- a/app/Server.hs
+++ b/app/Server.hs
@@ -343,9 +343,11 @@ loadPackageInfo config path =
HCE.source :: HCE.CompactModuleInfo -> V.Vector T.Text
in if not enableExpressionInfo
then modInfo
- { HCE.exprInfoMap = IVM.empty
+ { HCE.exprInfoMap = IVM.empty
+ , HCE.source = V.force $ source modInfo
+ -- 'force' fixes this error: Data.Vector.Mutable: uninitialised element CallStack (from HasCallStack): error, called at ./Data/Vector/Mutable.hs:188:17 in vector-0.12.0.1-GGZqQZyzchy8YFPCF67wxL:Data.Vector.Mutable
}
- else modInfo)
+ else modInfo {HCE.source = V.force $ source modInfo})
, path)
Left e -> return . Left $ (e, path)