Make it possible to choose the code action in extendImportTests

Let the order of the expected code actions dictate which one to execute, i.e.,
the first one. This means we no longer test the *order* of the suggested code
actions. Through this simple change, we can now test the execution of a code
action that doesn't come first in the list of suggested code actions.

Author: mrBliss

ghcide/test/exe/Main.hs

@@ -1231,19 +1231,29 @@ extendImportTests = testGroup "extend import actions"
             ])
   ]
   where
-    template setUpModules moduleUnderTest range expectedActions expectedContentB = do
+    codeActionTitle CodeAction{_title=x} = x
+
+    template setUpModules moduleUnderTest range expectedTitles expectedContentB = do
       mapM_ (\x -> createDoc (fst x) "haskell" (snd x)) setUpModules
       docB <- createDoc (fst moduleUnderTest) "haskell" (snd moduleUnderTest)
       _  <- waitForDiagnostics
       void (skipManyTill anyMessage message :: Session WorkDoneProgressEndNotification)
-      codeActions <- filter (\(CACodeAction CodeAction{_title=x}) -> T.isPrefixOf "Add" x)
-          <$>  getCodeActions docB range
-      let expectedTitles = (\(CACodeAction CodeAction{_title=x}) ->x) <$> codeActions
-      liftIO $ expectedActions @=? expectedTitles
-
-      -- Get the first action and execute the first action
-      let CACodeAction action :  _
-                  = sortOn (\(CACodeAction CodeAction{_title=x}) -> x) codeActions
+      actionsOrCommands <- getCodeActions docB range
+      let codeActions =
+            filter
+              (T.isPrefixOf "Add" . codeActionTitle)
+              [ca | CACodeAction ca <- actionsOrCommands]
+          actualTitles = codeActionTitle <$> codeActions
+      -- Note that we are not testing the order of the actions, as the order of
+      -- the expected actions indicates which one we'll execute in this test,
+      -- i.e., the first one.
+      liftIO $ sort expectedTitles @=? sort actualTitles
+
+      -- Execute the action with the same title as the first expected one. Since
+      -- we tested that both lists have the same elements (possibly in a
+      -- different order), this search cannot fail.
+      let action = fromJust $
+            find ((head expectedTitles ==) . codeActionTitle) codeActions
       executeCodeAction action
       contentAfterAction <- documentContents docB
       liftIO $ expectedContentB @=? contentAfterAction