Fix bad rebase

Author: mpickering

src/Haskell/Ide/Engine/Plugin/ApplyRefact.hs

@@ -109,7 +109,6 @@ lintCmd = CmdSync $ \uri -> do
 -- AZ:TODO: Why is this in IdeGhcM?
 lintCmd' :: Uri -> IdeGhcM (IdeResult PublishDiagnosticsParams)
 lintCmd' uri = pluginGetFile "lintCmd: " uri $ \fp -> do
-<<<<<<< HEAD
   eitherErrorResult <-
     liftIO (try $ runExceptT $ runLintCmd fp [] :: IO (Either IOException (Either [Diagnostic] [Idea])))
   --TODO: GM.withMappedFile fp $ \file' -> liftIO $ runExceptT $ runLintCmd file' []

src/Haskell/Ide/Engine/Plugin/Floskell.hs

@@ -8,6 +8,7 @@ where
 import           Control.Monad.IO.Class         (liftIO)
 import           Data.Aeson                     (Value (Null))
 import qualified Data.ByteString.Lazy           as BS
+import qualified Data.ByteString                as B
 import qualified Data.Text                      as T
 import qualified Data.Text.Encoding             as T
 import           Floskell
@@ -38,7 +39,7 @@ provider uri typ _opts =
         let (range, selectedContents) = case typ of
               FormatDocument -> (fullRange contents, contents)
               FormatRange r  -> (r, extractRange r contents)
-            result = reformat config (uriToFilePath uri) (BS.fromStrict (T.encodeUtf8 selectedContents))
+            result = reformat config (uriToFilePath uri) ((T.encodeUtf8 selectedContents))
         in  case result of
               Left  err -> return $ IdeResultFail (IdeError PluginError (T.pack err) Null)
               Right new -> return $ IdeResultOk [TextEdit range (T.decodeUtf8 (BS.toStrict new))]

src/Haskell/Ide/Engine/Plugin/GhcMod.hs

@@ -700,8 +700,3 @@ symbolProvider uri = pluginGetFile "ghc-mod symbolProvider: " uri $
     symInfs <- concat <$> mapM declsToSymbolInf (imps ++ decls)
     return $ IdeResultOk symInfs
     -}
-=======
->>>>>>> bd4e451a... Code moved to generic module
-=======
--}
->>>>>>> 8ff74795... Try to fix some tests