Follow changes in rewriteToEdit

Author: pepeiborra

ghcide/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs

@@ -6,6 +6,7 @@
 module Development.IDE.Plugin.CodeAction.ExactPrint
   ( Rewrite (..),
     rewriteToEdit,
+    rewriteToWEdit,
     transferAnn,
 
     -- * Utilities
@@ -41,6 +42,7 @@ import Development.IDE.Spans.Common
 import Development.IDE.GHC.Error
 import Safe (lastMay)
 import Data.Generics (listify)
+import GHC.Exts (IsList (fromList))
 
 ------------------------------------------------------------------------------
 
@@ -57,7 +59,7 @@ data Rewrite where
 
 ------------------------------------------------------------------------------
 
--- | Convert a 'Rewrite' into a 'WorkspaceEdit'.
+-- | Convert a 'Rewrite' into a list of '[TextEdit]'.
 rewriteToEdit ::
   DynFlags ->
   Anns ->
@@ -72,6 +74,16 @@ rewriteToEdit dflags anns (Rewrite dst f) = do
                 ]
   pure editMap
 
+-- | Convert a 'Rewrite' into a 'WorkspaceEdit'
+rewriteToWEdit :: DynFlags -> Uri -> Anns -> Rewrite -> Either String WorkspaceEdit
+rewriteToWEdit dflags uri anns r = do
+    edits <- rewriteToEdit dflags anns r
+    return $
+        WorkspaceEdit
+            { _changes = Just (fromList [(uri, List edits)])
+            , _documentChanges = Nothing
+            }
+
 ------------------------------------------------------------------------------
 
 -- | Fix the parentheses around a type context

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

@@ -178,7 +178,7 @@ extendImportHandler' ideState ExtendImport {..}
       imp <- liftMaybe $ find (isWantedModule wantedModule) imps
       wedit <-
         liftEither $
-          rewriteToEdit df doc (annsA ps) $
+          rewriteToWEdit df doc (annsA ps) $
             extendImport (T.unpack <$> thingParent) (T.unpack newThing) imp
       return (WorkspaceApplyEdit, ApplyWorkspaceEditParams wedit)
   | otherwise =