RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:37:35 +00:00
Code Issues Activity Actions

Shell: Corrently indent offset newlines when formatting

Browse source 
Previously, formatting the following would incorrectly skip the indents:
```
{
    foo

    bar
}
```
to create:
```
{

foo

bar
}
```
This commit is contained in:
AnotherTest 2021-03-07 09:45:40 +03:30 • committed by Andreas Kling
parent e1512d5968
commit fec8d7d699
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Userland/Shell/Formatter.cpp
View file

@ -108,10 +108,10 @@ void Formatter::will_visit(const AST::Node* node)
auto direct_sequence_child = !m_parent_node || m_parent_node->kind() == AST::Node::Kind::Sequence; auto direct_sequence_child = !m_parent_node || m_parent_node->kind() == AST::Node::Kind::Sequence;
if (direct_sequence_child && node->kind() != AST::Node::Kind::Sequence) { if (direct_sequence_child && node->kind() != AST::Node::Kind::Sequence && node->kind() != AST::Node::Kind::Execute) {
// Collapse more than one empty line to a single one. // Collapse more than one empty line to a single one.
if (node->position().start_line.line_number - m_last_visited_node->position().end_line.line_number > 1) if (node->position().start_line.line_number - m_last_visited_node->position().end_line.line_number > 1)
current_builder().append('\n'); insert_separator();
} }
} }
@ -213,14 +213,10 @@ void Formatter::visit(const AST::CastToCommand* node)
{ {
will_visit(node); will_visit(node);
test_and_update_output_cursor(node); test_and_update_output_cursor(node);
if (m_options.explicit_parentheses)
current_builder().append('(');
TemporaryChange<const AST::Node*> parent { m_parent_node, node }; TemporaryChange<const AST::Node*> parent { m_parent_node, node };
NodeVisitor::visit(node); NodeVisitor::visit(node);
if (m_options.explicit_parentheses)
current_builder().append(')');
visited(node); visited(node);
} }
@ -243,7 +239,7 @@ void Formatter::visit(const AST::CloseFdRedirection* node)
test_and_update_output_cursor(node); test_and_update_output_cursor(node);
TemporaryChange<const AST::Node*> parent { m_parent_node, node }; TemporaryChange<const AST::Node*> parent { m_parent_node, node };
current_builder().appendf(" %d>&-", node->fd()); current_builder().appendf("%d>&-", node->fd());
visited(node); visited(node);
} }
@ -305,7 +301,7 @@ void Formatter::visit(const AST::Fd2FdRedirection* node)
test_and_update_output_cursor(node); test_and_update_output_cursor(node);
TemporaryChange<const AST::Node*> parent { m_parent_node, node }; TemporaryChange<const AST::Node*> parent { m_parent_node, node };
current_builder().appendf(" %d>&%d", node->source_fd(), node->dest_fd()); current_builder().appendf("%d>&%d", node->source_fd(), node->dest_fd());
if (m_hit_node == node) if (m_hit_node == node)
++m_output_cursor; ++m_output_cursor;
visited(node); visited(node);
@ -433,12 +429,14 @@ void Formatter::visit(const AST::Execute* node)
TemporaryChange<const AST::Node*> parent { m_parent_node, node }; TemporaryChange<const AST::Node*> parent { m_parent_node, node };
ScopedValueRollback options_rollback { m_options }; ScopedValueRollback options_rollback { m_options };
if (node->does_capture_stdout()) { if (node->does_capture_stdout())
builder.append("$"); builder.append("$(");
m_options.explicit_parentheses = true;
}
NodeVisitor::visit(node); NodeVisitor::visit(node);
if (node->does_capture_stdout())
builder.append(")");
visited(node); visited(node);
} }
@ -486,7 +484,11 @@ void Formatter::visit(const AST::Join* node)
if (should_parenthesise) if (should_parenthesise)
current_builder().append('('); current_builder().append('(');
NodeVisitor::visit(node); node->left()->visit(*this);
current_builder().append(' ');
node->right()->visit(*this);
if (should_parenthesise) if (should_parenthesise)
current_builder().append(')'); current_builder().append(')');
@ -652,9 +654,7 @@ void Formatter::visit(const AST::Subshell* node)
TemporaryChange<const AST::Node*> parent { m_parent_node, node }; TemporaryChange<const AST::Node*> parent { m_parent_node, node };
in_new_block([&] { in_new_block([&] {
insert_separator();
NodeVisitor::visit(node); NodeVisitor::visit(node);
insert_separator();
}); });
visited(node); visited(node);
} }