language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix region issue in record fields

Browse source
This commit is contained in:
Folkert 2021-02-20 19:15:08 +01:00
parent a6fbf55390
commit 9f60ba2557
1 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

49
compiler/parse/src/pattern.rs
View file

@ -324,7 +324,7 @@ fn record_pattern_help<'a>(min_indent: u16) -> impl Parser<'a, Pattern<'a>, PRec
let (_, (fields, final_comments), state) = collection_trailing_sep_e!( let (_, (fields, final_comments), state) = collection_trailing_sep_e!(
// word1_check_indent!(b'{', PRecord::Open, min_indent, PRecord::IndentOpen), // word1_check_indent!(b'{', PRecord::Open, min_indent, PRecord::IndentOpen),
word1(b'{', PRecord::Open), word1(b'{', PRecord::Open),
loc!(record_pattern_field(min_indent)), record_pattern_field(min_indent),
word1(b',', PRecord::End), word1(b',', PRecord::End),
// word1_check_indent!(b'}', PRecord::End, min_indent, PRecord::IndentEnd), // word1_check_indent!(b'}', PRecord::End, min_indent, PRecord::IndentEnd),
word1(b'}', PRecord::End), word1(b'}', PRecord::End),
@ -344,7 +344,7 @@ fn record_pattern_help<'a>(min_indent: u16) -> impl Parser<'a, Pattern<'a>, PRec
} }
} }
fn record_pattern_field<'a>(min_indent: u16) -> impl Parser<'a, Pattern<'a>, PRecord<'a>> { fn record_pattern_field<'a>(min_indent: u16) -> impl Parser<'a, Located<Pattern<'a>>, PRecord<'a>> {
use crate::parser::Either::*; use crate::parser::Either::*;
move |arena, state: State<'a>| { move |arena, state: State<'a>| {
@ -377,15 +377,23 @@ fn record_pattern_field<'a>(min_indent: u16) -> impl Parser<'a, Pattern<'a>, PRe
space0_before_e(val_parser, min_indent, PRecord::Space, PRecord::IndentColon) space0_before_e(val_parser, min_indent, PRecord::Space, PRecord::IndentColon)
.parse(arena, state)?; .parse(arena, state)?;
// let Located { value, region } = loc_val; let Located {
value: label,
region,
} = loc_label;
let region = Region::span_across(&region, &loc_val.region);
Ok(( Ok((
MadeProgress, MadeProgress,
Pattern::RequiredField( Located::at(
loc_label.value, region,
// TODO spaces are dropped here Pattern::RequiredField(
// arena.alloc(arena.alloc(value).with_spaces_before(spaces, region)), label,
arena.alloc(loc_val), // TODO spaces are dropped here
// arena.alloc(arena.alloc(value).with_spaces_before(spaces, region)),
arena.alloc(loc_val),
),
), ),
state, state,
)) ))
@ -398,15 +406,23 @@ fn record_pattern_field<'a>(min_indent: u16) -> impl Parser<'a, Pattern<'a>, PRe
space0_before_e(val_parser, min_indent, PRecord::Space, PRecord::IndentColon) space0_before_e(val_parser, min_indent, PRecord::Space, PRecord::IndentColon)
.parse(arena, state)?; .parse(arena, state)?;
// let Located { value, region } = loc_val; let Located {
value: label,
region,
} = loc_label;
let region = Region::span_across(&region, &loc_val.region);
Ok(( Ok((
MadeProgress, MadeProgress,
Pattern::OptionalField( Located::at(
loc_label.value, region,
// TODO spaces are dropped Pattern::OptionalField(
// arena.alloc(arena.alloc(value).with_spaces_before(spaces, region)), label,
arena.alloc(loc_val), // TODO spaces are dropped
// arena.alloc(arena.alloc(value).with_spaces_before(spaces, region)),
arena.alloc(loc_val),
),
), ),
state, state,
)) ))
@ -414,15 +430,14 @@ fn record_pattern_field<'a>(min_indent: u16) -> impl Parser<'a, Pattern<'a>, PRe
// If no value was provided, record it as a Var. // If no value was provided, record it as a Var.
// Canonicalize will know what to do with a Var later. // Canonicalize will know what to do with a Var later.
None => { None => {
let Located { value, region } = loc_label;
let value = if !spaces.is_empty() { let value = if !spaces.is_empty() {
let Located { value, .. } = loc_label;
Pattern::SpaceAfter(arena.alloc(Pattern::Identifier(value)), spaces) Pattern::SpaceAfter(arena.alloc(Pattern::Identifier(value)), spaces)
} else { } else {
let Located { value, .. } = loc_label;
Pattern::Identifier(value) Pattern::Identifier(value)
}; };
Ok((MadeProgress, value, state)) Ok((MadeProgress, Located::at(region, value), state))
} }
} }
} }