Bump ghcide (#3800)

This commit is contained in:
Moritz Kiefer 2019-12-10 14:05:20 +01:00 committed by mergify[bot]
parent a309b4a50b
commit 6716947931
3 changed files with 7 additions and 4 deletions

View File

@ -17,8 +17,8 @@ load("@os_info//:os_info.bzl", "is_windows")
load("@dadew//:dadew.bzl", "dadew_tool_home")
load("@rules_haskell//haskell:cabal.bzl", "stack_snapshot")
GHCIDE_REV = "78aa9745798cfd730861e8c037cc481aa6b0dd43"
GHCIDE_SHA256 = "9156ee7a6e75cfb5e2d38262a077513f20a31c4c3bc5d4ff79fa08ef600fc99c"
GHCIDE_REV = "481ca019a36f3252bd5a786b49bbcb3798045679"
GHCIDE_SHA256 = "81a0a8106255f92c25b501e7a8233cf6927fc7dd2431156cd53dfea96309b9d4"
GHCIDE_VERSION = "0.0.4"
def daml_haskell_deps():

View File

@ -210,7 +210,8 @@ generateRawDalfRule =
fmap (first (coreDiags ++)) $
case mbCore of
Nothing -> return ([], Nothing)
Just core -> do
Just (safeMode, cgGuts, details) -> do
let core = cgGutsToCoreModule safeMode cgGuts details
setPriority priorityGenerateDalf
-- Generate the map from package names to package hashes
pkgMap <- useNoFile_ GeneratePackageMap

View File

@ -350,7 +350,9 @@ dlint :: (String -> IO ()) -> NormalizedFilePath -> Action ()
dlint log file = timed log "DLint" $ unjust $ getDlintIdeas file
ghcCompile :: (String -> IO ()) -> NormalizedFilePath -> Action GHC.CoreModule
ghcCompile log file = timed log "GHC compile" $ unjust $ fmap snd $ generateCore file
ghcCompile log file = timed log "GHC compile" $ do
(_, Just (safeMode, guts, details)) <- generateCore file
pure $ cgGutsToCoreModule safeMode guts details
lfConvert :: (String -> IO ()) -> NormalizedFilePath -> Action LF.Package
lfConvert log file = timed log "LF convert" $ unjust $ getRawDalf file