Skip to content

Commit 93cd9c7

Browse files
committed
fix up
1 parent a3c3360 commit 93cd9c7

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

app/Main.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ main = do
2121
| otherwise -> stackHieYaml
2222
when (null path) $ error "No .cabal file found!\n You may need to run stack build."
2323
file <- T.readFile $ head path
24-
case parseOnly parseSec file of
24+
case parseOnly parsePackage file of
2525
Right r -> T.writeFile "hie.yaml" $ sOrC r
2626
_ -> error "Could not parse *.cabal file"

src/Hie/Cabal/Parser.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ data Component = Lib Path | Exe Name Path | Test Name Path
2424
parseName :: Parser Text
2525
parseName = "name" >> skipSpace >> char ':' >> parseString
2626

27-
parseSec :: Parser Package
28-
parseSec =
27+
parsePackage :: Parser Package
28+
parsePackage =
2929
( do
3030
n <- parseName
31-
(Package _ t) <- parseSec
31+
(Package _ t) <- parsePackage
3232
pure $ Package n t
3333
)
3434
<|> ( do
3535
h <- parseComponent 0
36-
(Package n t) <- parseSec
36+
(Package n t) <- parsePackage
3737
pure $ Package n (h : t)
3838
)
39-
<|> (skipToNextLine >> parseSec)
39+
<|> (skipToNextLine >> parsePackage)
4040
<|> pure (Package "" [])
4141

4242
parseComponent :: Indent -> Parser Component

test/Spec.hs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@ spec = do
2626
$ libSection ~> parseLib 0
2727
`shouldParse` Lib "src"
2828
describe "Should Succeed"
29-
$ it "successfully parses library section"
30-
$ fullFile ~> parseSec
31-
`shouldParse` Package
32-
"implicit-hie"
33-
[ Lib "src",
29+
$ it "successfully parses package"
30+
$ fullFile ~> parsePackage
31+
`shouldParse` Package
32+
"implicit-hie"
33+
[ Lib "src",
3434
Exe "implicit-hie-exe" "app",
3535
Test "implicit-hie-test" "test"
36-
]
37-
describe "Should Succeed"
38-
$ it
39-
"successfully parses library section"
40-
$ let r = "test\n"
36+
]
37+
describe "Should Succeed"
38+
$ it
39+
"skips to end of block section"
40+
$ let r = "test\n"
4141
in (libSection <> r) ~?> parseLib 0
4242
`leavesUnconsumed` r
4343
describe "Should Succeed"
4444
$ it "successfully generates stack hie.yaml"
45-
$ (stackHieYaml <$> parseOnly parseSec fullFile) `shouldBe` Right stackHie
45+
$ (stackHieYaml <$> parseOnly parsePackage fullFile) `shouldBe` Right stackHie
4646

4747
fullFile :: Text
4848
fullFile = "name: implicit-hie\n" <> libSection <> exeSection <> testSection

0 commit comments

Comments
 (0)