Address reviwe comments

Author: jhrcek

haskell-language-server.cabal

@@ -340,6 +340,8 @@ test-suite hls-class-plugin-tests
   import:           defaults, pedantic, test-defaults, warnings
   if !flag(class)
     buildable: False
+  if impl(ghc >= 9.8)
+    ghc-options: -Wwarn=x-partial
   type:             exitcode-stdio-1.0
   hs-source-dirs:   plugins/hls-class-plugin/test
   main-is:          Main.hs
@@ -1183,6 +1185,8 @@ test-suite hls-change-type-signature-plugin-tests
   import:           defaults, pedantic, test-defaults, warnings
   if !flag(changeTypeSignature)
     buildable: False
+  if impl(ghc >= 9.8)
+    ghc-options: -Wwarn=x-partial
   type:             exitcode-stdio-1.0
   hs-source-dirs:   plugins/hls-change-type-signature-plugin/test
   main-is:          Main.hs

plugins/hls-change-type-signature-plugin/test/Main.hs

@@ -1,8 +1,3 @@
-{-# LANGUAGE CPP #-}
-#if __GLASGOW_HASKELL__ >= 908
-{-# OPTIONS_GHC -Wwarn=x-partial #-}
-#endif
-
 module Main where
 
 import           Control.Monad                  (void)

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

@@ -1,10 +1,6 @@
-{-# LANGUAGE CPP               #-}
 {-# LANGUAGE LambdaCase        #-}
 {-# LANGUAGE OverloadedLists   #-}
 {-# LANGUAGE OverloadedStrings #-}
-#if __GLASGOW_HASKELL__ >= 908
-{-# OPTIONS_GHC -Wwarn=x-partial #-}
-#endif
 
 module Main
   ( main

plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs

@@ -1085,12 +1085,14 @@ suggestImportDisambiguation df (Just txt) ps fileContents diag@Diagnostic {..}
                         _                 -> False
                     ]
                 ++ [HideOthers restImports | not (null restImports)]
-            ] ++ [ ( renderUniquify mode T.empty symbol True
-              , disambiguateSymbol ps fileContents diag symbol mode
-              ) | local
-                , (m,ms) <- take 1 targetsWithRestImports
-                , let mode = HideOthers (m:ms)
-            ]
+            ] ++ case targetsWithRestImports of
+                    (m,ms):_ | local ->
+                        let mode = HideOthers (m:ms)
+                        in [( renderUniquify mode T.empty symbol True
+                            , disambiguateSymbol ps fileContents diag symbol mode
+                            )]
+                    _ -> []
+
         renderUniquify HideOthers {} modName symbol local =
             "Use " <> (if local then "local definition" else modName) <> " for " <> symbol <> ", hiding other imports"
         renderUniquify (ToQualified _ qual) _ symbol _ =