parse leading hash signs as well

Delapouite · Feb 3, 2015 · 10ce328 · 10ce328
1 parent b4b804f
commit 10ce328
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/BranchParse.hs b/src/BranchParse.hs
@@ -96,6 +96,8 @@ branchParser =
 		<|> try branchRemote
 		<|> branchOnly
 
+branchParser' :: Parser BranchInfo
+branchParser' = (string "## ") >> branchParser
 
 inBrackets :: Parser Distance
 inBrackets = between (char '[') (char ']') (behind <|> try aheadBehind <|> ahead)
@@ -116,7 +118,7 @@ aheadBehind =
 		<*> behind
 
 branchInfo :: String -> Either ParseError BranchInfo
-branchInfo = parse branchParser ""
+branchInfo = parse branchParser' ""
 
 pairFromDistance :: Distance -> (Int, Int)
 pairFromDistance (Ahead n) = (n,0)

diff --git a/src/TestBranchParse.hs b/src/TestBranchParse.hs
@@ -8,7 +8,7 @@ import Control.Monad (forM, unless)
 {- Helper to tackle the Either type -}
 
 checkRight :: BranchInfo -> String -> Bool
-checkRight b s = expectRight b $ branchInfo s
+checkRight b s = expectRight b $ branchInfo $ "## " ++ s
 	where
 		expectRight expected computed = case computed of
 			Left _ -> False

diff --git a/src/Utils.hs b/src/Utils.hs
@@ -16,7 +16,7 @@ rightOrNothing :: Either a b -> Maybe b
 rightOrNothing = either (const Nothing) Just
 
 processBranch :: String -> Maybe BranchInfo
-processBranch = rightOrNothing . branchInfo . drop 3
+processBranch = rightOrNothing . branchInfo
 
 processGitStatus :: [String] -> Maybe (BranchInfo, Status Int)
 processGitStatus [] = Nothing