roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-11-11 05:34:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

added adjustment of grid_node_map and AST node when colon is entered

Browse Source
This commit is contained in:
Anton-4 2021-03-27 15:12:00 +01:00
parent 5d85ff8b07
commit bf0e755df4
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
editor/src/editor/mvc/ed_update.rs
View File

@ -319,7 +319,7 @@ pub fn handle_new_char(received_char: &char, ed_model: &mut EdModel) -> EdResult
ed_model.simple_move_carets_right(); ed_model.simple_move_carets_right();
} }
// update mapping from possible caret positions to MarkNodeId's // update GridNodeMap
ed_model.grid_node_map.add_to_line( ed_model.grid_node_map.add_to_line(
old_caret_pos.line, old_caret_pos.line,
nodes::LEFT_ACCOLADE.len(), nodes::LEFT_ACCOLADE.len(),
@ -349,7 +349,7 @@ pub fn handle_new_char(received_char: &char, ed_model: &mut EdModel) -> EdResult
let ast_node_ref = ed_model.module.env.pool.get(ast_node_id); let ast_node_ref = ed_model.module.env.pool.get(ast_node_id);
match ast_node_ref { match ast_node_ref {
Expr2::Record { record_var:_, fields:_ } => { Expr2::Record { record_var:_, fields } => {
// update Markup // update Markup
let record_colon = nodes::COLON; let record_colon = nodes::COLON;
@ -386,9 +386,32 @@ pub fn handle_new_char(received_char: &char, ed_model: &mut EdModel) -> EdResult
ed_model.simple_move_carets_right(); ed_model.simple_move_carets_right();
} }
// TODO update grid_node_map // update GridNodeMap
ed_model.grid_node_map.add_to_line(
old_caret_pos.line,
nodes::COLON.len(),
record_colon_node_id,
)?;
// TODO update AST node ed_model.grid_node_map.add_to_line(
old_caret_pos.line,
nodes::BLANK_PLACEHOLDER.len(),
record_blank_node_id,
)?;
// update AST node
let new_field_val = Expr2::Blank;
let new_field_val_id = ed_model.module.env.pool.add(new_field_val);
let first_field_mut =
fields
.iter_mut(ed_model.module.env.pool)
.next()
.with_context(
|| RecordWithoutFields {}
)?;
first_field_mut.2 = new_field_val_id;
} }
other => unimplemented!("TODO implement updating of Expr2 {:?}.", other) other => unimplemented!("TODO implement updating of Expr2 {:?}.", other)
} }