language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 06:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge remote-tracking branch 'origin/trunk' into builtins-in-roc

Browse source
This commit is contained in:
Folkert 2022-03-05 20:55:15 +01:00
commit adf4ad22a5
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
90 changed files with 3197 additions and 2191 deletions
Download patch file Download diff file Expand all files Collapse all files

31
compiler/parse/src/parser.rs
View file

@ -711,9 +711,8 @@ where
let cur_indent = INDENT.with(|i| *i.borrow());
println!(
"@{:>5}:{:<5}: {}{:<50}",
state.line,
state.column,
"{:>5?}: {}{:<50}",
state.pos(),
&indent_text[..cur_indent * 2],
self.message
);
@ -728,9 +727,8 @@ where
};
println!(
"@{:>5}:{:<5}: {}{:<50} {:<15} {:?}",
state.line,
state.column,
"{:<5?}: {}{:<50} {:<15} {:?}",
state.pos(),
&indent_text[..cur_indent * 2],
self.message,
format!("{:?}", progress),
@ -1217,7 +1215,11 @@ macro_rules! collection_trailing_sep_e {
$indent_problem
)
),
$crate::blankspace::space0_e($min_indent, $indent_problem)
$crate::blankspace::space0_e(
// we use min_indent=0 because we want to parse incorrectly indented closing braces
// and later fix these up in the formatter.
0 /* min_indent */,
$indent_problem)
).parse(arena, state)?;
let (_,_, state) =
@ -1404,21 +1406,6 @@ where
}
}
pub fn check_indent<'a, TE, E>(min_indent: u32, to_problem: TE) -> impl Parser<'a, (), E>
where
TE: Fn(Position) -> E,
E: 'a,
{
move |_arena, state: State<'a>| {
dbg!(state.indent_column, min_indent);
if state.indent_column < min_indent {
Err((NoProgress, to_problem(state.pos()), state))
} else {
Ok((NoProgress, (), state))
}
}
}
#[macro_export]
macro_rules! word1_check_indent {
($word:expr, $word_problem:expr, $min_indent:expr, $indent_problem:expr) => {