haskell/ghcide
1
1
Fork 0
mirror of https://github.com/haskell/ghcide.git synced 2024-12-17 23:22:04 +03:00
Code Issues Projects Releases Wiki Activity

Update to ghc-lib-0.20190509 (#1064)

Browse Source
This commit is contained in:
Shayne Fletcher 2019-05-09 20:50:55 -04:00 committed by mergify[bot]
parent bec100b635
commit 0ac72a4340
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Development/IDE/Functions/Compile.hs
View File

@ -448,6 +448,7 @@ parseFileContents preprocessor filename (time, contents) = do
Ex.throwE $ mkErrorDoc dflags locErr msgErr
#else
PFailed s ->
-- A fatal parse error was encountered.
Ex.throwE $ toDiagnostics dflags $ snd $ getMessages s dflags
#endif
POk pst rdr_module ->
@ -455,9 +456,22 @@ parseFileContents preprocessor filename (time, contents) = do
(Map.fromListWith (++) $ annotations pst,
Map.fromList ((noSrcSpan,comment_q pst)
:annotations_comments pst))
(warns,_) = getMessages pst dflags
(warns, errs) = getMessages pst dflags
in
do
-- Just because we got a `POk`, it doesn't mean there
-- weren't errors! To clarify, the GHC parser
-- distinguishes between fatal and non-fatal
-- errors. Non-fatal errors are the sort that don't
-- prevent parsing from continuing (that is, a parse
-- tree can still be produced despite the error so that
-- further errors/warnings can be collected). Fatal
-- errors are those from which a parse tree just can't
-- be produced.
unless (null errs) $
Ex.throwE $ toDiagnostics dflags $ snd $ getMessages pst dflags
-- Ok, we got here. It's safe to continue.
let (errs, parsed) = preprocessor rdr_module
unless (null errs) $ Ex.throwE $ mkErrors dflags errs
ms <- getModSummaryFromBuffer filename (contents, time) dflags parsed