Skip to content

Commit

Permalink
address code review
Browse files Browse the repository at this point in the history
  • Loading branch information
ulysses4ever authored and andreasabel committed Feb 10, 2023
1 parent 60658a1 commit eb7062c
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions FixWhitespace.hs
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@ fix mode verbose tabSize f =
hPutStrLn stderr $
"[ Violation " ++
(if mode == Fix then "fixed" else "detected") ++
" ] " ++ f ++ ":\n" ++ (unlines $ map displayViolations vs)
" ] " ++ f ++
(if mode == Fix then "" else
":\n" ++ (unlines $ map (displayViolations f) vs))

when (mode == Fix) $
withFile f WriteMode $ \h -> do
Expand All @@ -240,8 +242,8 @@ fix mode verbose tabSize f =
-- Stores the index of the line and the line itself.
data LineViolating = LV Int Text

displayViolations :: LineViolating -> String
displayViolations (LV i l) = "line " ++ show i ++ "] " ++
displayViolations :: FilePath -> LineViolating -> String
displayViolations fname (LV i l) = fname ++ ":" ++ show i ++ ": " ++
(Text.unpack $ visibleSpaces l)

-- | The transformation monad: maintains info about lines that
Expand Down Expand Up @@ -331,5 +333,5 @@ dropWhile1 p (x:xs)
-- presentation purposes. Space turns into '·' and tab into '→'
visibleSpaces :: Text -> Text
visibleSpaces s
| Text.null s = "<empty line>"
| otherwise = Text.replace "\t" "" . Text.replace " " "·" $ s
| Text.null s = "<NEWLINE>"
| otherwise = Text.replace "\t" "<TAB>" . Text.replace " " "·" $ s

0 comments on commit eb7062c

Please sign in to comment.