git.iko.soy/elk
on master help sign in
Allow subregion underlines on single lines
b7842c0Evan Czaplicki
src/Reporting/Report.hs+33−15
compare with master
unifiedsplit
@@ -58,21 +58,14 @@ grabRegion maybeSubRegion (R.Region start end) source =
58 [] ->
58 [] ->
59 error "something has gone badly wrong with reporting source locations"
59 error "something has gone badly wrong with reporting source locations"
60
60
61− [theLine] ->
61+ [sourceLine] ->
62− let
63− n = startLine
62+ singleLineRegion startLine sourceLine $
64− w = length (show (n + 1))
63+ case maybeSubRegion of
65− underline =
66− replicate (startColumn - 1) ' '
67− ++ replicate (max 1 (endColumn - startColumn)) '^'
68− number =
69− addLineNumber Nothing w
64+ Nothing ->
70− in
65+ (0, startColumn, endColumn, length sourceLine)
71− unlines
66+
72− [ number (n-1) ""
67+ Just (R.Region s e) ->
73− , number n theLine
68+ (startColumn, R.column s, R.column e, endColumn)
74− , number (n+1) underline
75− ]
76
69
77 firstLine : rest ->
70 firstLine : rest ->
78 let
71 let
@@ -112,3 +105,28 @@ addLineNumber maybeSubRegion width n line =
112 replicate (width - length number) ' ' ++ number
105 replicate (width - length number) ' ' ++ number
113 ++ "|" ++ maybe " " spacer maybeSubRegion
106 ++ "|" ++ maybe " " spacer maybeSubRegion
114 ++ line
107 ++ line
108+
109+
110+singleLineRegion :: Int -> String -> (Int, Int, Int, Int) -> String
111+singleLineRegion lineNum sourceLine (start, innerStart, innerEnd, end) =
112+ let
113+ w = length (show (lineNum + 1))
114+
115+ number =
116+ addLineNumber Nothing w
117+
118+ underline =
119+ replicate (innerStart - 1) ' '
120+ ++ replicate (max 1 (innerEnd - innerStart)) '^'
121+
122+ trimmedSourceLine =
123+ sourceLine
124+ |> drop (start - 1)
125+ |> take (end - start + 1)
126+ |> (++) (replicate (start - 1) ' ')
127+ in
128+ unlines
129+ [ number (lineNum-1) ""
130+ , number lineNum trimmedSourceLine
131+ , number (lineNum+1) underline
132+ ]