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

Require newline after import

Browse source
This commit is contained in:
Agus Zubiaga 2024-05-06 22:15:52 -03:00
parent 007e03891e
commit 8418610dd9
No known key found for this signature in database
4 changed files with 52 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/compiler/parse/src/expr.rs
View file

@ -969,8 +969,8 @@ fn import_body<'a>() -> impl Parser<'a, ValueDef<'a>, EImport<'a>> {
record!(ModuleImport {
before_name: space0_e(EImport::IndentStart),
name: loc!(imported_module_name()),
alias: optional(backtrackable(import_as())),
exposed: optional(backtrackable(import_exposing()))
alias: optional(import_as()),
exposed: optional(import_exposing())
}),
ValueDef::ModuleImport
)
@ -2873,11 +2873,28 @@ fn dbg_help<'a>(options: ExprParseOptions) -> impl Parser<'a, Expr<'a>, EExpect<
fn import_help<'a>(options: ExprParseOptions) -> impl Parser<'a, Expr<'a>, EExpr<'a>> {
move |arena: &'a Bump, state: State<'a>, min_indent: u32| {
let original_pos = state.pos();
let (_, import_def, state) =
loc!(specialize_err(EExpr::Import, import())).parse(arena, state, min_indent)?;
let (_, spaces_after_import, state) =
space0_e(EExpr::IndentEnd).parse(arena, state, min_indent)?;
if !spaces_after_import.iter().any(|s| s.is_newline()) {
return Err((
MadeProgress,
EExpr::Import(EImport::EndNewline(state.pos()), original_pos),
));
}
let mut defs = Defs::default();
defs.push_value_def(import_def.value, import_def.region, &[], &[]);
defs.push_value_def(
import_def.value,
import_def.region,
&[],
spaces_after_import,
);
parse_defs_expr(options, min_indent, defs, arena, state)
}