bug fixes involving IdentId

code_markup/src/markup/convert/from_def2.rs

@@ -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)

code_markup/src/markup/convert/from_expr2.rs

@@ -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,
             };

code_markup/src/markup/top_level_def.rs

@@ -1,14 +1,10 @@
-use roc_ast::{
-    ast_error::ASTResult,
-    lang::{
+use roc_ast::{ast_error::{ASTResult}, lang::{
         core::{
-            ast::ASTNodeId,
-            pattern::{get_identifier_string, PatternId},
+            ast::ASTNodeId
         },
         env::Env,
-    },
-};
-use roc_module::symbol::Interns;
+    }};
+use roc_module::symbol::{IdentId};
 
 use crate::{
     markup::{attribute::Attributes, common_nodes::new_equals_mn, nodes::MarkupNode},
@@ -17,19 +13,17 @@ use crate::{
 };
 
 pub fn tld_mark_node<'a>(
-    identifier_id: PatternId,
+    identifier_id: IdentId,
     expr_mark_node_id: MarkNodeId,
     ast_node_id: ASTNodeId,
     mark_node_pool: &mut SlowPool,
-    env: &Env<'a>,
-    interns: &Interns,
+    env: &Env<'a>
 ) -> ASTResult<MarkupNode> {
-    let pattern2 = env.pool.get(identifier_id);
-    dbg!(pattern2);
-    let val_name = get_identifier_string(pattern2, interns)?;
+    let val_name =
+        env.get_name_for_ident_id(identifier_id)?;
 
     let val_name_mn = MarkupNode::Text {
-        content: val_name,
+        content: val_name.to_owned(),
         ast_node_id,
         syn_high_style: HighlightStyle::Variable,
         attributes: Attributes::default(),