git.iko.soy/elk
on master help sign in
improve error message when } is not indented enough
11ffbf5Evan Czaplicki
compiler/src/Reporting/Error/Syntax.hs+73−31
compare with master
unifiedsplit
@@ -3977,21 +3977,42 @@ toRecordReport source context record startRow startCol =
3977 )
3977 )
3978
3978
3979 RecordIndentEnd row col ->
3979 RecordIndentEnd row col ->
3980+ case Code.nextLineStartsWithCloseCurly source row of
3981+ Just (curlyRow, curlyCol) ->
3980− let
3982+ let
3983+ surroundings = A.Region (A.Position startRow startCol) (A.Position curlyRow curlyCol)
3984+ region = toRegion curlyRow curlyCol
3985+ in
3986+ Report.Report "NEED MORE INDENTATION" region [] $
3987+ Code.toSnippet source surroundings (Just region)
3988+ (
3989+ D.reflow $
3990+ "I was partway through parsing a record, but I got stuck here:"
3991+ ,
3992+ D.stack
3993+ [ D.reflow $
3994+ "I need this curly brace to be indented more. Try adding some spaces before it!"
3995+ , noteForRecordError
3996+ ]
3997+ )
3998+
3999+ Nothing ->
4000+ let
3981− surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
4001+ surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
3982− region = toRegion row col
4002+ region = toRegion row col
3983− in
4003+ in
3984− Report.Report "UNFINISHED RECORD" region [] $
4004+ Report.Report "UNFINISHED RECORD" region [] $
3985− Code.toSnippet source surroundings (Just region)
4005+ Code.toSnippet source surroundings (Just region)
3986− (
4006+ (
3987− D.reflow $
4007+ D.reflow $
3988− "I was expecting to see a closing curly brace next:"
4008+ "I was partway through parsing a record, but I got stuck here:"
3989− ,
4009+ ,
3990− addNoteForRecordIndentError $
4010+ addNoteForRecordIndentError $
3991− D.fillSep $
4011+ D.fillSep $
4012+ ["I","was","expecting","to","see","a","closing","curly","brace","next."
3992− ["Try","putting","an",D.green "}","and","see","if","that","helps?"
4013+ ,"Try","putting","a",D.green "}","next","and","see","if","that","helps?"
3993− ]
4014+ ]
3994− )
4015+ )
3995
4016
3996 RecordIndentField row col ->
4017 RecordIndentField row col ->
3997 let
4018 let
@@ -5384,23 +5405,44 @@ toTRecordReport source context record startRow startCol =
5384 )
5405 )
5385
5406
5386 TRecordIndentEnd row col ->
5407 TRecordIndentEnd row col ->
5408+ case Code.nextLineStartsWithCloseCurly source row of
5409+ Just (curlyRow, curlyCol) ->
5387− let
5410+ let
5388− surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
5411+ surroundings = A.Region (A.Position startRow startCol) (A.Position curlyRow curlyCol)
5389− region = toRegion row col
5412+ region = toRegion curlyRow curlyCol
5390− in
5413+ in
5391− Report.Report "UNFINISHED RECORD TYPE" region [] $
5414+ Report.Report "NEED MORE INDENTATION" region [] $
5392− Code.toSnippet source surroundings (Just region)
5415+ Code.toSnippet source surroundings (Just region)
5393− (
5416+ (
5394− D.reflow $
5417+ D.reflow $
5395− "I was expecting to see a closing curly brace next:"
5418+ "I was partway through parsing a record type, but I got stuck here:"
5396− ,
5419+ ,
5397− D.stack
5420+ D.stack
5398− [ D.fillSep $
5421+ [ D.reflow $
5399− ["Try","putting","an",D.green "}","and","see","if","that","helps?"
5422+ "I need this curly brace to be indented more. Try adding some spaces before it!"
5423+ , noteForRecordTypeError
5400 ]
5424 ]
5425+ )
5426+
5427+ Nothing ->
5428+ let
5429+ surroundings = A.Region (A.Position startRow startCol) (A.Position row col)
5430+ region = toRegion row col
5431+ in
5432+ Report.Report "UNFINISHED RECORD TYPE" region [] $
5433+ Code.toSnippet source surroundings (Just region)
5434+ (
5435+ D.reflow $
5436+ "I was partway through parsing a record type, but I got stuck here:"
5437+ ,
5438+ D.stack
5439+ [ D.fillSep $
5440+ ["I","was","expecting","to","see","a","closing","curly","brace","next."
5441+ ,"Try","putting","a",D.green "}","next","and","see","if","that","helps?"
5442+ ]
5401− , noteForRecordTypeIndentError
5443+ , noteForRecordTypeIndentError
5402− ]
5444+ ]
5403− )
5445+ )
5404
5446
5405 TRecordIndentField row col ->
5447 TRecordIndentField row col ->
5406 let
5448 let
compiler/src/Reporting/Render/Code.hs+16
@@ -8,6 +8,7 @@ module Reporting.Render.Code
8 , Next(..)
8 , Next(..)
9 , whatIsNext
9 , whatIsNext
10 , nextLineStartsWithKeyword
10 , nextLineStartsWithKeyword
11+ , nextLineStartsWithCloseCurly
11 )
12 )
12 where
13 where
13
14
@@ -259,3 +260,18 @@ nextLineStartsWithKeyword keyword (Source sourceLines) row =
259 Just (row + 1, 1 + fromIntegral (length (takeWhile (==' ') line)))
260 Just (row + 1, 1 + fromIntegral (length (takeWhile (==' ') line)))
260 else
261 else
261 Nothing
262 Nothing
263+
264+
265+nextLineStartsWithCloseCurly :: Source -> Row -> Maybe (Row, Col)
266+nextLineStartsWithCloseCurly (Source sourceLines) row =
267+ case List.lookup (row + 1) sourceLines of
268+ Nothing ->
269+ Nothing
270+
271+ Just line ->
272+ case dropWhile (==' ') line of
273+ '}':_ ->
274+ Just (row + 1, 1 + fromIntegral (length (takeWhile (==' ') line)))
275+
276+ _ ->
277+ Nothing