Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

fish_indent: no extra newline at comment after pipe

Browse source 
Fixes the unstable case in #7252
This commit is contained in:
Johannes Altmanninger 2020-08-09 21:14:00 +02:00
parent 14a66fad64
commit f8f32628a6
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/fish_indent.cpp
View file

@ -382,9 +382,9 @@ struct pretty_printer_t {
// begin | stuff // begin | stuff
// //
// We do not handle errors here - instead our caller does. // We do not handle errors here - instead our caller does.
void emit_gap_text(const wcstring &gap_text, gap_flags_t flags) { bool emit_gap_text(const wcstring &gap_text, gap_flags_t flags) {
// Common case: if we are only spaces, do nothing. // Common case: if we are only spaces, do nothing.
if (gap_text.find_first_not_of(L' ') == wcstring::npos) return; if (gap_text.find_first_not_of(L' ') == wcstring::npos) return false;
// Look to see if there is an escaped newline. // Look to see if there is an escaped newline.
// Emit it if either we allow it, or it comes before the first comment. // Emit it if either we allow it, or it comes before the first comment.
@ -445,6 +445,7 @@ struct pretty_printer_t {
} }
} }
if (needs_nl) emit_newline(); if (needs_nl) emit_newline();
return needs_nl;
} }
/// \return the gap text ending at a given index into the string, or empty if none. /// \return the gap text ending at a given index into the string, or empty if none.
@ -472,8 +473,10 @@ struct pretty_printer_t {
} }
// Emit the gap text before a source range. // Emit the gap text before a source range.
void emit_gap_text_before(source_range_t r, gap_flags_t flags) { bool emit_gap_text_before(source_range_t r, gap_flags_t flags) {
assert(r.start <= source.size() && "source out of bounds"); assert(r.start <= source.size() && "source out of bounds");
bool added_newline = false;
// Find the gap text which ends at start. // Find the gap text which ends at start.
source_range_t range = gap_text_to(r.start); source_range_t range = gap_text_to(r.start);
if (range.length > 0) { if (range.length > 0) {
@ -493,11 +496,12 @@ struct pretty_printer_t {
if (range_contained_error(range)) { if (range_contained_error(range)) {
output.append(substr(range)); output.append(substr(range));
} else { } else {
emit_gap_text(substr(range), flags); added_newline = emit_gap_text(substr(range), flags);
} }
} }
// Always clear gap_text_mask_newline after emitting even empty gap text. // Always clear gap_text_mask_newline after emitting even empty gap text.
gap_text_mask_newline = false; gap_text_mask_newline = false;
return added_newline;
} }
/// Given a string \p input, remove unnecessary quotes, etc. /// Given a string \p input, remove unnecessary quotes, etc.
@ -605,8 +609,11 @@ struct pretty_printer_t {
if (node.range.length > 0) { if (node.range.length > 0) {
auto flags = gap_text_flags_before_node(node); auto flags = gap_text_flags_before_node(node);
current_indent = indents.at(node.range.start); current_indent = indents.at(node.range.start);
emit_gap_text_before(node.range, flags); bool added_newline = emit_gap_text_before(node.range, flags);
wcstring text = source.substr(node.range.start, node.range.length); wcstring text = source.substr(node.range.start, node.range.length);
if (added_newline && !text.empty() && text.front() == L'\n') {
text = text.substr(strlen("\n"));
}
emit_gap_text(text, flags); emit_gap_text(text, flags);
} }
} }

5
tests/checks/indent.fish
View file

@ -366,3 +366,8 @@ echo $status
echo foo | $fish_indent --check echo foo | $fish_indent --check
echo $status echo $status
#CHECK: 0 #CHECK: 0
echo 'thing | # comment
thing' | $fish_indent --check
echo $status
#CHECK: 0