Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-15 22:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Indent only leaf nodes and in-between gaps

Browse source 
Probably not necessary for the next commit, but this way feels more logical
This commit is contained in:
Johannes Altmanninger 2021-02-08 04:42:24 +01:00
parent 7ee4a3b40d
commit 511747d59e
2 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/fish_tests.cpp
View file

@ -1445,6 +1445,12 @@ static void test_indents() {
1, "\n# comment 2" // 1, "\n# comment 2" //
); );
add_test(&tests, //
0, "begin", //
1, "\n", // "begin" is special because this newline belongs to the block header
1, "\n" //
);
int test_idx = 0; int test_idx = 0;
for (const test_t &test : tests) { for (const test_t &test : tests) {
// Construct the input text and expected indents. // Construct the input text and expected indents.

28
src/parse_util.cpp
View file

@ -660,10 +660,29 @@ std::vector<int> parse_util_compute_indents(const wcstring &src) {
inc = 1; inc = 1;
dec = node.parent->as<switch_statement_t>()->end.unsourced ? 0 : 1; dec = node.parent->as<switch_statement_t>()->end.unsourced ? 0 : 1;
break; break;
case type_t::token_base: {
auto tok = node.as<token_base_t>();
if (node.parent->type == type_t::begin_header &&
tok->type == parse_token_type_t::end) {
// The newline after "begin" is optional, so it is part of the header.
// The header is not in the indented block, so indent the newline here.
if (node.source(src) == L"\n") {
inc = 1;
dec = 1;
}
}
break;
}
default: default:
break; break;
} }
auto range = node.source_range();
if (range.length > 0 && node.category == category_t::leaf) {
std::fill(indents.begin() + last_leaf_end, indents.begin() + range.start,
last_indent);
}
indent += inc; indent += inc;
// If we increased the indentation, apply it to the remainder of the string, even if the // If we increased the indentation, apply it to the remainder of the string, even if the
@ -674,17 +693,13 @@ std::vector<int> parse_util_compute_indents(const wcstring &src) {
// //
// we want to indent the newline. // we want to indent the newline.
if (inc) { if (inc) {
std::fill(indents.begin() + last_leaf_end, indents.end(), indent);
last_indent = indent; last_indent = indent;
} }
// If this is a leaf node, apply the current indentation. // If this is a leaf node, apply the current indentation.
if (node.category == category_t::leaf) { if (node.category == category_t::leaf) {
auto range = node.source_range();
if (range.length > 0) { if (range.length > 0) {
// Fill to the end. std::fill(indents.begin() + range.start, indents.begin() + range.end(), indent);
// Later nodes will come along and overwrite these.
std::fill(indents.begin() + range.start, indents.end(), indent);
last_leaf_end = range.start + range.length; last_leaf_end = range.start + range.length;
last_indent = indent; last_indent = indent;
} }
@ -719,6 +734,7 @@ std::vector<int> parse_util_compute_indents(const wcstring &src) {
indent_visitor_t iv(src, indents); indent_visitor_t iv(src, indents);
node_visitor(iv).accept(ast.top()); node_visitor(iv).accept(ast.top());
std::fill(indents.begin() + iv.last_leaf_end, indents.end(), iv.last_indent);
// All newlines now get the *next* indent. // All newlines now get the *next* indent.
// For example, in this code: // For example, in this code: