hexagoxel
/
brittany
1
0
Fork 0
Code Issues 117 Pull Requests 5 Packages Projects Releases 5 Wiki Activity

Fix restore-position after block comment

ghc92
Lennart Spitzner 2023-04-18 19:42:24 +00:00
parent 2fef44559e
commit b24379d104
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/library/Language/Haskell/Brittany/Internal/S4_WriteBriDoc.hs
View File

@ -289,7 +289,7 @@ layoutBriDocM = \case
PlannedSameline{} -> False PlannedSameline{} -> False
PlannedNewline{} -> True PlannedNewline{} -> True
PlannedDelta{} -> True PlannedDelta{} -> True
-- traceShow (ExactPrint.pos2delta p1 p2) $ pure () -- traceShow (m, ExactPrint.pos2delta p1 p2) $ pure ()
case ExactPrint.pos2delta p1 p2 of case ExactPrint.pos2delta p1 p2 of
SameLine{} -> pure () SameLine{} -> pure ()
DifferentLine n _ | newlinePlanned -> layoutWriteNewlines n DifferentLine n _ | newlinePlanned -> layoutWriteNewlines n
@ -326,10 +326,14 @@ printComments comms = do
Anchor span UnchangedAnchor -> do Anchor span UnchangedAnchor -> do
let dp = ExactPrint.ss2deltaEnd prior span let dp = ExactPrint.ss2deltaEnd prior span
layoutWriteComment True isBlock dp 1 (Text.pack s) layoutWriteComment True isBlock dp 1 (Text.pack s)
layoutUpdateMarker $ realSrcSpanEnd span if isBlock
then layoutSetMarker $ Just $ realSrcSpanEnd span
else layoutUpdateMarker $ realSrcSpanEnd span
Anchor span (MovedAnchor dp) -> do Anchor span (MovedAnchor dp) -> do
layoutWriteComment False isBlock dp 1 (Text.pack s) layoutWriteComment False isBlock dp 1 (Text.pack s)
layoutUpdateMarker $ realSrcSpanEnd span if isBlock
then layoutSetMarker $ Just $ realSrcSpanEnd span
else layoutUpdateMarker $ realSrcSpanEnd span
comms `forM_` \(L anch (EpaComment tok prior)) -> case tok of comms `forM_` \(L anch (EpaComment tok prior)) -> case tok of
EpaDocCommentNext s -> addComment False s anch prior EpaDocCommentNext s -> addComment False s anch prior
EpaDocCommentPrev s -> addComment False s anch prior EpaDocCommentPrev s -> addComment False s anch prior