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

bug fixes involving IdentId

Browse source
This commit is contained in:
Anton-4 2021-10-11 20:16:22 +02:00
parent 03d9d41a7a
commit 37ba50e746
17 changed files with 83 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

3
code_markup/src/markup/convert/from_def2.rs
View file

@ -44,8 +44,7 @@ pub fn def2_to_markup<'a, 'b>(
expr_mn_id,
ast_node_id,
mark_node_pool,
env,
interns,
env
)?;
mark_node_pool.add(tld_mn)

17
code_markup/src/markup/convert/from_expr2.rs
View file

@ -1,5 +1,5 @@
use crate::{markup::{attribute::Attributes, common_nodes::{new_arg_name_mn, new_blank_mn, new_colon_mn, new_comma_mn, new_equals_mn, new_func_name_mn, new_left_accolade_mn, new_left_square_mn, new_operator_mn, new_right_accolade_mn, new_right_square_mn}, nodes::{MarkupNode, get_string, new_markup_node}}, slow_pool::{MarkNodeId, SlowPool}, syntax_highlight::HighlightStyle};
use crate::{markup::{attribute::Attributes, common_nodes::{new_arg_name_mn, new_blank_mn, new_colon_mn, new_comma_mn, new_equals_mn, new_left_accolade_mn, new_left_square_mn, new_operator_mn, new_right_accolade_mn, new_right_square_mn}, nodes::{MarkupNode, get_string, new_markup_node}}, slow_pool::{MarkNodeId, SlowPool}, syntax_highlight::HighlightStyle};
use bumpalo::Bump;
use itertools::Itertools;
@ -18,9 +18,11 @@ pub fn expr2_to_markup<'a, 'b>(
mark_node_pool: &mut SlowPool,
interns: &Interns,
) -> ASTResult<MarkNodeId> {
dbg!(expr2);
let ast_node_id = ASTNodeId::AExprId(expr2_node_id);
println!("{:?}", expr2);
let mark_node_id = match expr2 {
Expr2::SmallInt { text, .. }
| Expr2::I128 { text, .. }
@ -214,19 +216,12 @@ pub fn expr2_to_markup<'a, 'b>(
}
Expr2::Closure{
function_type:_,
name,
uniq_symbol:_,
recursive:_,
args,
body_id,
extra:_
} => {
let func_name = name.ident_str(interns).as_str();
let func_name_mn =
new_func_name_mn(func_name.to_string(), expr2_node_id);
let func_name_mn_id = mark_node_pool.add(func_name_mn);
let backslash_mn = new_operator_mn("\\".to_string(), expr2_node_id, None);
let backslash_mn_id = mark_node_pool.add(backslash_mn);
@ -289,7 +284,7 @@ pub fn expr2_to_markup<'a, 'b>(
let function_node = MarkupNode::Nested {
ast_node_id,
children_ids: vec![func_name_mn_id, args_mn_id, body_mn_id],
children_ids: vec![args_mn_id, body_mn_id],
parent_id_opt: None,
newlines_at_end: 0,
};