From f8bad3a855d100e4ea057ae56a51d5dfd1bfd959 Mon Sep 17 00:00:00 2001
From: mrkkrp <mark.karpov@tweag.io>
Date: Sun, 30 Jun 2019 23:59:40 +0200
Subject: [PATCH] Only drop indentation present for every line in multiline
 comments

---
 data/examples/other/ascii-out.hs              |  9 ++++++++
 data/examples/other/ascii.hs                  |  9 ++++++++
 .../other/multiline-comments-reindent-out.hs  |  6 ++---
 src/Ormolu/CommentStream.hs                   | 23 ++++++++++++++-----
 4 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 data/examples/other/ascii-out.hs
 create mode 100644 data/examples/other/ascii.hs

diff --git a/data/examples/other/ascii-out.hs b/data/examples/other/ascii-out.hs
new file mode 100644
index 0000000..da3c355
--- /dev/null
+++ b/data/examples/other/ascii-out.hs
@@ -0,0 +1,9 @@
+{- -----------------------------------
+  < What about ASCII art in comments? >
+   -----------------------------------
+          \   ^__^
+           \  (oo)\_______
+              (__)\       )\/\
+                  ||----w |
+                  ||     ||
+-}
diff --git a/data/examples/other/ascii.hs b/data/examples/other/ascii.hs
new file mode 100644
index 0000000..da3c355
--- /dev/null
+++ b/data/examples/other/ascii.hs
@@ -0,0 +1,9 @@
+{- -----------------------------------
+  < What about ASCII art in comments? >
+   -----------------------------------
+          \   ^__^
+           \  (oo)\_______
+              (__)\       )\/\
+                  ||----w |
+                  ||     ||
+-}
diff --git a/data/examples/other/multiline-comments-reindent-out.hs b/data/examples/other/multiline-comments-reindent-out.hs
index 156311e..8ce95eb 100644
--- a/data/examples/other/multiline-comments-reindent-out.hs
+++ b/data/examples/other/multiline-comments-reindent-out.hs
@@ -1,6 +1,6 @@
 {-
-And so here we have a
-multiline comment.
+   And so here we have a
+     multiline comment.
 
-Indeed.
+   Indeed.
 -}
diff --git a/src/Ormolu/CommentStream.hs b/src/Ormolu/CommentStream.hs
index 93d3644..9057a58 100644
--- a/src/Ormolu/CommentStream.hs
+++ b/src/Ormolu/CommentStream.hs
@@ -12,6 +12,7 @@ module Ormolu.CommentStream
   )
 where
 
+import Data.Char (isSpace)
 import Data.Data (Data)
 import Data.List (isPrefixOf, sortOn)
 import Data.List.NonEmpty (NonEmpty (..))
@@ -44,7 +45,7 @@ mkCommentStream extraComments pstate
   -- NOTE It's easier to normalize pragmas right when we construct comment
   -- streams. Because this way we need to do it only once and when we
   -- perform checking later they'll automatically match.
-  . fmap (fmap (Comment . normalizeComment . normalizePragma))
+  . fmap (mkComment . (fmap normalizePragma))
   . sortOn startOfSpan
   . mapMaybe toRealSpan $
       extraComments ++
@@ -77,11 +78,21 @@ normalizePragma x =
 -- into several lines for subsequent outputting with correct indentation for
 -- each line.
 
-normalizeComment :: String -> NonEmpty String
-normalizeComment s =
-  case NE.nonEmpty (lines s) of
-    Nothing -> s :| []
-    Just xs -> dropWhile (== ' ') <$> xs
+mkComment :: RealLocated String -> RealLocated Comment
+mkComment (L l s) = L l . Comment $
+  if "{-" `isPrefixOf` s
+    then case NE.nonEmpty (lines s) of
+      Nothing -> s :| []
+      Just (x:|xs) ->
+        let getIndent y =
+              if all isSpace y
+                then startIndent
+                else length (takeWhile isSpace y)
+            n = minimum (startIndent : fmap getIndent xs)
+        in x :| (drop n <$> xs)
+    else s :| []
+  where
+    startIndent = srcSpanStartCol l - 1
 
 -- | Get a 'String' from 'GHC.AnnotationComment'.