Fix compatibility

haskell · Jun 20, 2022 · a8cb453 · a8cb453
1 parent 375db1c
commit a8cb453
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/ghcide/src/Development/IDE/GHC/Compat/Core.hs b/ghcide/src/Development/IDE/GHC/Compat/Core.hs
@@ -841,8 +841,6 @@ pattern L l a <- GHC.L (getLoc -> l) a
 type HasSrcSpan = SrcLoc.HasSrcSpan
 getLoc :: SrcLoc.HasSrcSpan a => a -> SrcLoc.SrcSpan
 getLoc = SrcLoc.getLoc
-instance HasSrcSpan SrcLoc.SrcSpan where
-    Development.IDE.GHC.Compat.Core.getLoc = id
 
 #else
 
@@ -852,8 +850,6 @@ instance HasSrcSpan Name where
     getLoc = nameSrcSpan
 instance HasSrcSpan (SrcLoc.GenLocated SrcSpan a) where
     getLoc = SrcLoc.getLoc
-instance HasSrcSpan SrcSpan where
-    getLoc = id
 
 #endif
 

diff --git a/plugins/hls-class-plugin/src/Ide/Plugin/Class/CodeAction.hs b/plugins/hls-class-plugin/src/Ide/Plugin/Class/CodeAction.hs
@@ -5,6 +5,7 @@
 
 module Ide.Plugin.Class.CodeAction where
 
+import           Control.Applicative                  (liftA2)
 import           Control.Lens                         hiding (List, use)
 import           Control.Monad.Extra
 import           Control.Monad.IO.Class               (liftIO)