Yvee1/hascard
1
1
Fork 0
mirror of https://github.com/Yvee1/hascard.git synced 2024-11-22 12:51:58 +03:00
Code Issues Projects Releases Wiki Activity

Fix selection after parse error

Browse Source
This commit is contained in:
Steven van den Broek 2020-07-18 14:45:20 +02:00
parent faaf372441
commit f5a7d2d844
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/FileBrowserUI.hs
View File

@ -64,14 +64,14 @@ drawUI State{_fb=b, _exception=exc} = [center $ ui <=> help]
borderWithLabel (txt "Choose a file") $
renderFileBrowser True b
help = padTop (Pad 1) $
vBox [ case exc of
Nothing -> emptyWidget
Just e -> hCenter $ withDefAttr errorAttr $
str e
, hCenter $ txt "Up/Down: select"
vBox [ hCenter $ txt "Up/Down: select"
, hCenter $ txt "/: search, Ctrl-C or Esc: cancel search"
, hCenter $ txt "Enter: change directory or select file"
, hCenter $ txt "Esc: quit"
, case exc of
Nothing -> emptyWidget
Just e -> hCenter $ withDefAttr errorAttr $
str e
]
handleEvent :: State -> BrickEvent Name Event -> EventM Name (Next State)
@ -96,7 +96,7 @@ handleEvent s@State{_fb=b} (VtyEvent ev) =
case fileOrExc of
Left exc -> continue (s' & exception ?~ displayException exc)
Right file -> case parseCards file of
Left parseError -> continue (s' & exception ?~ show parseError)
Left parseError -> continue (s & exception ?~ show parseError)
Right result -> halt (s' & cards .~ result & filePath ?~ fp)
_ -> halt s'

2
src/Parser.hs
View File

@ -28,7 +28,7 @@ uncurry3 f (a, b, c) = f a b c
parseCards :: String -> Either ParseError [Card]
parseCards = parse pCards "failed when parsing cards"
pCards = pCard `sepEndBy` seperator
pCards = pCard `sepEndBy1` seperator
pCard = uncurry3 MultipleChoice<$> try pMultChoice
<|> uncurry MultipleAnswer <$> try pMultAnswer
<|> uncurry OpenQuestion <$> try pOpen