Make the user interface match the skip/show/warn better

Author: ndmitchell

src/Main.hs

@@ -25,14 +25,31 @@ main = do
         settings <- readSettings cmdHintFiles
         let apply = map (classify settings) . applyHint (readHints settings)
         ideas <- liftM concat $ mapM (liftM apply . parseFile) cmdFiles
-        mapM_ print [i | i <- ideas, rank i /= Skip]
-        
-        let n = length ideas
-        if n == 0 then do
+        mapM_ print [i | i <- ideas, cmdShowSkip || rank i /= Skip]
+
+        -- figure out statistics        
+        let counts = map (head &&& length) $ group $ sort $ map rank ideas
+        let [skip,warn,fix] = map (fromMaybe 0 . flip lookup counts) [Skip,Warn,Fix]
+        let total = skip + warn + fix
+        let shown = if cmdShowSkip then total else total-skip
+        let skipped = total-shown
+
+        if shown == 0 then do
             when (cmdReports /= []) $ putStrLn "Skipping writing reports"
-            putStrLn "No relevant suggestions"
+            printMsg "No relevant suggestions" [(skipped,"skipped")]
          else do
             flip mapM_ cmdReports $ \x -> do
                 putStrLn $ "Writing report to " ++ x ++ " ..."
                 writeReport x ideas
-            putStrLn $ "Found " ++ show n ++ " suggestions"
+            printMsg ("Found " ++ show shown ++ " suggestion" ++ ['s'|shown/=1])
+                     [(fix,"serious"),(skipped,"skipped")]
+
+
+printMsg :: String -> [(Int, String)] -> IO ()
+printMsg msg extras =
+    putStrLn $ msg ++ if null xs then "" else
+        " (" ++ intercalate ", " xs ++ ")"
+    where
+        xs = concatMap f extras
+        f (0,_) = []
+        f (i,x) = [unwords [show i, if i == 1 then "was" else "were", x]]

src/Type.hs

@@ -43,7 +43,7 @@ instance Show Idea where
     show (Classify x y z) = unwords ["Classify",show x,show y,show z]
 
     show x = unlines $
-        [showSrcLoc (loc x) ++ " " ++ hint x] ++ f "Found" from ++ f "Why not" to
+        [showSrcLoc (loc x) ++ " (" ++ show (rank x) ++ ") " ++ hint x] ++ f "Found" from ++ f "Why not" to
         where f msg sel = (msg ++ ":") : map ("  "++) (lines $ sel x)
 
     showList = showString . concatMap show