Better log-level option

* Allow using strings with `--loglevel`
* `-v` now raises log level relative to `--loglevel` or `--silent`
* Use GmLogLevel instead of Int for parser base

src/GHCMod/Options.hs

@@ -26,6 +26,9 @@ import Options.Applicative
 import Options.Applicative.Types
 import Language.Haskell.GhcMod.Types
 import Control.Arrow
+import Data.Char (toUpper, toLower)
+import Data.List (intercalate)
+import Language.Haskell.GhcMod.Read
 import GHCMod.Options.Commands
 import GHCMod.Version
 import GHCMod.Options.DocUtils
@@ -74,31 +77,48 @@ argAndCmdSpec = (,) <$> globalArgSpec <*> commandsSpec
 splitOn :: Eq a => a -> [a] -> ([a], [a])
 splitOn c = second (drop 1) . break (==c)
 
-getLogLevel :: Int -> GmLogLevel
-getLogLevel = toEnum . min 7
-
 logLevelParser :: Parser GmLogLevel
 logLevelParser =
-  getLogLevel
+    logLevelSwitch <*>
-    <$>  silentSwitch
+           logLevelOption
-    <||> logLevelSwitch
+      <||> silentSwitch
-    <||> logLevelOption
   where
     logLevelOption =
-      option int
+      option parseLL
         $$  long "verbose"
         <=> metavar "LEVEL"
-        <=> value 4
+        <=> value GmWarning
-        <=> showDefault
+        <=> showDefaultWith showLL
-        <=> help "Set log level. (0-7)"
+        <=> help' $$$ do
+          "Set log level ("
+            <> int' (fromEnum (minBound :: GmLogLevel))
+            <> "-"
+            <> int' (fromEnum (maxBound :: GmLogLevel))
+            <> ")"
+          "You can also use strings (case-insensitive):"
+          para'
+            $ intercalate ", "
+            $ map showLL ([minBound..maxBound] :: [GmLogLevel])
     logLevelSwitch =
-      (4+) . length <$> many $$ flag' ()
+      repeatAp succ' . length <$> many $$ flag' ()
         $$  short 'v'
         <=> help "Increase log level"
-    silentSwitch = flag' 0
+    silentSwitch = flag' GmSilent
         $$  long "silent"
         <=> short 's'
-        <=> help "Be silent, set log level to 0"
+        <=> help "Be silent, set log level to 'silent'"
+    showLL = drop 2 . map toLower . show
+    repeatAp f n = foldr (.) id (replicate n f)
+    succ' x | x == maxBound = x
+            | otherwise     = succ x
+    parseLL = do
+      v <- readerAsk
+      let
+        il'= toEnum . min maxBound <$> readMaybe v
+        ll' = readMaybe ("Gm" ++ capFirst v)
+      maybe (readerError $ "Not a log level \"" ++ v ++ "\"") return $ ll' <|> il'
+    capFirst (h:t) = toUpper h : map toLower t
+    capFirst [] = []
 
 outputOptsSpec :: Parser OutputOpts
 outputOptsSpec = OutputOpts

src/GHCMod/Options/Help.hs

@@ -23,14 +23,20 @@ import qualified Options.Applicative.Help.Pretty as PP
 import Control.Monad.State
 import GHC.Exts( IsString(..) )
 import Data.Maybe
+import Data.Monoid
+import Prelude
 
 newtype MyDocM s a = MyDoc {unwrapState :: State s a}
   deriving (Monad, Functor, Applicative, MonadState s)
 type MyDoc = MyDocM (Maybe Doc) ()
 
-instance IsString (MyDocM (Maybe Doc) a)  where
+instance IsString (MyDocM (Maybe Doc) a) where
     fromString = append . para
 
+instance Monoid (MyDocM (Maybe Doc) ()) where
+  mappend a b = append $ doc a <> doc b
+  mempty = append PP.empty
+
 para :: String -> Doc
 para = PP.fillSep . map PP.text . words
 
@@ -65,3 +71,9 @@ progDesc' = progDescDoc . Just . doc
 
 indent :: Int -> MyDoc -> MyDoc
 indent n = append . PP.indent n . doc
+
+int' :: Int -> MyDoc
+int' = append . PP.int
+
+para' :: String -> MyDoc
+para' = append . para