mirror of
https://github.com/RGBCube/alejandra
synced 2025-08-01 13:07:47 +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 {
|
impl Children {
|
||||||
pub fn new_with_configuration(
|
pub fn new(
|
||||||
build_ctx: &crate::builder::BuildCtx,
|
build_ctx: &crate::builder::BuildCtx,
|
||||||
node: &rnix::SyntaxNode,
|
node: &rnix::SyntaxNode,
|
||||||
with_newlines: bool,
|
|
||||||
) -> Children {
|
) -> Children {
|
||||||
let mut children = Vec::new();
|
let mut children = Vec::new();
|
||||||
|
|
||||||
|
@ -46,10 +45,7 @@ impl Children {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
rnix::SyntaxKind::TOKEN_WHITESPACE => {
|
rnix::SyntaxKind::TOKEN_WHITESPACE => {
|
||||||
if with_newlines
|
if crate::utils::count_newlines(token.text()) > 0 {
|
||||||
&& crate::utils::count_newlines(token.text())
|
|
||||||
> 0
|
|
||||||
{
|
|
||||||
children.push(Child {
|
children.push(Child {
|
||||||
element: token.clone().into(),
|
element: token.clone().into(),
|
||||||
pos: pos.clone(),
|
pos: pos.clone(),
|
||||||
|
@ -72,13 +68,6 @@ impl Children {
|
||||||
Children { children, current_index: 0 }
|
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> {
|
pub fn get(&mut self, index: usize) -> Option<Child> {
|
||||||
if index + 1 > self.children.len() {
|
if index + 1 > self.children.len() {
|
||||||
None
|
None
|
||||||
|
|
|
@ -18,9 +18,7 @@ pub fn parse(
|
||||||
) -> IfElse {
|
) -> IfElse {
|
||||||
let mut if_else = IfElse::default();
|
let mut if_else = IfElse::default();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
// if
|
// if
|
||||||
children.get_next().unwrap();
|
children.get_next().unwrap();
|
||||||
|
|
|
@ -23,9 +23,7 @@ pub fn parse(
|
||||||
) -> Pattern {
|
) -> Pattern {
|
||||||
let mut pattern = Pattern::default();
|
let mut pattern = Pattern::default();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
// x @
|
// x @
|
||||||
let child = children.peek_next().unwrap();
|
let child = children.peek_next().unwrap();
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let vertical = children.has_comments()
|
let vertical = children.has_comments()
|
||||||
|| children.has_newlines()
|
|| children.has_newlines()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let vertical = children.has_comments()
|
let vertical = children.has_comments()
|
||||||
|| children.has_newlines()
|
|| children.has_newlines()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let items_count = node
|
let items_count = node
|
||||||
.children_with_tokens()
|
.children_with_tokens()
|
||||||
|
|
|
@ -12,9 +12,7 @@ pub fn rule_with_configuration(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let vertical = children.has_comments()
|
let vertical = children.has_comments()
|
||||||
|| children.has_newlines()
|
|| children.has_newlines()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let vertical = children.has_comments()
|
let vertical = children.has_comments()
|
||||||
|| children.has_newlines()
|
|| children.has_newlines()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let vertical = children.has_comments()
|
let vertical = children.has_comments()
|
||||||
|| children.has_newlines()
|
|| children.has_newlines()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let vertical = children.has_comments()
|
let vertical = children.has_comments()
|
||||||
|| children.has_newlines()
|
|| children.has_newlines()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let vertical = children.has_comments()
|
let vertical = children.has_comments()
|
||||||
|| children.has_newlines()
|
|| children.has_newlines()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let items_count = node
|
let items_count = node
|
||||||
.children()
|
.children()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let items_count = node
|
let items_count = node
|
||||||
.children_with_tokens()
|
.children_with_tokens()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let has_comments_or_newlines =
|
let has_comments_or_newlines =
|
||||||
children.has_comments() || children.has_newlines();
|
children.has_comments() || children.has_newlines();
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let vertical = children.has_comments()
|
let vertical = children.has_comments()
|
||||||
|| children.has_newlines()
|
|| children.has_newlines()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let vertical = children.has_comments()
|
let vertical = children.has_comments()
|
||||||
|| children.has_newlines()
|
|| children.has_newlines()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let vertical = children.has_comments()
|
let vertical = children.has_comments()
|
||||||
|| children.has_newlines()
|
|| children.has_newlines()
|
||||||
|
|
|
@ -4,9 +4,7 @@ pub fn rule(
|
||||||
) -> std::collections::LinkedList<crate::builder::Step> {
|
) -> std::collections::LinkedList<crate::builder::Step> {
|
||||||
let mut steps = std::collections::LinkedList::new();
|
let mut steps = std::collections::LinkedList::new();
|
||||||
|
|
||||||
let mut children = crate::children::Children::new_with_configuration(
|
let mut children = crate::children::Children::new(build_ctx, node);
|
||||||
build_ctx, node, true,
|
|
||||||
);
|
|
||||||
|
|
||||||
let vertical = children.has_comments()
|
let vertical = children.has_comments()
|
||||||
|| children.has_newlines()
|
|| children.has_newlines()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue