Skip to content

Commit aea3579

Browse files
Drop bytestring-encoding (#2628)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 96d2c04 commit aea3579

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

ghcide/ghcide.cabal

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ library
9595
hslogger,
9696
Diff ^>=0.4.0,
9797
vector,
98-
bytestring-encoding,
9998
opentelemetry >=0.6.1,
10099
heapsize ==0.3.*,
101100
unliftio,

ghcide/src/Development/IDE/Core/Rules.hs

+3-5
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ import Data.Aeson (Result (Success),
7676
import qualified Data.Aeson.Types as A
7777
import qualified Data.Binary as B
7878
import qualified Data.ByteString as BS
79-
import Data.ByteString.Encoding as T
8079
import qualified Data.ByteString.Lazy as LBS
8180
import Data.Coerce
8281
import Data.Foldable
@@ -92,6 +91,7 @@ import Data.Maybe
9291
import qualified Data.Rope.UTF16 as Rope
9392
import qualified Data.Set as Set
9493
import qualified Data.Text as T
94+
import qualified Data.Text.IO as T
9595
import qualified Data.Text.Encoding as T
9696
import Data.Time (UTCTime (..))
9797
import Data.Tuple.Extra
@@ -130,7 +130,6 @@ import Development.IDE.Types.Location
130130
import qualified Development.IDE.Types.Logger as L
131131
import Development.IDE.Types.Options
132132
import GHC.Generics (Generic)
133-
import GHC.IO.Encoding
134133
import qualified GHC.LanguageExtensions as LangExt
135134
import qualified HieDb
136135
import Ide.Plugin.Config
@@ -526,14 +525,13 @@ persistentHieFileRule :: Rules ()
526525
persistentHieFileRule = 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

539537
getHieAstRuleDefinition :: NormalizedFilePath -> HscEnv -> TcModuleResult -> Action (IdeResult HieAstResult)

0 commit comments

Comments
 (0)