From 78b6224c06fca7073d682e9aedf673df4e20fe90 Mon Sep 17 00:00:00 2001 From: Avi Dessauer Date: Mon, 9 Nov 2020 18:35:45 -0500 Subject: [PATCH] Fmt and fixes --- Setup.hs | 1 + app/Main.hs | 21 ++--- src/Hie/Cabal/Parser.hs | 5 +- src/Hie/Locate.hs | 33 ++++---- stack.yaml.lock | 8 +- test/Spec.hs | 167 ++++++++++++++++++++-------------------- 6 files changed, 115 insertions(+), 120 deletions(-) diff --git a/Setup.hs b/Setup.hs index 9a994af..e8ef27d 100644 --- a/Setup.hs +++ b/Setup.hs @@ -1,2 +1,3 @@ import Distribution.Simple + main = defaultMain diff --git a/app/Main.hs b/app/Main.hs index 713ccb1..cdad14e 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -4,18 +4,12 @@ module Main where import Control.Monad import Control.Monad.Trans.Maybe -import Data.Attoparsec.Text -import Data.List import Data.Maybe -import qualified Data.Text as T -import qualified Data.Text.IO as T -import Hie.Cabal.Parser import Hie.Locate import Hie.Yaml import System.Directory -import System.Directory.Internal -import System.FilePath.Posix import System.Environment +import System.FilePath.Posix main :: IO () main = do @@ -24,10 +18,11 @@ main = do cfs <- runMaybeT $ case name of "cabal" -> cabalPkgs pwd _ -> stackYamlPkgs pwd - when (null cfs) $ error $ - "No .cabal files found under" - <> pwd - <> "\n You may need to run stack build." + when (null cfs) $ + error $ + "No .cabal files found under" + <> pwd + <> "\n You may need to run stack build." pkgs <- catMaybes <$> mapM (nestedPkg pwd) (concat cfs) putStr <$> hieYaml name $ fmtPkgs name pkgs @@ -37,7 +32,8 @@ resolveName pwd = do files <- listDirectory pwd let fileNames = map takeFileName files name = - if | "--cabal" `elem` args -> "cabal" + if + | "--cabal" `elem` args -> "cabal" | "--stack" `elem` args -> "stack" | "dist-newstyle" `elem` fileNames -> "cabal" | ".stack-work" `elem` fileNames -> "stack" @@ -45,4 +41,3 @@ resolveName pwd = do | "stack.yaml" `elem` fileNames -> "stack" | otherwise -> "cabal" return name - diff --git a/src/Hie/Cabal/Parser.hs b/src/Hie/Cabal/Parser.hs index e3db4cc..6d237db 100644 --- a/src/Hie/Cabal/Parser.hs +++ b/src/Hie/Cabal/Parser.hs @@ -102,8 +102,9 @@ optSkipToNextLine i = do skipMany $ satisfy (\c -> isSpace c && not (isEndOfLine c)) mChar <- peekChar case mChar of - Just c | isEndOfLine c -> - char c *> indent i $> () + Just c + | isEndOfLine c -> + char c *> indent i $> () _ -> pure () -- | Comma or space separated list, with optional new lines. diff --git a/src/Hie/Locate.hs b/src/Hie/Locate.hs index 2024649..5b265b7 100644 --- a/src/Hie/Locate.hs +++ b/src/Hie/Locate.hs @@ -8,9 +8,7 @@ module Hie.Locate ) where -import Control.Applicative import Control.Exception -import Control.Monad import Control.Monad.IO.Class import Control.Monad.Trans.Maybe import Data.Attoparsec.Text (parseOnly) @@ -20,9 +18,7 @@ import Data.Maybe import qualified Data.Text as T import qualified Data.Text.IO as T import Data.Yaml -import GHC.Generics import Hie.Cabal.Parser -import Hie.Yaml import System.Directory import System.FilePath.Posix import System.FilePattern.Directory (getDirectoryFiles) @@ -35,22 +31,24 @@ instance FromJSON Pkgs where parseJSON _ = fail "could not read packages from stack.yaml" stackYamlPkgs :: FilePath -> MaybeT IO [FilePath] -stackYamlPkgs p = liftIO $ - decodeFileEither (p "stack.yaml") >>= \case - Right (Pkgs f) -> - liftIO $ - map (p ) - <$> getDirectoryFiles p (map ( "*.cabal") f) - Left e -> fail $ show e +stackYamlPkgs p = + liftIO $ + decodeFileEither (p "stack.yaml") >>= \case + Right (Pkgs f) -> + liftIO $ + map (p ) + <$> getDirectoryFiles p (map ( "*.cabal") f) + Left e -> fail $ show e cabalPkgs :: FilePath -> MaybeT IO [FilePath] cabalPkgs p = do cp <- cabalP "cabal.project" cl <- cabalP "cabal.project.local" case concat . rights $ map (parseOnly extractPkgs) $ rights [cp, cl] of - [] -> liftIO (cfs p) >>= \case - [] -> fail "no cabal files found" - h : _ -> pure [p h] + [] -> + liftIO (cfs p) >>= \case + [] -> fail "no cabal files found" + h : _ -> pure [p h] xs -> do cd <- liftIO $ map (p ) <$> getDirectoryFiles p (map (matchDirs . T.unpack) xs) cf <- @@ -71,9 +69,10 @@ nestedPkg parrent child = do case parsePackage' f' of Right (Package n cs) -> do let dir = - fromJust $ stripPrefix (splitDirectories parrent) - $ splitDirectories - $ fst (splitFileName child) + fromJust $ + stripPrefix (splitDirectories parrent) $ + splitDirectories $ + fst (splitFileName child) pkg = Package n $ map diff --git a/stack.yaml.lock b/stack.yaml.lock index 1debcae..a0c9a9b 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - size: 492027 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/9.yaml - sha256: 11394dc975e96c2fea90f7f2b3229630d46351a092ebcec78f0a56403930b429 - original: lts-15.9 + size: 496111 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/14.yaml + sha256: c442d702d66b8c129b3473a32c609050aabf1dc2f8e8502402c143271a8fb141 + original: lts-15.14 diff --git a/test/Spec.hs b/test/Spec.hs index 3fb2d17..544ad99 100644 --- a/test/Spec.hs +++ b/test/Spec.hs @@ -1,7 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} import Data.Attoparsec.Text -import qualified Data.Text as T import Data.Text (Text) import qualified Data.Text.IO as T import Hie.Cabal.Parser @@ -14,89 +13,89 @@ main = hspec spec spec :: Spec spec = do - describe "Should Succeed" - $ it "successfully parses executable section" - $ exeSection ~> parseExe 0 - `shouldParse` [Comp Exe "gen-hie" "app/Main.hs"] - describe "Should Succeed" - $ it "successfully parses test section" - $ testSection ~> parseTestSuite 0 - `shouldParse` [Comp Test "implicit-hie-test" "test"] - describe "Should Succeed" - $ it "successfully parses library section" - $ libSection ~> parseLib 0 - `shouldParse` [Comp Lib "" "src"] - describe "Should Succeed" - $ it "successfully parses library section with 2 hs-source-dirs" - $ libSection2 ~> parseLib 0 - `shouldParse` [Comp Lib "" "src", Comp Lib "" "src2"] - describe "Should Succeed" - $ it "successfully parses library section with 2 paths under hs-source-dirs" - $ libSection3 ~> parseLib 0 - `shouldParse` [Comp Lib "" "src", Comp Lib "" "src2"] - describe "Should Succeed" - $ it "successfully parses bench section" - $ do - bs <- T.readFile "test/benchSection" - bs ~> parseBench 0 - `shouldParse` [Comp Bench "folds" "benchmarks/folds.hs"] - describe "Should Succeed" - $ it "successfully parses package" - $ do - cf <- T.readFile "implicit-hie.cabal" - cf ~> parsePackage - `shouldParse` Package - "implicit-hie" - [ Comp Lib "" "src", - Comp Exe "gen-hie" "app/Main.hs", - Comp Test "implicit-hie-test" "test" - ] - describe "Should Succeed" - $ it + describe "Should Succeed" $ + it "successfully parses executable section" $ + exeSection ~> parseExe 0 + `shouldParse` [Comp Exe "gen-hie" "app/Main.hs"] + describe "Should Succeed" $ + it "successfully parses test section" $ + testSection ~> parseTestSuite 0 + `shouldParse` [Comp Test "implicit-hie-test" "test"] + describe "Should Succeed" $ + it "successfully parses library section" $ + libSection ~> parseLib 0 + `shouldParse` [Comp Lib "" "src"] + describe "Should Succeed" $ + it "successfully parses library section with 2 hs-source-dirs" $ + libSection2 ~> parseLib 0 + `shouldParse` [Comp Lib "" "src", Comp Lib "" "src2"] + describe "Should Succeed" $ + it "successfully parses library section with 2 paths under hs-source-dirs" $ + libSection3 ~> parseLib 0 + `shouldParse` [Comp Lib "" "src", Comp Lib "" "src2"] + describe "Should Succeed" $ + it "successfully parses bench section" $ + do + bs <- T.readFile "test/benchSection" + bs ~> parseBench 0 + `shouldParse` [Comp Bench "folds" "benchmarks/folds.hs"] + describe "Should Succeed" $ + it "successfully parses package" $ + do + cf <- T.readFile "implicit-hie.cabal" + cf ~> parsePackage + `shouldParse` Package + "implicit-hie" + [ Comp Lib "" "src", + Comp Exe "gen-hie" "app/Main.hs", + Comp Test "implicit-hie-test" "test" + ] + describe "Should Succeed" $ + it "skips to end of block section" - $ let r = "test\n" - in (libSection <> r) ~?> parseLib 0 - `leavesUnconsumed` r - describe "Should Succeed" - $ it "successfully generates stack hie.yaml" - $ do - sf <- readFile "test/stackHie.yaml" - cf <- T.readFile "implicit-hie.cabal" - (hieYaml "stack" . fmtPkgs "stack" . (: []) <$> parseOnly parsePackage cf) - `shouldBe` Right sf - describe "Should Succeed" - $ it "successfully generates cabal hie.yaml for haskell-language-server" - $ do - f <- T.readFile "test/haskell-language-server-cabal" - o <- readFile "test/hie.yaml.cbl" - (hieYaml "cabal" . fmtPkgs "cabal" . (: []) <$> parseOnly parsePackage f) - `shouldBe` Right o - describe "Should Succeed" - $ it "successfully parses comma list" - $ ("one, two" :: Text) ~> parseList 1 `shouldParse` ["one", "two"] - describe "Should Succeed" - $ it "successfully parses newline list" - $ ("one\n two \n three3" :: Text) ~> parseList 1 - `shouldParse` ["one", "two", "three3"] - describe "Should Succeed" - $ it "successfully parses newline comma list" - $ ("one\n two, three3" :: Text) ~> parseList 1 - `shouldParse` ["one", "two", "three3"] - describe "Should Succeed" - $ it "quoted list" - $ ("\"one\"\n two\n three3" :: Text) ~> parseList 1 - `shouldParse` ["one", "two", "three3"] - describe "Should Succeed" - $ it "list with leading commas" - $ ("one\n , two\n , three3" :: Text) ~> parseList 1 - `shouldParse` ["one", "two", "three3"] - describe "Should Succeed" - $ it "succesfully parses exe component with other-modules containing dots" - $ exeSection2 ~> parseExe 0 - `shouldParse` [ Comp Exe "gen-hie" "app/Main.hs" - , Comp Exe "gen-hie" "app/Hie/Executable/Helper.hs" - , Comp Exe "gen-hie" "app/Hie/Executable/Utils.hs" - ] + $ let r = "test\n" + in (libSection <> r) ~?> parseLib 0 + `leavesUnconsumed` r + describe "Should Succeed" $ + it "successfully generates stack hie.yaml" $ + do + sf <- readFile "test/stackHie.yaml" + cf <- T.readFile "implicit-hie.cabal" + (hieYaml "stack" . fmtPkgs "stack" . (: []) <$> parseOnly parsePackage cf) + `shouldBe` Right sf + describe "Should Succeed" $ + it "successfully generates cabal hie.yaml for haskell-language-server" $ + do + f <- T.readFile "test/haskell-language-server-cabal" + o <- readFile "test/hie.yaml.cbl" + (hieYaml "cabal" . fmtPkgs "cabal" . (: []) <$> parseOnly parsePackage f) + `shouldBe` Right o + describe "Should Succeed" $ + it "successfully parses comma list" $ + ("one, two" :: Text) ~> parseList 1 `shouldParse` ["one", "two"] + describe "Should Succeed" $ + it "successfully parses newline list" $ + ("one\n two \n three3" :: Text) ~> parseList 1 + `shouldParse` ["one", "two", "three3"] + describe "Should Succeed" $ + it "successfully parses newline comma list" $ + ("one\n two, three3" :: Text) ~> parseList 1 + `shouldParse` ["one", "two", "three3"] + describe "Should Succeed" $ + it "quoted list" $ + ("\"one\"\n two\n three3" :: Text) ~> parseList 1 + `shouldParse` ["one", "two", "three3"] + describe "Should Succeed" $ + it "list with leading commas" $ + ("one\n , two\n , three3" :: Text) ~> parseList 1 + `shouldParse` ["one", "two", "three3"] + describe "Should Succeed" $ + it "succesfully parses exe component with other-modules containing dots" $ + exeSection2 ~> parseExe 0 + `shouldParse` [ Comp Exe "gen-hie" "app/Main.hs", + Comp Exe "gen-hie" "app/Hie/Executable/Helper.hs", + Comp Exe "gen-hie" "app/Hie/Executable/Utils.hs" + ] exeSection :: Text exeSection = @@ -191,4 +190,4 @@ exeSection2 = \ Hie.Executable.Utils\n\ \ hs-source-dirs:\n\ \ app\n\ - \ main-is: Main.hs \n" \ No newline at end of file + \ main-is: Main.hs \n"