slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep the flags order in moveFlagsAfterCommand

Browse Source
This commit is contained in:
Gaith Hallak 2018-07-04 03:36:26 +03:00
parent d461e96c34
commit d0b9d76986
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hledger/Hledger/Cli/Main.hs
View File

@ -225,16 +225,21 @@ moveFlagsAfterCommand args = moveArgs $ ensureDebugHasArg args
(bs,"--debug":[]) -> bs++"--debug=1":[] (bs,"--debug":[]) -> bs++"--debug=1":[]
_ -> as _ -> as
-- -h ..., --version ... moveArgs args = insertFlagsAfterCommand $ moveArgs' (args, [])
moveArgs (f:a:as) | isMovableNoArgFlag f = (moveArgs $ a:as) ++ [f] where
-- -f FILE ..., --alias ALIAS ... -- -h ..., --version ...
moveArgs (f:v:a:as) | isMovableReqArgFlag f, isValue v = (moveArgs $ a:as) ++ [f,v] moveArgs' ((f:a:as), flags) | isMovableNoArgFlag f = moveArgs' (a:as, flags ++ [f])
-- -fFILE ..., --alias=ALIAS ... -- -f FILE ..., --alias ALIAS ...
moveArgs (fv:a:as) | isMovableReqArgFlagAndValue fv = (moveArgs $ a:as) ++ [fv] moveArgs' ((f:v:a:as), flags) | isMovableReqArgFlag f, isValue v = moveArgs' (a:as, flags ++ [f,v])
-- -f(missing arg) -- -fFILE ..., --alias=ALIAS ...
moveArgs (f:a:as) | isMovableReqArgFlag f, not (isValue a) = (moveArgs $ a:as) ++ [f] moveArgs' ((fv:a:as), flags) | isMovableReqArgFlagAndValue fv = moveArgs' (a:as, flags ++ [fv])
-- anything else -- -f(missing arg)
moveArgs as = as moveArgs' ((f:a:as), flags) | isMovableReqArgFlag f, not (isValue a) = moveArgs' (a:as, flags ++ [f])
-- anything else
moveArgs' (as, flags) = (as, flags)
insertFlagsAfterCommand ([], flags) = flags
insertFlagsAfterCommand (command:args, flags) = [command] ++ flags ++ args
isMovableNoArgFlag a = "-" `isPrefixOf` a && dropWhile (=='-') a `elem` noargflagstomove isMovableNoArgFlag a = "-" `isPrefixOf` a && dropWhile (=='-') a `elem` noargflagstomove