Fix small issues

Author: Jaro Reinders

hls-test-utils/src/Development/IDE/Test.hs

@@ -14,6 +14,8 @@ module Development.IDE.Test
   , diagnostic
   , expectDiagnostics
   , expectDiagnosticsWithTags
+  , ExpectedDiagnostic
+  , ExpectedDiagnosticWithTag
   , expectNoMoreDiagnostics
   , expectMessages
   , expectCurrentDiagnostics

plugins/hls-refactor-plugin/test/Main.hs

@@ -1995,7 +1995,7 @@ suggestImportDisambiguationTests = testGroup "suggest import disambiguation acti
     compareHideFunctionTo = compareTwo "HideFunction.hs"
     withTarget file locs k = runWithExtraFiles "hiding" $ \dir -> do
         doc <- openDoc file "haskell"
-        void $ expectDiagnostics [(file, [(DiagnosticSeverity_Error, loc, "Ambiguous occurrence", Just "GHC-87543") | loc <- locs])]
+        void $ expectDiagnostics [(file, [(DiagnosticSeverity_Error, loc, "Ambiguous occurrence", Nothing) | loc <- locs])] -- Since GHC 9.8: GHC-87110
         actions <- getAllCodeActions doc
         k dir doc actions
     withHideFunction = withTarget ("HideFunction" <.> "hs")

test/functional/Config.hs

@@ -14,7 +14,8 @@ import           Development.IDE      (RuleResult, action, define,
                                        getFilesOfInterestUntracked,
                                        getPluginConfigAction, ideErrorText,
                                        uses_)
-import           Development.IDE.Test (Cursor, expectDiagnostics)
+import           Development.IDE.Test (Cursor, ExpectedDiagnostic,
+                                       expectDiagnostics)
 import           GHC.Generics
 import           Ide.Plugin.Config
 import           Ide.Types