fix progress

haskell · Jan 17, 2021 · d623623 · d623623
1 parent 4c044b4
commit d623623
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/ghcide/src/Development/IDE/Core/Compile.hs b/ghcide/src/Development/IDE/Core/Compile.hs
@@ -573,12 +573,11 @@ indexHieFile se mod_summary srcPath hash hf = atomically $ do
       mdone <- atomically $ do
         -- Remove current element from pending
         modifyTVar' indexPending $ HashMap.update (\pendingHash -> guard (pendingHash /= hash) $> pendingHash) srcPath
+        modifyTVar' indexCompleted (+1)
         pending <- readTVar indexPending
-        if HashMap.null pending
-        then Just <$> swapTVar indexCompleted 0
-        else do
-          modifyTVar' indexCompleted (+1)
-          pure Nothing
+        -- If we are done, report and reset completed
+        whenMaybe (HashMap.null pending) $
+          swapTVar indexCompleted 0
       when (coerce $ ideTesting se) $
         eventer se $ LSP.NotCustomServer $
           LSP.NotificationMessage "2.0" (LSP.CustomServerMethod "ghcide/reference/ready") (toJSON $ fromNormalizedFilePath srcPath)