Fix most add argument tests except for one

Author: jhrcek

plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs

@@ -462,7 +462,7 @@ modifySmallestDeclWithM validSpan f a = do
       modifyMatchingDecl (ldecl@(L src _) : rest) =
         TransformT (lift $ validSpan $ locA src) >>= \case
             True -> do
-              (decs', r) <- f (makeDeltaAst ldecl)
+              (decs', r) <- f ldecl
               pure (DL.fromList decs' <> DL.fromList rest, Just r)
             False -> first (DL.singleton ldecl <>) <$> modifyMatchingDecl rest
   modifyDeclsT' (fmap (first DL.toList) . modifyMatchingDecl) a
@@ -607,7 +607,7 @@ modifyMgMatchesT' ::
 modifyMgMatchesT' (MG xMg (L locMatches matches)) f def combineResults = do
   (unzip -> (matches', rs)) <- mapM f matches
   r' <- TransformT $ lift $ foldM combineResults def rs
-  pure $ (MG xMg (L locMatches matches'), r')
+  pure (MG xMg (L locMatches matches'), r')
 #else
 modifyMgMatchesT' (MG xMg (L locMatches matches) originMg) f def combineResults = do
   (unzip -> (matches', rs)) <- mapM f matches

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

@@ -45,11 +45,13 @@ import           GHC.Types.SrcLoc                          (generatedSrcSpan)
 #endif
 
 #if MIN_VERSION_ghc(9,9,0)
-import           GHC                                       (EpUniToken (..),
+import           GHC                                       (DeltaPos (..),
+                                                            EpUniToken (..),
                                                             IsUnicodeSyntax (NormalSyntax))
-import           Language.Haskell.GHC.ExactPrint           (d1)
+import           Language.Haskell.GHC.ExactPrint           (d1, setEntryDP)
 #endif
 
+
 -- When GHC tells us that a variable is not bound, it will tell us either:
 --  - there is an unbound variable with a given type
 --  - there is an unbound variable (GHC provides no type suggestion)
@@ -74,15 +76,20 @@ plugin parsedModule Diagnostic {_message, _range}
 -- returning how many patterns there were in this match prior to the transformation:
 --      addArgToMatch "foo" `bar arg1 arg2 = ...`
 --   => (`bar arg1 arg2 foo = ...`, 2)
-addArgToMatch :: T.Text -> GenLocated l (Match GhcPs body) -> (GenLocated l (Match GhcPs body), Int)
+addArgToMatch :: T.Text -> GenLocated l (Match GhcPs (LocatedA (HsExpr GhcPs))) -> (GenLocated l (Match GhcPs (LocatedA (HsExpr GhcPs))), Int)
 addArgToMatch name (L locMatch (Match xMatch ctxMatch pats rhs)) =
   let unqualName = mkRdrUnqual $ mkVarOcc $ T.unpack name
 #if MIN_VERSION_ghc(9,9,0)
-      newPat = L noAnnSrcSpanDP1 $ VarPat NoExtField (noLocA unqualName)
+      newPat = L noAnnSrcSpanDP1 $ VarPat NoExtField $ L noAnn unqualName
+      -- The intention is to move `= ...` (right-hand side with equals) to the right so there's 1 space between
+      -- the newly added pattern and the rest
+      indentRhs :: GRHSs GhcPs (LocatedA (HsExpr GhcPs)) -> GRHSs GhcPs (LocatedA (HsExpr GhcPs))
+      indentRhs rhs@GRHSs{grhssGRHSs} = rhs {grhssGRHSs = fmap (`setEntryDP` (SameLine 1)) grhssGRHSs }
 #else
       newPat = L (noAnnSrcSpanDP1 generatedSrcSpan) $ VarPat NoExtField (noLocA unqualName)
+      indentRhs = id
 #endif
-  in (L locMatch (Match xMatch ctxMatch (pats <> [newPat]) rhs), Prelude.length pats)
+  in (L locMatch (Match xMatch ctxMatch (pats <> [newPat]) (indentRhs rhs)), Prelude.length pats)
 
 -- Attempt to insert a binding pattern into each match for the given LHsDecl; succeeds only if the function is a FunBind.
 -- Also return: