Skip to content

Commit fcd4bff

Browse files
committed
Remove unused function
1 parent 3d80afa commit fcd4bff

File tree

2 files changed

+6
-24
lines changed

2 files changed

+6
-24
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module Ide.Plugin.Cabal.Parse
2-
( parseCabalFile
3-
, parseCabalFileContents
2+
( parseCabalFileContents
43
-- * Re-exports
54
, FilePath
65
, NonEmpty(..)
@@ -11,7 +10,6 @@ module Ide.Plugin.Cabal.Parse
1110
, GenericPackageDescription(..)
1211
) where
1312

14-
import Control.Monad (unless)
1513
import qualified Data.ByteString as BS
1614
import Data.List.NonEmpty (NonEmpty (..))
1715
import Distribution.Fields (PError (..),
@@ -21,26 +19,9 @@ import Distribution.PackageDescription.Parsec (parseGenericPacka
2119
import Distribution.Parsec.Position (Position (..))
2220
import Distribution.Types.GenericPackageDescription (GenericPackageDescription (..))
2321
import Distribution.Types.Version (Version)
24-
import qualified System.Directory as Dir
25-
import qualified System.Exit as Exit
26-
27-
28-
parseCabalFile
29-
:: FilePath
30-
-> IO ([PWarning], Either (Maybe Version, NonEmpty PError) GenericPackageDescription)
31-
parseCabalFile =
32-
readAndParseFile'
33-
where
34-
readAndParseFile' fpath = do
35-
exists <- Dir.doesFileExist fpath
36-
unless exists $
37-
Exit.die $
38-
"Error Parsing: file \"" ++ fpath ++ "\" doesn't exist. Cannot continue."
39-
bs <- BS.readFile fpath
40-
parseCabalFileContents bs
4122

4223
parseCabalFileContents
43-
:: BS.ByteString -- ^ UTF-8 encoded bytestring
44-
-> IO ([PWarning], Either (Maybe Version, NonEmpty PError) GenericPackageDescription)
24+
:: BS.ByteString -- ^ UTF-8 encoded bytestring
25+
-> IO ([PWarning], Either (Maybe Version, NonEmpty PError) GenericPackageDescription)
4526
parseCabalFileContents bs =
46-
pure $ runParseResult (parseGenericPackageDescription bs)
27+
pure $ runParseResult (parseGenericPackageDescription bs)

plugins/hls-cabal-plugin/test/Main.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import qualified Ide.Plugin.Cabal.Parse as Lib
1515
import qualified Language.LSP.Types.Lens as J
1616
import System.FilePath
1717
import Test.Hls
18+
import qualified Data.ByteString as BS
1819

1920
cabalPlugin :: Recorder (WithPriority Log) -> PluginDescriptor IdeState
2021
cabalPlugin recorder = descriptor recorder "cabal"
@@ -51,7 +52,7 @@ unitTests :: TestTree
5152
unitTests =
5253
testGroup "Unit Tests"
5354
[ testCase "Simple Parsing works" $ do
54-
(warnings, pm) <- Lib.parseCabalFile $ testDataDir </> "simple.cabal"
55+
(warnings, pm) <- Lib.parseCabalFileContents =<< BS.readFile (testDataDir </> "simple.cabal")
5556
liftIO $ do
5657
null warnings @? "Found unexpected warnings"
5758
isRight pm @? "Failed to parse GenericPackageDescription"

0 commit comments

Comments
 (0)