writeProgressQue with pending removal in one transaction to prevent out of order in report progress

Author: soulomoon

ghcide/exe/Main.hs

@@ -118,7 +118,7 @@ main = withTelemetryRecorder $ \telemetryRecorder -> do
           then IDEMain.testing (cmapWithPrio LogIDEMain recorder) hlsPlugins
           else IDEMain.defaultArguments (cmapWithPrio LogIDEMain recorder) hlsPlugins
 
-    IDEMain.defaultMain (cmapWithPrio LogIDEMain recorder) arguments
+    g (cmapWithPrio LogIDEMain recorder) arguments
         { IDEMain.argsProjectRoot = Just argsCwd
         , IDEMain.argCommand = argsCommand
         , IDEMain.argsHlsPlugins = IDEMain.argsHlsPlugins arguments <> pluginDescToIdePlugins [lspRecorderPlugin]

ghcide/src/Development/IDE/Core/Compile.hs

@@ -990,16 +990,13 @@ indexHieFile se mod_summary srcPath !hash hf = do
                   }
     -- Report the progress once we are done indexing this file
     post = do
-      mdone <- atomically $ do
+      atomically $ do
         -- Remove current element from pending
         pending <- stateTVar indexPending $
           dupe . HashMap.update (\pendingHash -> guard (pendingHash /= hash) $> pendingHash) srcPath
         modifyTVar' indexCompleted (+1)
         -- If we are done, report and reset completed
-        whenMaybe (HashMap.null pending) $
-          swapTVar indexCompleted 0
-
-      atomically $ do
+        mdone <- whenMaybe (HashMap.null pending) $ swapTVar indexCompleted 0
         writeTQueue indexProgressThread $ do
             whenJust (lspEnv se) $ \env -> LSP.runLspT env $
                 when (coerce $ ideTesting se) $