Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/src/IHaskell/Eval/Evaluate.hs b/src/IHaskell/Eval/Evaluate.hs
- index 524f87c..5fdd0fb 100644
- --- a/src/IHaskell/Eval/Evaluate.hs
- +++ b/src/IHaskell/Eval/Evaluate.hs
- @@ -183,8 +183,8 @@ initializeImports = do
- pkg <- db
- depId <- depends pkg
- dep <- filter ((== depId) . installedPackageId) db
- - guard
- - (iHaskellPkgName `isPrefixOf` packageIdString (packageConfigId dep))
- + let idString = packageIdString' dflags (packageConfigId dep)
- + guard (iHaskellPkgName `isPrefixOf` idString)
- -- ideally the Paths_ihaskell module could provide a way to get the hash too
- -- (ihaskell-0.2.0.5-f2bce922fa881611f72dfc4a854353b9), for now. Things will end badly if you also
- diff --git a/src/IHaskell/Eval/Hoogle.hs b/src/IHaskell/Eval/Hoogle.hs
- index 2726273..91bdffc 100644
- --- a/src/IHaskell/Eval/Hoogle.hs
- +++ b/src/IHaskell/Eval/Hoogle.hs
- @@ -8,7 +8,7 @@ module IHaskell.Eval.Hoogle (
- HoogleResult,
- ) where
- -import ClassyPrelude hiding (last, span, div)
- +import ClassyPrelude hiding (last, span, div)
- import Text.Printf
- import Network.HTTP.Client
- import Network.HTTP.Client.TLS
- @@ -17,7 +17,7 @@ import Data.String.Utils
- import Data.List (elemIndex, (!!), last)
- import Data.Char (isAscii, isAlphaNum)
- import qualified Data.ByteString.Lazy.Char8 as Char
- -import qualified Prelude as P
- +import qualified Prelude as P (div, foldr, fromEnum)
- import IHaskell.IPython
- @@ -66,10 +66,12 @@ query str = do
- urlEncode :: String -> String
- urlEncode [] = []
- urlEncode (ch:t)
- - | (isAscii ch && isAlphaNum ch) || ch `P.elem` "-_.~" = ch : urlEncode t
- + | (isAscii ch && isAlphaNum ch) || ch `isIn` "-_.~" = ch : urlEncode t
- | not (isAscii ch) = P.foldr escape (urlEncode t) (eightBs [] (P.fromEnum ch))
- | otherwise = escape (P.fromEnum ch) (urlEncode t)
- where
- + isIn ch ([]) = False
- + isIn ch (s:ss) = if (ch== s) then True else isIn ch ss
- escape :: Int -> String -> String
- escape b rs = '%' : showH (b `P.div` 16) (showH (b `mod` 16) rs)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement