language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Have repl validator accept top level defs

Browse source
This commit is contained in:
Richard Feldman 2022-10-25 08:30:22 -04:00
parent ba6457779d
commit 63c7b90113
No known key found for this signature in database
GPG key ID: F1F21AA5B1D9E43B
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/repl_cli/src/lib.rs
View file

@ -20,7 +20,7 @@ use roc_gen_llvm::{run_jit_function, run_jit_function_dynamic_type};
use roc_load::{EntryPoint, MonomorphizedModule};
use roc_mono::ir::OptLevel;
use roc_parse::ast::Expr;
use roc_parse::parser::{EClosure, EExpr, SyntaxError};
use roc_parse::parser::{EClosure, EExpr, Parser, SyntaxError};
use roc_repl_eval::eval::jit_to_ast;
use roc_repl_eval::gen::{compile_to_mono, format_answer, ReplOutput};
use roc_repl_eval::{ReplApp, ReplAppMemory};
@ -135,16 +135,31 @@ impl Validator for InputValidator {
} else {
let arena = bumpalo::Bump::new();
let state = roc_parse::state::State::new(ctx.input().trim().as_bytes());
match roc_parse::expr::parse_loc_expr(0, &arena, state) {
let answer = match roc_parse::expr::toplevel_defs(0).parse(&arena, state) {
// Special case some syntax errors to allow for multi-line inputs
Err((_, EExpr::DefMissingFinalExpr(_), _))
| Err((_, EExpr::DefMissingFinalExpr2(_, _), _))
| Err((_, EExpr::Closure(EClosure::Body(_, _), _), _)) => {
Ok(ValidationResult::Incomplete)
}
_ => Ok(ValidationResult::Valid(None)),
}
Err((_, _, state)) => {
// It wasn't a valid top-level decl, so continue parsing it as an expr.
match roc_parse::expr::parse_loc_expr(0, &arena, state) {
// Special case some syntax errors to allow for multi-line inputs
Err((_, EExpr::DefMissingFinalExpr(_), _))
| Err((_, EExpr::DefMissingFinalExpr2(_, _), _))
| Err((_, EExpr::Closure(EClosure::Body(_, _), _), _)) => {
Ok(ValidationResult::Incomplete)
}
_ => Ok(ValidationResult::Valid(None)),
}
}
Ok(_) => Ok(ValidationResult::Valid(None)),
};
// This is necessary to extend the lifetime of `arena`; without it,
// we get a borrow checker error!
answer
}
}
}