relocate orphaned instances from rename plugin

Author: OliverMadine

ghcide/ghcide.cabal

@@ -66,6 +66,7 @@ library
         hiedb == 0.4.1.*,
         lsp-types ^>= 1.4.0.1,
         lsp ^>= 1.4.0.0 ,
+        mod,
         monoid-subclasses,
         mtl,
         network-uri,

ghcide/src/Development/IDE/GHC/Orphans.hs

@@ -33,18 +33,22 @@ import           Retrie.ExactPrint          (Annotated)
 
 import           Development.IDE.GHC.Compat
 import           Development.IDE.GHC.Util
+import           Development.IDE.Types.Location
 
 import           Control.DeepSeq
 import           Data.Aeson
 import           Data.Bifunctor             (Bifunctor (..))
 import           Data.Hashable
+import           Data.Mod.Word
 import           Data.String                (IsString (fromString))
 #if MIN_VERSION_ghc(9,0,0)
 import          GHC.ByteCode.Types
 #else
 import          ByteCodeTypes
 #endif
 
+import           Language.LSP.Types        (UInt)
+
 -- Orphan instances for types from the GHC API.
 instance Show CoreModule where show = prettyPrint
 instance NFData CoreModule where rnf = rwhnf
@@ -139,6 +143,11 @@ instance Show ModuleName where
 instance Hashable ModuleName where
     hashWithSalt salt = hashWithSalt salt . show
 
+instance Hashable Location
+instance Hashable Range
+instance Hashable Position
+instance Hashable UInt
+instance Hashable (Mod a) where hash n = hash (unMod n)
 
 instance NFData a => NFData (IdentifierDetails a) where
     rnf (IdentifierDetails a b) = rnf a `seq` rnf (length b)

plugins/hls-rename-plugin/hls-rename-plugin.cabal

@@ -31,7 +31,6 @@ library
     , hls-plugin-api        ^>=1.3
     , lsp
     , lsp-types
-    , mod
     , syb
     , text
     , transformers

plugins/hls-rename-plugin/src/Ide/Plugin/Rename.hs

@@ -26,7 +26,6 @@ import           Data.Hashable
 import           Data.List.Extra
 import qualified Data.Map                              as M
 import           Data.Maybe
-import           Data.Mod.Word
 import qualified Data.Text                             as T
 import           Development.IDE.Core.PositionMapping
 import           Development.IDE.Core.RuleTypes
@@ -48,12 +47,6 @@ import           Ide.Types
 import           Language.LSP.Server
 import           Language.LSP.Types
 
-instance Hashable Location
-instance Hashable Range
-instance Hashable Position
-instance Hashable UInt
-instance Hashable (Mod a) where hash n = hash (unMod n)
-
 descriptor :: PluginId -> PluginDescriptor IdeState
 descriptor pluginId = (defaultPluginDescriptor pluginId)
     { pluginHandlers = mkPluginHandler STextDocumentRename renameProvider