rebase fixes

Author: wz1000

plugins/hls-eval-plugin/src/Ide/Plugin/Eval/CodeLens.hs

@@ -25,25 +25,20 @@ module Ide.Plugin.Eval.CodeLens (
     evalCommand,
 ) where
 
+import Data.Aeson (toJSON)
 import Control.Applicative (Alternative ((<|>)))
 import Control.Arrow (second, (>>>))
 import qualified Control.Exception as E
 import Control.Monad
     ( void,
-      when, guard
+      when, guard,
       join
     )
 import Control.Monad.IO.Class (MonadIO (liftIO))
 import Control.Monad.Trans.Except
     ( ExceptT (..),
     )
-import Data.Aeson
-    ( FromJSON,
-      ToJSON,
-      toJSON,
-    )
 import Data.Char (isSpace)
-import Data.Either (isRight)
 import qualified Data.HashMap.Strict as HashMap
 import Data.List
     (dropWhileEnd,
@@ -104,13 +99,11 @@ import GHC
       load,
       runDecls,
       setContext,
-      setInteractiveDynFlags,
       setLogAction,
       setSessionDynFlags,
       setTargets,
       typeKind,
     )
-import GHC.Generics (Generic)
 import qualified GHC.LanguageExtensions.Type as LangExt
 import GhcPlugins
     ( DynFlags (..),
@@ -142,8 +135,7 @@ import Ide.Plugin.Eval.Code
       testRanges,
     )
 import Ide.Plugin.Eval.GHC
-    ( addExtension,
-      addImport,
+    ( addImport,
       addPackages,
       hasPackage,
       isExpr,

plugins/hls-eval-plugin/src/Ide/Plugin/Eval/Types.hs

@@ -38,7 +38,7 @@ import Data.String (IsString (..))
 import Development.IDE (Range)
 import GHC.Generics (Generic)
 import qualified Text.Megaparsec as P
-import Language.Haskell.LSP.Types (TextDocumentIdentifier)
+import Language.LSP.Types (TextDocumentIdentifier)
 
 -- | A thing with a location attached.
 data Located l a = Located {location :: l, located :: a}