mirror of
https://github.com/RGBCube/alejandra
synced 2025-07-30 12:07:46 +00:00
refactor: remove unnecesary code
This commit is contained in:
parent
8b5d2f9e50
commit
774b685411
18 changed files with 19 additions and 64 deletions
|
@ -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<Child> {
|
||||
if index + 1 > self.children.len() {
|
||||
None
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -12,9 +12,7 @@ pub fn rule_with_configuration(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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();
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
|||
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||
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()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue