diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2019-04-26 19:55:27 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-05-31 01:58:08 -0400 |
| commit | 08b4c81363f405bf67ff85c5d132ff5919515095 (patch) | |
| tree | caf8832e787f4ef679c5ac299171731ab02dc57d | |
| parent | bb2ee86a4cf47eb56d4b8b4a552537449d492f88 (diff) | |
| download | haskell-08b4c81363f405bf67ff85c5d132ff5919515095.tar.gz | |
Use types already in AST when making .hie file
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.hs | 4 | ||||
| m--------- | utils/haddock | 0 |
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 |