language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 16:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Don't parse twice in ReplState::step

Browse source
This commit is contained in:
Brian Carroll 2023-09-10 18:36:41 +01:00
parent ead3c33eb8
commit b8e66d08de
No known key found for this signature in database
GPG key ID: 5C7B2EC4101703C0
1 changed files with 9 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/repl_ui/src/repl_state.rs
View file

@ -62,28 +62,12 @@ impl ReplState {
line: &str, line: &str,
target_info: TargetInfo, target_info: TargetInfo,
palette: Palette, palette: Palette,
) -> ReplAction<'a> {
match parse_src(arena, line) {
ParseOutcome::Empty | ParseOutcome::Help => ReplAction::Help,
ParseOutcome::Expr(_)
| ParseOutcome::ValueDef(_)
| ParseOutcome::TypeDef(_)
| ParseOutcome::SyntaxErr
| ParseOutcome::Incomplete => self.next_action(arena, line, target_info, palette),
ParseOutcome::Exit => ReplAction::Exit,
}
}
fn next_action<'a>(
&mut self,
arena: &'a Bump,
src: &str,
target_info: TargetInfo,
palette: Palette,
) -> ReplAction<'a> { ) -> ReplAction<'a> {
let pending_past_def; let pending_past_def;
let mut opt_var_name; let mut opt_var_name;
let src = match parse_src(arena, src) { let src: &str = match parse_src(arena, line) {
ParseOutcome::Empty | ParseOutcome::Help => return ReplAction::Help,
ParseOutcome::Exit => return ReplAction::Exit,
ParseOutcome::Expr(_) | ParseOutcome::Incomplete | ParseOutcome::SyntaxErr => { ParseOutcome::Expr(_) | ParseOutcome::Incomplete | ParseOutcome::SyntaxErr => {
pending_past_def = None; pending_past_def = None;
// If it's a SyntaxErr (or Incomplete at this point, meaning it will // If it's a SyntaxErr (or Incomplete at this point, meaning it will
@ -91,7 +75,7 @@ impl ReplState {
// proceed as normal and let the error reporting happen during eval. // proceed as normal and let the error reporting happen during eval.
opt_var_name = None; opt_var_name = None;
src line
} }
ParseOutcome::ValueDef(value_def) => { ParseOutcome::ValueDef(value_def) => {
match value_def { match value_def {
@ -103,7 +87,7 @@ impl ReplState {
_, _,
) => { ) => {
// Record the standalone type annotation for future use. // Record the standalone type annotation for future use.
self.add_past_def(ident.trim_end().to_string(), src.to_string()); self.add_past_def(ident.trim_end().to_string(), line.to_string());
// Return early without running eval, since standalone annotations // Return early without running eval, since standalone annotations
// cannot be evaluated as expressions. // cannot be evaluated as expressions.
@ -124,7 +108,7 @@ impl ReplState {
}, },
.. ..
} => { } => {
pending_past_def = Some((ident.to_string(), src.to_string())); pending_past_def = Some((ident.to_string(), line.to_string()));
opt_var_name = Some(ident.to_string()); opt_var_name = Some(ident.to_string());
// Recreate the body of the def and then evaluate it as a lookup. // Recreate the body of the def and then evaluate it as a lookup.
@ -132,11 +116,11 @@ impl ReplState {
// if we just did a lookup on the past def, then errors wouldn't get // if we just did a lookup on the past def, then errors wouldn't get
// reported because we filter out errors whose regions are in past defs. // reported because we filter out errors whose regions are in past defs.
let mut buf = bumpalo::collections::string::String::with_capacity_in( let mut buf = bumpalo::collections::string::String::with_capacity_in(
ident.len() + src.len() + 1, ident.len() + line.len() + 1,
arena, arena,
); );
buf.push_str(src); buf.push_str(line);
buf.push('\n'); buf.push('\n');
buf.push_str(ident); buf.push_str(ident);
@ -183,13 +167,12 @@ impl ReplState {
.. ..
}) => { }) => {
// Record the type for future use. // Record the type for future use.
self.add_past_def(ident.trim_end().to_string(), src.to_string()); self.add_past_def(ident.trim_end().to_string(), line.to_string());
// Return early without running eval, since none of these // Return early without running eval, since none of these
// can be evaluated as expressions. // can be evaluated as expressions.
return ReplAction::Nothing; return ReplAction::Nothing;
} }
ParseOutcome::Empty | ParseOutcome::Help | ParseOutcome::Exit => unreachable!(),
}; };
// Record e.g. "val1" as a past def, unless our input was exactly the name of // Record e.g. "val1" as a past def, unless our input was exactly the name of