finished if highlighting

code_markup/src/markup/common_nodes.rs

@@ -1,25 +1,17 @@
-use crate::{syntax_highlight::HighlightStyle, slow_pool::MarkNodeId};
+use crate::{syntax_highlight::HighlightStyle, slow_pool::{MarkNodeId, SlowPool}};
 
-use super::{attribute::Attributes, nodes, nodes::MarkupNode};
+use super::{attribute::Attributes, nodes::{self, make_nested_mn}, nodes::MarkupNode};
 
 pub fn new_equals_mn() -> MarkupNode {
-    MarkupNode::Text {
+    common_text_node(nodes::EQUALS.to_owned(), HighlightStyle::Operator, 0)
-        content: nodes::EQUALS.to_owned(),
-        syn_high_style: HighlightStyle::Operator,
-        attributes: Attributes::default(),
-        parent_id_opt: None,
-        newlines_at_end: 0,
-    }
 }
 
 pub fn new_comma_mn() -> MarkupNode {
-    MarkupNode::Text {
+    common_text_node(nodes::COMMA.to_owned(), HighlightStyle::Operator, 0)
-        content: nodes::COMMA.to_owned(),
-        syn_high_style: HighlightStyle::Comma,
-        attributes: Attributes::default(),
-        parent_id_opt: None,
-        newlines_at_end: 0,
 }
+
+pub fn new_dot_mn() -> MarkupNode {
+    common_text_node(nodes::DOT.to_owned(), HighlightStyle::Operator, 0)
 }
 
 pub fn new_blank_mn() -> MarkupNode {
@@ -47,102 +39,98 @@ pub fn new_colon_mn() -> MarkupNode {
 pub fn new_operator_mn(
     content: String,
 ) -> MarkupNode {
-    MarkupNode::Text {
+    common_text_node(content, HighlightStyle::Operator, 0)
-        content,
-        syn_high_style: HighlightStyle::Operator,
-        attributes: Attributes::default(),
-        parent_id_opt: None,
-        newlines_at_end: 0,
-    }
 }
 
 pub fn new_left_accolade_mn() -> MarkupNode {
-    MarkupNode::Text {
+    common_text_node(nodes::LEFT_ACCOLADE.to_owned(), HighlightStyle::Bracket, 0)
-        content: nodes::LEFT_ACCOLADE.to_owned(),
-        syn_high_style: HighlightStyle::Bracket,
-        attributes: Attributes::default(),
-        parent_id_opt: None,
-        newlines_at_end: 0,
-    }
 }
 
 pub fn new_right_accolade_mn() -> MarkupNode {
-    MarkupNode::Text {
+    common_text_node(nodes::RIGHT_ACCOLADE.to_owned(), HighlightStyle::Bracket, 0)
-        content: nodes::RIGHT_ACCOLADE.to_owned(),
-        syn_high_style: HighlightStyle::Bracket,
-        attributes: Attributes::default(),
-        parent_id_opt: None,
-        newlines_at_end: 0,
-    }
 }
 
 pub fn new_left_square_mn() -> MarkupNode {
-    MarkupNode::Text {
+    common_text_node(nodes::LEFT_SQUARE_BR.to_owned(), HighlightStyle::Bracket, 0)
-        content: nodes::LEFT_SQUARE_BR.to_owned(),
-        syn_high_style: HighlightStyle::Bracket,
-        attributes: Attributes::default(),
-        parent_id_opt: None,
-        newlines_at_end: 0,
-    }
 }
 
 pub fn new_right_square_mn() -> MarkupNode {
-    MarkupNode::Text {
+    common_text_node(nodes::RIGHT_SQUARE_BR.to_owned(), HighlightStyle::Bracket, 0)
-        content: nodes::RIGHT_SQUARE_BR.to_owned(),
-        syn_high_style: HighlightStyle::Bracket,
-        attributes: Attributes::default(),
-        parent_id_opt: None,
-        newlines_at_end: 0,
-    }
 }
 
 pub fn new_func_name_mn(content: String) -> MarkupNode {
-    MarkupNode::Text {
+    common_text_node(content, HighlightStyle::FunctionName, 0)
-        content,
-        syn_high_style: HighlightStyle::FunctionName,
-        attributes: Attributes::default(),
-        parent_id_opt: None,
-        newlines_at_end: 0,
-    }
 }
 
 pub fn new_arg_name_mn(content: String) -> MarkupNode {
-    MarkupNode::Text {
+    common_text_node(content, HighlightStyle::FunctionArgName, 0)
-        content,
-        syn_high_style: HighlightStyle::FunctionArgName,
-        attributes: Attributes::default(),
-        parent_id_opt: None,
-        newlines_at_end: 0,
-    }
 }
 
 pub fn new_arrow_mn(newlines_at_end: usize) -> MarkupNode {
-    MarkupNode::Text {
+    common_text_node(nodes::ARROW.to_owned(), HighlightStyle::Operator, newlines_at_end)
-        content: nodes::ARROW.to_owned(),
-        syn_high_style: HighlightStyle::Operator,
-        attributes: Attributes::default(),
-        parent_id_opt: None,
-        newlines_at_end,
-    }
 }
 
 pub fn new_comments_mn(
-    comments: String,
+    comment: String,
     newlines_at_end: usize,
+) -> MarkupNode {
+    common_text_node(comment, HighlightStyle::Comment, newlines_at_end)
+}
+
+fn common_text_node(
+    content: String,
+    highlight_style: HighlightStyle,
+    newlines_at_end: usize
 ) -> MarkupNode {
     MarkupNode::Text {
-        content: comments,
+        content,
-        syn_high_style: HighlightStyle::Comment,
+        syn_high_style: highlight_style,
         attributes: Attributes::default(),
         parent_id_opt: None,
         newlines_at_end,
     }
 }
 
-pub fn assign_mn(val_name_mn_id: MarkNodeId, equals_mn_id: MarkNodeId, expr_mark_node_id: MarkNodeId) -> MarkupNode {
+pub fn new_assign_mn(val_name_mn_id: MarkNodeId, equals_mn_id: MarkNodeId, expr_mark_node_id: MarkNodeId) -> MarkupNode {
-    MarkupNode::Nested {
+    make_nested_mn(vec![val_name_mn_id, equals_mn_id, expr_mark_node_id], 2)
-        children_ids: vec![val_name_mn_id, equals_mn_id, expr_mark_node_id],
+}
-        parent_id_opt: None,
+
-        newlines_at_end: 3,
+pub fn new_module_name_mn_id(mn_ids: Vec<MarkNodeId>, mark_node_pool: &mut SlowPool) -> MarkNodeId {
+    if mn_ids.len() == 1 {
+        *mn_ids.get(0).unwrap() // safe because we checked the length before
+    } else {
+        let nested_node = make_nested_mn(mn_ids, 0);
+        mark_node_pool.add(nested_node)
     }
 }
+
+pub fn new_module_var_mn(module_name_id: MarkNodeId, dot_id: MarkNodeId, ident_id: MarkNodeId) -> MarkupNode {
+    make_nested_mn(vec![module_name_id, dot_id, ident_id], 0)
+}
+
+pub fn if_mn() -> MarkupNode {
+    keyword_mn("if ")
+}
+
+pub fn then_mn() -> MarkupNode {
+    keyword_mn(" then ")
+}
+
+pub fn else_mn() -> MarkupNode {
+    keyword_mn(" else ")
+}
+
+fn keyword_mn(keyword: &str) -> MarkupNode {
+    common_text_node(keyword.to_owned(), HighlightStyle::Keyword, 0)
+}
+
+pub fn new_if_expr_mn(
+    if_mn_id: MarkNodeId,
+    cond_expr_mn_id: MarkNodeId,
+    then_mn_id: MarkNodeId,
+    then_expr_mn_id: MarkNodeId,
+    else_mn_id: MarkNodeId,
+    else_expr_mn_id: MarkNodeId,
+) -> MarkupNode {
+    make_nested_mn(vec![if_mn_id, cond_expr_mn_id, then_mn_id, then_expr_mn_id, else_mn_id, else_expr_mn_id], 1)
+}

code_markup/src/markup/mod.rs

@@ -4,4 +4,3 @@ pub mod convert;
 pub mod nodes;
 pub mod top_level_def;
 pub mod mark_id_ast_id_map;
-pub mod ast_context;

code_markup/src/markup/nodes.rs

@@ -245,6 +245,14 @@ impl MarkupNode {
     }
 }
 
+pub fn make_nested_mn(children_ids: Vec<MarkNodeId>, newlines_at_end: usize) -> MarkupNode {
+    MarkupNode::Nested {
+        children_ids,
+        parent_id_opt: None,
+        newlines_at_end,
+    }
+}
+
 pub fn get_string<'a>(env: &Env<'a>, pool_str: &PoolStr) -> String {
     pool_str.as_str(env.pool).to_owned()
 }
@@ -256,6 +264,7 @@ pub const LEFT_SQUARE_BR: &str = "[ ";
 pub const RIGHT_SQUARE_BR: &str = " ]";
 pub const COLON: &str = ": ";
 pub const COMMA: &str = ", ";
+pub const DOT: &str = ".";
 pub const STRING_QUOTES: &str = "\"\"";
 pub const EQUALS: &str = " = ";
 pub const ARROW: &str = " -> ";

code_markup/src/markup/top_level_def.rs

@@ -14,7 +14,7 @@ use crate::{
     syntax_highlight::HighlightStyle,
 };
 
-use super::{mark_id_ast_id_map::MarkIdAstIdMap, convert::from_def2::add_node, common_nodes::assign_mn};
+use super::{mark_id_ast_id_map::MarkIdAstIdMap, convert::from_def2::add_node, common_nodes::new_assign_mn};
 
 // represents for example: `main = "Hello, World!"`
 pub fn assignment_mark_node<'a>(
@@ -39,7 +39,7 @@ pub fn assignment_mark_node<'a>(
 
     let equals_mn_id = add_node(new_equals_mn(), ast_node_id, mark_node_pool, mark_id_ast_id_map);
 
-    Ok(assign_mn(val_name_mn_id, equals_mn_id, expr_mark_node_id))
+    Ok(new_assign_mn(val_name_mn_id, equals_mn_id, expr_mark_node_id))
 }
 
 pub fn tld_w_comments_mark_node(

code_markup/src/syntax_highlight.rs

@@ -6,7 +6,6 @@ use crate::colors::{from_hsb, RgbaTup};
 #[derive(Hash, Eq, PartialEq, Copy, Clone, Debug, Deserialize, Serialize)]
 pub enum HighlightStyle {
     Operator, // =+-<>...
-    Comma,
     String,
     FunctionName,
     FunctionArgName,
@@ -23,6 +22,7 @@ pub enum HighlightStyle {
     DocsComment,
     UppercaseIdent, // TODO remove other HighlightStyle subtypes of UppercaseIdent?
     LowercaseIdent, // TODO remove other HighlightStyle subtypes of LowercaseIdent?
+    Keyword, // if, else, when
 }
 
 pub fn default_highlight_map() -> HashMap<HighlightStyle, RgbaTup> {
@@ -33,7 +33,6 @@ pub fn default_highlight_map() -> HashMap<HighlightStyle, RgbaTup> {
     let mut highlight_map = HashMap::new();
     [
         (Operator, from_hsb(185, 50, 75)),
-        (Comma, from_hsb(258, 50, 90)),
         (String, from_hsb(346, 65, 97)),
         (FunctionName, almost_white),
         (FunctionArgName, from_hsb(225, 50, 100)),
@@ -50,6 +49,7 @@ pub fn default_highlight_map() -> HashMap<HighlightStyle, RgbaTup> {
         (DocsComment, from_hsb(258, 50, 90)), // TODO check color
         (UppercaseIdent, almost_white),
         (LowercaseIdent, from_hsb(225, 50, 100)),
+        (Keyword, almost_white),
     ]
     .iter()
     .for_each(|tup| {

docs/src/html.rs

@@ -30,7 +30,6 @@ pub fn mark_node_to_html(
 
             let css_class = match syn_high_style {
                 Operator => "operator",
-                Comma => "comma",
                 String => "string",
                 FunctionName => "function-name",
                 FunctionArgName => "function-arg-name",
@@ -47,6 +46,7 @@ pub fn mark_node_to_html(
                 DocsComment => "docs-comment",
                 UppercaseIdent => "uppercase-ident",
                 LowercaseIdent => "lowercase-ident",
+                Keyword => "keyword-ident",
             };
 
             write_html_to_buf(content, css_class, buf);

docs/tests/insert_syntax_highlighting.rs

@@ -98,7 +98,7 @@ mod insert_doc_syntax_highlighting {
     fn top_level_def_val_num() {
         expect_html_def(
             r#"myVal = 0"#,
-            "<span class=\"syntax-lowercase-ident\">myVal</span><span class=\"syntax-operator\"> = </span><span class=\"syntax-number\">0</span>\n\n\n",
+            "<span class=\"syntax-lowercase-ident\">myVal</span><span class=\"syntax-operator\"> = </span><span class=\"syntax-number\">0</span>\n\n",
         );
     }
 

highlight/src/highlight_parser.rs

@@ -1,6 +1,6 @@
 use peg::error::ParseError;
 use roc_code_markup::markup::attribute::Attributes;
-use roc_code_markup::markup::common_nodes::{new_equals_mn, assign_mn};
+use roc_code_markup::markup::common_nodes::{new_equals_mn, new_dot_mn, new_assign_mn, new_module_name_mn_id, new_module_var_mn, if_mn, then_mn, else_mn, new_if_expr_mn};
 use roc_code_markup::slow_pool::{SlowPool, MarkNodeId};
 use roc_code_markup::{syntax_highlight::HighlightStyle};
 use roc_code_markup::markup::nodes::MarkupNode;
@@ -15,6 +15,27 @@ use crate::tokenizer::{Token, TokenTable, full_tokenize};
 // license information can be found in the LEGAL_DETAILS file in
 // the root directory of this distribution.
 // Thank you zig contributors!
+
+/*
+HOW TO ADD NEW RULES:
+- go to highlight/tests/peg_grammar.rs
+- find for example a variant of common_expr that is not implemented yet, like `if_expr`
+- we add `if_expr()` to the `common_expr` rule, in the same order as in peg_grammar::common_expr()
+- we copy the if_expr rule from `peg_grammar.rs`
+- we add ` -> MarkNodeId` to the if_expr rule
+- we change the first full_expr in if_expr() to cond_e_id:full_expr(), the second to then_e_id:full_expr()...
+- we add if_mn(), else_mn(), then_mn() and new_if_expr_mn() to common_nodes.rs
+- we replace [T::KeywordIf],[T::KeywordThen]... with a new if(),... rule that adds an if,... node to the mark_node_pool.
+- we bundle everything together in a nested node and save it in the mn_pool:
+```
+{
+  mn_pool.add(
+    new_if_expr_mn(if_id, cond_e_id, then_id, then_e_id, else_id, else_e_id)
+  )
+}
+- we finsih up by adding a test: `test_highlight_if_expr`
+```
+*/
 peg::parser!{
     grammar highlightparser(t_table: &TokenTable, code_str: &str, mn_pool: &mut SlowPool) for [T] {
 
@@ -25,13 +46,33 @@ peg::parser!{
         opt_same_indent_expr()*
 
       rule opt_same_indent_expr() -> MarkNodeId =
-        [T::SameIndent]? e:full_expr() {e}
+        [T::SameIndent]? e_id:full_expr() {e_id}
 
       rule opt_same_indent_def() -> MarkNodeId =
-        [T::SameIndent]? d:def() {d}
+        [T::SameIndent]? d_id:def() {d_id}
 
       rule common_expr() -> MarkNodeId =
-        p:position!() [T::Number] { add_new_mn(t_table.extract_str(p, code_str), HighlightStyle::Number, mn_pool) }
+        if_expr()
+        / p:position!() [T::Number] { add_new_mn(t_table.extract_str(p, code_str), HighlightStyle::Number, mn_pool) }
+        / module_var()
+        / lowercase_ident()
+
+      rule if_expr() -> MarkNodeId =
+        if_id:if() cond_e_id:full_expr() then_id:then() then_e_id:full_expr() else_id:else_rule() else_e_id:full_expr()
+        {
+          mn_pool.add(
+            new_if_expr_mn(if_id, cond_e_id, then_id, then_e_id, else_id, else_e_id)
+          )
+        }
+
+      rule if() -> MarkNodeId =
+        [T::KeywordIf] {mn_pool.add(if_mn())}
+
+      rule then() -> MarkNodeId =
+        [T::KeywordThen] {mn_pool.add(then_mn())}
+
+      rule else_rule() -> MarkNodeId =
+        [T::KeywordElse] {mn_pool.add(else_mn())}
 
       pub rule def() -> MarkNodeId =
           // annotated_body()
@@ -45,15 +86,46 @@ peg::parser!{
 
       rule body() -> MarkNodeId =
           ident_id:ident() as_id:assign() [T::OpenIndent] e_id:full_expr() /*TODO not sure when this is needed> es:full_exprs()*/ ([T::CloseIndent] / end_of_file())
-          {mn_pool.add(assign_mn(ident_id, as_id, e_id)) }
+          {
+            mn_pool.add(
+              new_assign_mn(ident_id, as_id, e_id)
+            )
+          }
           /
           ident_id:ident() as_id:assign() e_id:full_expr() end_of_file()?
-          {mn_pool.add(assign_mn(ident_id, as_id, e_id)) }
+          {
+            mn_pool.add(
+              new_assign_mn(ident_id, as_id, e_id)
+            )
+          }
 
+      rule module_var() -> MarkNodeId =
+          mod_name_id:module_name() dot_id:dot() ident_id:lowercase_ident() {
+            mn_pool.add(
+              new_module_var_mn(mod_name_id, dot_id, ident_id)
+            ) 
+          }
+
+      rule module_name() -> MarkNodeId =
+          first_ident_id:uppercase_ident() rest_ids:dot_idents() {
+            new_module_name_mn_id(
+              merge_ids(first_ident_id, rest_ids),
+              mn_pool
+            )
+          }
 
       rule assign() -> MarkNodeId =
         [T::OpAssignment] { mn_pool.add(new_equals_mn()) }
 
+      rule dot() -> MarkNodeId =
+        [T::Dot] { mn_pool.add(new_dot_mn()) }
+
+      rule dot_ident() -> (MarkNodeId, MarkNodeId) =
+        dot_id:dot() ident_id:uppercase_ident() { (dot_id, ident_id) }
+
+      rule dot_idents() -> Vec<MarkNodeId> =
+        di:dot_ident()* {flatten_tups(di)}
+
       rule ident() -> MarkNodeId =
         uppercase_ident()
         / lowercase_ident()
@@ -69,6 +141,21 @@ peg::parser!{
       
     }
 }
+fn merge_ids(
+  mn_id: MarkNodeId,
+  other_mn_id: Vec<MarkNodeId>
+) -> Vec<MarkNodeId> {
+  let mut ids = vec![mn_id];
+  let mut rest_ids: Vec<usize> = other_mn_id;
+
+  ids.append(&mut rest_ids);
+
+  ids
+}
+
+fn flatten_tups(tup_vec: Vec<(MarkNodeId, MarkNodeId)>) -> Vec<MarkNodeId> {
+  tup_vec.iter().flat_map(|(a,b)| vec![*a, *b]).collect()
+}
 
 fn add_new_mn(
   text: &str,
@@ -97,34 +184,46 @@ pub fn highlight_defs(code_str: &str, mark_node_pool: &mut SlowPool) -> Result<V
   highlightparser::module_defs(&token_table.tokens, &token_table, code_str, mark_node_pool)
 }
 
-/*pub fn highlight_temp(code_str: &str, mark_node_pool: &mut SlowPool) -> Result<MarkNodeId, ParseError<usize>> {
-  let token_table = full_tokenize(code_str);
-
-  highlightparser::def(&token_table.tokens, &token_table, code_str, mark_node_pool)
-}*/
-
-
 #[cfg(test)]
 pub mod highlight_tests {
     use roc_code_markup::{slow_pool::{SlowPool}, markup::nodes::{node_to_string_w_children}};
 
     use crate::highlight_parser::{highlight_expr, highlight_defs};
 
-  #[test]
+  fn test_highlight_expr(input: &str, expected_output: &str) {
-  fn test_highlight() {
     let mut mark_node_pool = SlowPool::default();
 
-    let mark_id = highlight_expr("0", &mut mark_node_pool).unwrap();
+    let mark_id = highlight_expr(input, &mut mark_node_pool).unwrap();
+
+    let mut str_buffer = String::new();
+
+    node_to_string_w_children(
+      mark_id,
+      &mut str_buffer,
+      &mark_node_pool
+    );
 
     assert_eq!(
-      &mark_node_pool
+      &str_buffer,
-      .get(
+      expected_output
-        mark_id
-      ).get_content(),
-      "0"
     );
   }
 
+  #[test]
+  fn test_highlight() {
+    test_highlight_expr("0","0");
+  }
+
+  #[test]
+  fn test_highlight_module_var() {
+    test_highlight_expr("Foo.Bar.var","Foo.Bar.var");
+  }
+
+  #[test]
+  fn test_highlight_if_expr() {
+    test_highlight_expr("if booly then 42 else 31415", "if booly then 42 else 31415\n")
+  }
+
   #[test]
   fn test_highlight_defs() {
     let mut mark_node_pool = SlowPool::default();
@@ -140,7 +239,7 @@ pub mod highlight_tests {
 
     assert_eq!(
       &str_buffer,
-      "a = 0\n\n\n"
+      "a = 0\n\n"
     );
   }
 

highlight/src/lib.rs

@@ -1,2 +1,2 @@
-mod tokenizer;
+pub mod tokenizer;
 pub mod highlight_parser;

highlight/src/tokenizer.rs

@@ -234,27 +234,6 @@
 }
 
 impl TokenTable {
-      pub fn new(text: &str) -> TokenTable {
-          let mut tt = TokenTable {
-              tokens: Vec::new(),
-              offsets: Vec::new(),
-              lengths: Vec::new(),
-          };
-  
-          let mut offset = 0;
-          let mut state = LexState::new();
-  
-          // while let Some((token, skip, length)) = Token::lex_single(&mut state, &text.as_bytes()[offset..]) {
-          //     tt.tokens.push(token);
-          //     offset += skip;
-          //     tt.offsets.push(offset);
-          //     offset += length;
-          //     tt.lengths.push(length);
-          // }
-  
-          tt
-      }
-
     pub fn extract_str<'a>(&self, index: usize, content: &'a str) -> &'a str {
       // TODO remove unwrap
       let len = *self.lengths.get(index).unwrap();