@@ -76,7 +76,6 @@ import Data.Aeson (Result (Success),
7676import qualified Data.Aeson.Types as A
7777import qualified Data.Binary as B
7878import qualified Data.ByteString as BS
79- import Data.ByteString.Encoding as T
8079import qualified Data.ByteString.Lazy as LBS
8180import Data.Coerce
8281import Data.Foldable
@@ -92,6 +91,7 @@ import Data.Maybe
9291import qualified Data.Rope.UTF16 as Rope
9392import qualified Data.Set as Set
9493import qualified Data.Text as T
94+ import qualified Data.Text.IO as T
9595import qualified Data.Text.Encoding as T
9696import Data.Time (UTCTime (.. ))
9797import Data.Tuple.Extra
@@ -130,7 +130,6 @@ import Development.IDE.Types.Location
130130import qualified Development.IDE.Types.Logger as L
131131import Development.IDE.Types.Options
132132import GHC.Generics (Generic )
133- import GHC.IO.Encoding
134133import qualified GHC.LanguageExtensions as LangExt
135134import qualified HieDb
136135import Ide.Plugin.Config
@@ -526,14 +525,13 @@ persistentHieFileRule :: Rules ()
526525persistentHieFileRule = addPersistentRule GetHieAst $ \ file -> runMaybeT $ do
527526 res <- readHieFileForSrcFromDisk file
528527 vfs <- asks vfs
529- encoding <- liftIO getLocaleEncoding
530528 (currentSource,ver) <- liftIO $ do
531529 mvf <- getVirtualFile vfs $ filePathToUri' file
532530 case mvf of
533- Nothing -> (,Nothing ) . T. decode encoding <$> BS .readFile (fromNormalizedFilePath file)
531+ Nothing -> (,Nothing ) <$> T .readFile (fromNormalizedFilePath file)
534532 Just vf -> pure (Rope. toText $ _text vf, Just $ _lsp_version vf)
535533 let refmap = Compat. generateReferencesMap . Compat. getAsts . Compat. hie_asts $ res
536- del = deltaFromDiff (T. decode encoding $ Compat. hie_hs_src res) currentSource
534+ del = deltaFromDiff (T. decodeUtf8 $ Compat. hie_hs_src res) currentSource
537535 pure (HAR (Compat. hie_module res) (Compat. hie_asts res) refmap mempty (HieFromDisk res),del,ver)
538536
539537getHieAstRuleDefinition :: NormalizedFilePath -> HscEnv -> TcModuleResult -> Action (IdeResult HieAstResult )
0 commit comments