github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-15 15:05:27 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Indent empty lines inside block

Browse Source
This commit is contained in:
Johannes Altmanninger 2021-02-08 04:37:50 +01:00
parent fffcdf8792
commit 7ee4a3b40d
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fish_tests.cpp
View File

@ -1389,7 +1389,7 @@ static void test_indents() {
add_test(&tests, //
0, "if", 1, " foo", //
1, "\nif", 2, " bar", //
1, "\n", // FIXME: this should be 2 but parse_util_compute_indents has a bug
2, "\n", //
1, "\nend\n");
add_test(&tests, //

12
src/parse_util.cpp
View File

@ -727,18 +727,14 @@ std::vector<int> parse_util_compute_indents(const wcstring &src) {
// the newline "belongs" to the if statement as it ends its job.
// But when rendered, it visually belongs to the job list.
// FIXME: if there's a middle newline, we will indent it wrongly.
// For example:
// if true
//
// end
// Here the middle newline should be indented by 1.
size_t idx = src_size;
int next_indent = iv.last_indent;
while (idx--) {
if (src.at(idx) == L'\n') {
indents.at(idx) = next_indent;
bool empty_middle_line = idx + 1 < src_size && src.at(idx + 1) == L'\n';
if (!empty_middle_line) {
indents.at(idx) = next_indent;
}
} else {
next_indent = indents.at(idx);
}