Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop bytestring-encoding #2628

Merged
merged 2 commits into from
Jan 23, 2022
Merged

Drop bytestring-encoding #2628

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68205c3
Drop bytestring-encoding
pepeiborra Jan 23, 2022
62d4578
Merge branch 'master' into drop-bytestring-encoding
mergify[bot] Jan 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ghcide/ghcide.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ library
hslogger,
Diff ^>=0.4.0,
vector,
bytestring-encoding,
opentelemetry >=0.6.1,
heapsize ==0.3.*,
unliftio,
Expand Down
8 changes: 3 additions & 5 deletions ghcide/src/Development/IDE/Core/Rules.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ import Data.Aeson (Result (Success),
import qualified Data.Aeson.Types as A
import qualified Data.Binary as B
import qualified Data.ByteString as BS
import Data.ByteString.Encoding as T
import qualified Data.ByteString.Lazy as LBS
import Data.Coerce
import Data.Foldable
Expand All @@ -92,6 +91,7 @@ import Data.Maybe
import qualified Data.Rope.UTF16 as Rope
import qualified Data.Set as Set
import qualified Data.Text as T
import qualified Data.Text.IO as T
import qualified Data.Text.Encoding as T
import Data.Time (UTCTime (..))
import Data.Tuple.Extra
Expand Down Expand Up @@ -130,7 +130,6 @@ import Development.IDE.Types.Location
import qualified Development.IDE.Types.Logger as L
import Development.IDE.Types.Options
import GHC.Generics (Generic)
import GHC.IO.Encoding
import qualified GHC.LanguageExtensions as LangExt
import qualified HieDb
import Ide.Plugin.Config
Expand Down Expand Up @@ -526,14 +525,13 @@ persistentHieFileRule :: Rules ()
persistentHieFileRule = addPersistentRule GetHieAst $ \file -> runMaybeT $ do
res <- readHieFileForSrcFromDisk file
vfs <- asks vfs
encoding <- liftIO getLocaleEncoding
(currentSource,ver) <- liftIO $ do
mvf <- getVirtualFile vfs $ filePathToUri' file
case mvf of
Nothing -> (,Nothing) . T.decode encoding <$> BS.readFile (fromNormalizedFilePath file)
Nothing -> (,Nothing) <$> T.readFile (fromNormalizedFilePath file)
Just vf -> pure (Rope.toText $ _text vf, Just $ _lsp_version vf)
let refmap = Compat.generateReferencesMap . Compat.getAsts . Compat.hie_asts $ res
del = deltaFromDiff (T.decode encoding $ Compat.hie_hs_src res) currentSource
del = deltaFromDiff (T.decodeUtf8 $ Compat.hie_hs_src res) currentSource
pure (HAR (Compat.hie_module res) (Compat.hie_asts res) refmap mempty (HieFromDisk res),del,ver)

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