diff --git a/src/alejandra_engine/src/children.rs b/src/alejandra_engine/src/children.rs index 0f07843..6bb3791 100644 --- a/src/alejandra_engine/src/children.rs +++ b/src/alejandra_engine/src/children.rs @@ -15,10 +15,9 @@ pub enum Trivia { } impl Children { - pub fn new_with_configuration( + pub fn new( build_ctx: &crate::builder::BuildCtx, node: &rnix::SyntaxNode, - with_newlines: bool, ) -> Children { let mut children = Vec::new(); @@ -46,10 +45,7 @@ impl Children { }); } rnix::SyntaxKind::TOKEN_WHITESPACE => { - if with_newlines - && crate::utils::count_newlines(token.text()) - > 0 - { + if crate::utils::count_newlines(token.text()) > 0 { children.push(Child { element: token.clone().into(), pos: pos.clone(), @@ -72,13 +68,6 @@ impl Children { Children { children, current_index: 0 } } - pub fn new( - build_ctx: &crate::builder::BuildCtx, - node: &rnix::SyntaxNode, - ) -> Children { - Children::new_with_configuration(build_ctx, node, false) - } - pub fn get(&mut self, index: usize) -> Option { if index + 1 > self.children.len() { None diff --git a/src/alejandra_engine/src/parsers/if_else.rs b/src/alejandra_engine/src/parsers/if_else.rs index 54c3999..4e75b08 100644 --- a/src/alejandra_engine/src/parsers/if_else.rs +++ b/src/alejandra_engine/src/parsers/if_else.rs @@ -18,9 +18,7 @@ pub fn parse( ) -> IfElse { let mut if_else = IfElse::default(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); // if children.get_next().unwrap(); diff --git a/src/alejandra_engine/src/parsers/pattern.rs b/src/alejandra_engine/src/parsers/pattern.rs index 373a1f6..dac8390 100644 --- a/src/alejandra_engine/src/parsers/pattern.rs +++ b/src/alejandra_engine/src/parsers/pattern.rs @@ -23,9 +23,7 @@ pub fn parse( ) -> Pattern { let mut pattern = Pattern::default(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); // x @ let child = children.peek_next().unwrap(); diff --git a/src/alejandra_engine/src/rules/apply.rs b/src/alejandra_engine/src/rules/apply.rs index 56f6d0c..a60e2a0 100644 --- a/src/alejandra_engine/src/rules/apply.rs +++ b/src/alejandra_engine/src/rules/apply.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let vertical = children.has_comments() || children.has_newlines() diff --git a/src/alejandra_engine/src/rules/assert_and_with.rs b/src/alejandra_engine/src/rules/assert_and_with.rs index 9e4cdb4..4e5b766 100644 --- a/src/alejandra_engine/src/rules/assert_and_with.rs +++ b/src/alejandra_engine/src/rules/assert_and_with.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let vertical = children.has_comments() || children.has_newlines() diff --git a/src/alejandra_engine/src/rules/attr_set.rs b/src/alejandra_engine/src/rules/attr_set.rs index 4313e9e..478ef55 100644 --- a/src/alejandra_engine/src/rules/attr_set.rs +++ b/src/alejandra_engine/src/rules/attr_set.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let items_count = node .children_with_tokens() diff --git a/src/alejandra_engine/src/rules/bin_op_and_or_default.rs b/src/alejandra_engine/src/rules/bin_op_and_or_default.rs index 9c5e8d0..f422e88 100644 --- a/src/alejandra_engine/src/rules/bin_op_and_or_default.rs +++ b/src/alejandra_engine/src/rules/bin_op_and_or_default.rs @@ -12,9 +12,7 @@ pub fn rule_with_configuration( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let vertical = children.has_comments() || children.has_newlines() diff --git a/src/alejandra_engine/src/rules/dynamic.rs b/src/alejandra_engine/src/rules/dynamic.rs index 5ba940c..8f256bc 100644 --- a/src/alejandra_engine/src/rules/dynamic.rs +++ b/src/alejandra_engine/src/rules/dynamic.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let vertical = children.has_comments() || children.has_newlines() diff --git a/src/alejandra_engine/src/rules/inherit.rs b/src/alejandra_engine/src/rules/inherit.rs index 4aa865b..d3dffa6 100644 --- a/src/alejandra_engine/src/rules/inherit.rs +++ b/src/alejandra_engine/src/rules/inherit.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let vertical = children.has_comments() || children.has_newlines() diff --git a/src/alejandra_engine/src/rules/key_value.rs b/src/alejandra_engine/src/rules/key_value.rs index 5842b98..1efc180 100644 --- a/src/alejandra_engine/src/rules/key_value.rs +++ b/src/alejandra_engine/src/rules/key_value.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let vertical = children.has_comments() || children.has_newlines() diff --git a/src/alejandra_engine/src/rules/lambda.rs b/src/alejandra_engine/src/rules/lambda.rs index 11d6410..011003c 100644 --- a/src/alejandra_engine/src/rules/lambda.rs +++ b/src/alejandra_engine/src/rules/lambda.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let vertical = children.has_comments() || children.has_newlines() diff --git a/src/alejandra_engine/src/rules/let_in.rs b/src/alejandra_engine/src/rules/let_in.rs index fdd36e1..f736404 100644 --- a/src/alejandra_engine/src/rules/let_in.rs +++ b/src/alejandra_engine/src/rules/let_in.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let items_count = node .children() diff --git a/src/alejandra_engine/src/rules/list.rs b/src/alejandra_engine/src/rules/list.rs index efa8573..e9aefcc 100644 --- a/src/alejandra_engine/src/rules/list.rs +++ b/src/alejandra_engine/src/rules/list.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let items_count = node .children_with_tokens() diff --git a/src/alejandra_engine/src/rules/paren.rs b/src/alejandra_engine/src/rules/paren.rs index d565c7e..1a6e866 100644 --- a/src/alejandra_engine/src/rules/paren.rs +++ b/src/alejandra_engine/src/rules/paren.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let has_comments_or_newlines = children.has_comments() || children.has_newlines(); diff --git a/src/alejandra_engine/src/rules/pat_bind.rs b/src/alejandra_engine/src/rules/pat_bind.rs index 757fdb5..dc52710 100644 --- a/src/alejandra_engine/src/rules/pat_bind.rs +++ b/src/alejandra_engine/src/rules/pat_bind.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let vertical = children.has_comments() || children.has_newlines() diff --git a/src/alejandra_engine/src/rules/pat_entry.rs b/src/alejandra_engine/src/rules/pat_entry.rs index bdebc30..1c850a6 100644 --- a/src/alejandra_engine/src/rules/pat_entry.rs +++ b/src/alejandra_engine/src/rules/pat_entry.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let vertical = children.has_comments() || children.has_newlines() diff --git a/src/alejandra_engine/src/rules/root.rs b/src/alejandra_engine/src/rules/root.rs index 6b2b730..1b5ac0c 100644 --- a/src/alejandra_engine/src/rules/root.rs +++ b/src/alejandra_engine/src/rules/root.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let vertical = children.has_comments() || children.has_newlines() diff --git a/src/alejandra_engine/src/rules/string_interpol.rs b/src/alejandra_engine/src/rules/string_interpol.rs index 5ba940c..8f256bc 100644 --- a/src/alejandra_engine/src/rules/string_interpol.rs +++ b/src/alejandra_engine/src/rules/string_interpol.rs @@ -4,9 +4,7 @@ pub fn rule( ) -> std::collections::LinkedList { let mut steps = std::collections::LinkedList::new(); - let mut children = crate::children::Children::new_with_configuration( - build_ctx, node, true, - ); + let mut children = crate::children::Children::new(build_ctx, node); let vertical = children.has_comments() || children.has_newlines()