hls-graph 1.5.1.0 → 1.5.1.1
raw patch · 3 files changed
+15/−31 lines, 3 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- Development.IDE.Graph.Internal.Paths: getDataFile :: FilePath -> IO FilePath
+ Development.IDE.Graph.Internal.Paths: readDataFileHTML :: FilePath -> IO ByteString
Files
- hls-graph.cabal +1/−1
- src/Development/IDE/Graph/Internal/Paths.hs +13/−27
- src/Development/IDE/Graph/Internal/Profile.hs +1/−3
hls-graph.cabal view
@@ -1,6 +1,6 @@ cabal-version: 2.4 name: hls-graph-version: 1.5.1.0+version: 1.5.1.1 synopsis: Haskell Language Server internal graph API description: Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
src/Development/IDE/Graph/Internal/Paths.hs view
@@ -1,31 +1,26 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE TemplateHaskell #-} -module Development.IDE.Graph.Internal.Paths (getDataFile) where--import Paths_hls_graph+module Development.IDE.Graph.Internal.Paths (readDataFileHTML) where #ifndef FILE_EMBED-import Control.Exception (SomeException (SomeException), catch)-import Control.Monad (filterM)-import System.Directory (doesFileExist, getCurrentDirectory)-import System.Environment (getExecutablePath)-import System.FilePath (takeDirectory, (</>))-import System.IO.Unsafe (unsafePerformIO)+import Control.Exception (SomeException (SomeException), catch)+import Control.Monad (filterM)+import Paths_hls_graph+import System.Directory (doesFileExist, getCurrentDirectory)+import System.Environment (getExecutablePath)+import System.FilePath (takeDirectory, (</>))+import System.IO.Unsafe (unsafePerformIO) #endif+import qualified Data.ByteString.Lazy as LBS #ifdef FILE_EMBED-import qualified Data.ByteString as BS-import qualified Data.ByteString as LBS+import qualified Data.ByteString as BS import Data.FileEmbed -initDataDirectory :: IO ()-initDataDirectory = pure ()- htmlDataFiles :: [(FilePath, BS.ByteString)] htmlDataFiles = [ ("profile.html", $(embedFile "html/profile.html"))- , ("progress.html", $(embedFile "html/progress.html")) , ("shake.js", $(embedFile "html/shake.js")) ] @@ -35,18 +30,6 @@ Nothing -> fail $ "Could not find data file " ++ file ++ " in embedded data files!" Just x -> pure (LBS.fromStrict x) -manualDirData :: [(FilePath, BS.ByteString)]-manualDirData = $(embedDir "docs/manual")--hasManualData :: IO Bool-hasManualData = pure True--copyManualData :: FilePath -> IO ()-copyManualData dest = do- createDirectoryRecursive dest- forM_ manualDirData $ \(file, bs) -> do- BS.writeFile (dest </> file) bs- #else -- We want getDataFileName to be relative to the current directory on program startup, -- even if we issue a change directory command. Therefore, first call caches, future ones read.@@ -67,5 +50,8 @@ case res of [] -> fail $ unlines $ ("Could not find data file " ++ file ++ ", looked in:") : map (" " ++) poss x:_ -> pure x++readDataFileHTML :: FilePath -> IO LBS.ByteString+readDataFileHTML file = LBS.readFile =<< getDataFile ("html" </> file) #endif
src/Development/IDE/Graph/Internal/Profile.hs view
@@ -1,5 +1,6 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE RecordWildCards #-}+{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE ViewPatterns #-} {- HLINT ignore "Redundant bracket" -} -- a result of CPP expansion@@ -134,9 +135,6 @@ alwaysRerunResult :: Step -> Result alwaysRerunResult current = Result (Value $ toDyn "<alwaysRerun>") (Step 0) (Step 0) current (ResultDeps []) 0 mempty--readDataFileHTML :: FilePath -> IO LBS.ByteString-readDataFileHTML file = LBS.readFile =<< getDataFile ("html" </> file) generateHTML :: Maybe [Int] -> [ProfileEntry] -> IO LBS.ByteString generateHTML dirtyKeys xs = do