hls-notes-plugin: Wait until HLS is done in tests

jvanbruegge · jvanbruegge · commit afad7175fa2a · 2024-02-28T11:42:31.000Z
diff --git a/plugins/hls-notes-plugin/test/NotesTest.hs b/plugins/hls-notes-plugin/test/NotesTest.hs
@@ -19,28 +19,33 @@ gotoNoteTests :: TestTree
 gotoNoteTests = testGroup "Goto Note Definition"
     [ testCase "single_file" $ runSessionWithServer def plugin testDataDir $ do
         doc <- openDoc "NoteDef.hs" "haskell"
-        _ <- waitForAllProgressDone
+        waitForCustomMessage "ghcide/cradle/loaded" (const $ Just ())
+        waitForAllProgressDone
         defs <- getDefinitions doc (Position 3 41)
         liftIO $ do
           fp <- canonicalizePath "NoteDef.hs"
           defs @?= InL (Definition (InR [Location (filePathToUri fp) (Range (Position 8 9) (Position 8 9))]))
     , testCase "liberal_format" $ runSessionWithServer def plugin testDataDir $ do
         doc <- openDoc "NoteDef.hs" "haskell"
-        _ <- waitForAllProgressDone
+        waitForCustomMessage "ghcide/cradle/loaded" (const $ Just ())
+        waitForAllProgressDone
         defs <- getDefinitions doc (Position 5 64)
         liftIO $ do
           fp <- canonicalizePath "NoteDef.hs"
           defs @?= InL (Definition (InR [Location (filePathToUri fp) (Range (Position 18 11) (Position 18 11))]))
 
     , testCase "invalid_note" $ runSessionWithServer def plugin testDataDir $ do
         doc <- openDoc "NoteDef.hs" "haskell"
-        _ <- waitForAllProgressDone
+        waitForCustomMessage "ghcide/cradle/loaded" (const $ Just ())
+        waitForAllProgressDone
         defs <- getDefinitions doc (Position 6 54)
         liftIO $ do
             defs @?= InL (Definition (InR []))
 
     , testCase "no_note" $ runSessionWithServer def plugin testDataDir $ do
         doc <- openDoc "NoteDef.hs" "haskell"
+        waitForCustomMessage "ghcide/cradle/loaded" (const $ Just ())
+        waitForAllProgressDone
         defs <- getDefinitions doc (Position 1 0)
         liftIO $ defs @?= InL (Definition (InR []))
 
