Remove Client Diags from fallback and change tests

Since Server Diags are authoritive, dont fallback to client diags. Cases where server resolved all diags but client still have stale diags may break from expected behaviour. Also change tests that deviate from expectations

Author: vidit-od

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

@@ -225,16 +225,14 @@ activeDiagnosticsInRange :: MonadIO m => Shake.ShakeExtras -> NormalizedFilePath
 activeDiagnosticsInRange ide nfp range = runMaybeT (activeDiagnosticsInRangeMT ide nfp range)
 
 -- Prefer server-side diagnostics if available; they are authoritative.
--- Fall back to client-supplied diagnostics when none are found.
 injectServerDiagnostics :: IdeState -> CodeActionParams -> IO CodeActionParams
-injectServerDiagnostics ide params@LSP.CodeActionParams{_textDocument=LSP.TextDocumentIdentifier{_uri}, _range, _context=context} = do
-  let clientDiags = context ^. LSP.diagnostics
+injectServerDiagnostics ide params@LSP.CodeActionParams{_textDocument=LSP.TextDocumentIdentifier{_uri}, _range} = do
   serverDiags <- case LSP.uriToNormalizedFilePath (LSP.toNormalizedUri _uri) of
-    Nothing  -> pure clientDiags
+    Nothing  -> pure []
     Just nfp -> do
       mDiags <- activeDiagnosticsInRange (shakeExtras ide) nfp _range
       case mDiags of
-        Nothing    -> pure clientDiags
+        Nothing    -> pure []
         Just diags -> pure $ diags ^.. traverse . fdLspDiagnosticL
   pure $ params & LSP.context . LSP.diagnostics .~ serverDiags
 

ghcide/src/Development/IDE/Plugin/HLS.hs

@@ -48,12 +48,12 @@ import           Language.LSP.Protocol.Message
 import           Language.LSP.Protocol.Types
 import qualified Language.LSP.Server              as LSP
 import           Language.LSP.VFS
-import           Prettyprinter.Render.String   (renderString)
-import           Text.Regex.TDFA.Text          ()
-import           UnliftIO                      (MonadUnliftIO, liftIO,
-                                                readTVarIO)
-import           UnliftIO.Async                (forConcurrently)
-import           UnliftIO.Exception            (catchAny)
+import           Prettyprinter.Render.String      (renderString)
+import           Text.Regex.TDFA.Text             ()
+import           UnliftIO                         (MonadUnliftIO, liftIO,
+                                                   readTVarIO)
+import           UnliftIO.Async                   (forConcurrently)
+import           UnliftIO.Exception               (catchAny)
 
 -- ---------------------------------------------------------------------
 --

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

@@ -218,8 +218,8 @@ suggestionsTests =
         doc <- openDoc "TwoHints.hs" "haskell"
         _ <- hlintCaptureKick
 
-        firstLine <- map fromAction <$> getCodeActions doc (mkRange 0 0 0 0)
-        secondLine <- map fromAction <$> getCodeActions doc (mkRange 1 0 1 0)
+        firstLine <- map fromAction <$> getCodeActions doc (mkRange 0 0 1 0)
+        secondLine <- map fromAction <$> getCodeActions doc (mkRange 1 0 2 0)
         thirdLine <- map fromAction <$> getCodeActions doc (mkRange 2 0 2 0)
         multiLine <- map fromAction <$> getCodeActions doc (mkRange 0 0 2 0)