Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove the Indexing progress message when exeption in withHieDb #3610

Merged
merged 3 commits into from
Jun 2, 2023
Merged

fix: remove the Indexing progress message when exeption in withHieDb #3610

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
beffb29
fix: remove the `Indexing` progress message when exeption in withHieDb
guibou May 27, 2023
05b1f39
Merge branch 'master' into fix_indexing_message_progress
michaelpj May 29, 2023
19363a0
Merge branch 'master' into fix_indexing_message_progress
michaelpj Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ghcide/src/Development/IDE/Core/Compile.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,9 +901,10 @@ indexHieFile se mod_summary srcPath !hash hf = do
-- If the hash in the pending list doesn't match the current hash, then skip
Just pendingHash -> pendingHash /= hash
unless newerScheduled $ do
pre optProgressStyle
withHieDb (\db -> HieDb.addRefsFromLoaded db targetPath (HieDb.RealFile $ fromNormalizedFilePath srcPath) hash hf')
post
-- Using bracket, so even if an exception happen during withHieDb call,
-- the `post` (which clean the progress indicator) will still be called.
bracket_ (pre optProgressStyle) post $
withHieDb (\db -> HieDb.addRefsFromLoaded db targetPath (HieDb.RealFile $ fromNormalizedFilePath srcPath) hash hf')
guibou marked this conversation as resolved.
Show resolved Hide resolved
where
mod_location = ms_location mod_summary
targetPath = Compat.ml_hie_file mod_location
Expand Down