File tree Expand file tree Collapse file tree
plugins/hls-rename-plugin/src/Ide/Plugin Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -16,15 +16,13 @@ import Control.Monad.Except (ExceptT, throwError)
1616import Control.Monad.IO.Class (MonadIO , liftIO )
1717import Control.Monad.Trans.Class (lift )
1818import Control.Monad.Trans.Except (mapExceptT )
19- import Control.Monad.Trans.Maybe (hoistMaybe ,
20- maybeToExceptT )
2119import Data.Either (rights )
2220import Data.Foldable (fold , minimumBy )
2321import Data.Generics
2422import Data.Hashable
2523import Data.HashSet (HashSet )
2624import qualified Data.HashSet as HS
27- import Data.List ( foldl' )
25+ import qualified Data.List as List
2826import Data.List.NonEmpty (NonEmpty ((:|) ),
2927 groupWith )
3028import qualified Data.List.NonEmpty as NE
@@ -122,7 +120,7 @@ prepareRenameProvider state _pluginId (PrepareRenameParams (TextDocumentIdentifi
122120renameModuleProvider :: Recorder (WithPriority Log )-> PluginMethodHandler IdeState Method_WorkspaceWillRenameFiles
123121renameModuleProvider recorder state _ (RenameFilesParams renames) = do
124122 renameResults <- mapM renameFile renames
125- pure $ InL $ foldl' combineTextEdits (WorkspaceEdit mempty mempty mempty ) $ catMaybes renameResults
123+ pure $ InL $ List. foldl' combineTextEdits (WorkspaceEdit mempty mempty mempty ) $ catMaybes renameResults
126124 where
127125 recorder' = cmapWithPrio LogModuleRename recorder
128126
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ instance Pretty Log where
5050 pretty log =
5151 " ModuleRename." <> case log of
5252 CorrectNames log -> " CorrectNames" <> colon <+> pretty log
53- LogRenameDependencies oldName fps -> " Rename of" <+> pretty oldName <+> " in" <+> (pretty $ map fromNormalizedFilePath fps)
53+ LogRenameDependencies oldName fps -> " Rename of" <+> pretty oldName <+> " in files: " <+> (pretty $ map fromNormalizedFilePath fps)
5454 NoModuleName nfp -> " Could not execute rename of" <+> pretty (fromNormalizedFilePath nfp) <+> " as no module path could be determined."
5555 LogRenameModuleDeclaration nfp -> " Renaming module declaration for file" <+> pretty (fromNormalizedFilePath nfp)
5656
You can’t perform that action at this time.
0 commit comments