summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2019-04-26 19:55:27 +0100
committerMatthew Pickering <matthewtpickering@gmail.com>2019-05-30 10:55:18 +0100
commit4443b3a148c8ba24894f21bd7c91b0f4ee6bde18 (patch)
treeccb984ebb5690bcea55b428b1ac7faa5d77b6530
parent2d2aa2031b9abc3bff7b5585ab4201948c8bba7d (diff)
downloadhaskell-wip/fix-hie-map.tar.gz
Use types already in AST when making .hie filewip/fix-hie-map
These were meant to be added in !214 but for some reason wasn't included in the patch. Update Haddock submodule for new Types.hs hyperlinker output
-rw-r--r--compiler/hieFile/HieAst.hs4
m---------utils/haddock0
2 files changed, 3 insertions, 1 deletions
diff --git a/compiler/hieFile/HieAst.hs b/compiler/hieFile/HieAst.hs
index 84e5a627d8..4f1b2a3a6d 100644
--- a/compiler/hieFile/HieAst.hs
+++ b/compiler/hieFile/HieAst.hs
@@ -479,7 +479,9 @@ instance HasType (LHsExpr GhcTc) where
in
case tyOpt of
- _ | skipDesugaring e' -> fallback
+ Just t -> makeTypeNode e' spn t
+ Nothing
+ | skipDesugaring e' -> fallback
| otherwise -> do
hs_env <- Hsc $ \e w -> return (e,w)
(_,mbe) <- liftIO $ deSugarExpr hs_env e
diff --git a/utils/haddock b/utils/haddock
-Subproject 273d5aa8d4a3208879192aeca3b9f1a8245a3c3
+Subproject f01473ed28e7c2700ff8e87b00ab87a802c9edd