@@ -76,7 +76,6 @@ import Data.Aeson (Result (Success),
76
76
import qualified Data.Aeson.Types as A
77
77
import qualified Data.Binary as B
78
78
import qualified Data.ByteString as BS
79
- import Data.ByteString.Encoding as T
80
79
import qualified Data.ByteString.Lazy as LBS
81
80
import Data.Coerce
82
81
import Data.Foldable
@@ -92,6 +91,7 @@ import Data.Maybe
92
91
import qualified Data.Rope.UTF16 as Rope
93
92
import qualified Data.Set as Set
94
93
import qualified Data.Text as T
94
+ import qualified Data.Text.IO as T
95
95
import qualified Data.Text.Encoding as T
96
96
import Data.Time (UTCTime (.. ))
97
97
import Data.Tuple.Extra
@@ -130,7 +130,6 @@ import Development.IDE.Types.Location
130
130
import qualified Development.IDE.Types.Logger as L
131
131
import Development.IDE.Types.Options
132
132
import GHC.Generics (Generic )
133
- import GHC.IO.Encoding
134
133
import qualified GHC.LanguageExtensions as LangExt
135
134
import qualified HieDb
136
135
import Ide.Plugin.Config
@@ -526,14 +525,13 @@ persistentHieFileRule :: Rules ()
526
525
persistentHieFileRule = addPersistentRule GetHieAst $ \ file -> runMaybeT $ do
527
526
res <- readHieFileForSrcFromDisk file
528
527
vfs <- asks vfs
529
- encoding <- liftIO getLocaleEncoding
530
528
(currentSource,ver) <- liftIO $ do
531
529
mvf <- getVirtualFile vfs $ filePathToUri' file
532
530
case mvf of
533
- Nothing -> (,Nothing ) . T. decode encoding <$> BS .readFile (fromNormalizedFilePath file)
531
+ Nothing -> (,Nothing ) <$> T .readFile (fromNormalizedFilePath file)
534
532
Just vf -> pure (Rope. toText $ _text vf, Just $ _lsp_version vf)
535
533
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
537
535
pure (HAR (Compat. hie_module res) (Compat. hie_asts res) refmap mempty (HieFromDisk res),del,ver)
538
536
539
537
getHieAstRuleDefinition :: NormalizedFilePath -> HscEnv -> TcModuleResult -> Action (IdeResult HieAstResult )
0 commit comments