h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-13 07:21:13 -03:00
Code Issues Packages Projects Releases Wiki Activity

Teach the tokenizer to report escaped newlines

Browse Source 
Add fields and flags so that escaped newlines can be reported, for the
benefit of fish_indent.
This commit is contained in:
ridiculousfish
2018-05-07 15:22:09 -07:00
parent 678fd86107
commit 6f57fef8f8
4 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tokenizer.cpp
View File

@@ -428,10 +428,12 @@ maybe_t<tok_t> tokenizer_t::tok_next() {
}
// Consume non-newline whitespace. If we get an escaped newline, mark it and continue past it.
bool preceding_escaped_nl = false;
for (;;) {
if (this->buff[0] == L'\\' && this->buff[1] == L'\n') {
this->buff += 2;
this->continue_line_after_comment = true;
preceding_escaped_nl = true;
} else if (iswspace_not_nl(this->buff[0])) {
this->buff++;
} else {
@@ -454,6 +456,7 @@ maybe_t<tok_t> tokenizer_t::tok_next() {
result.type = TOK_COMMENT;
result.offset = comment_start - this->start;
result.length = comment_len;
result.preceding_escaped_nl = preceding_escaped_nl;
return result;
}
while (iswspace_not_nl(this->buff[0])) this->buff++;
@@ -551,6 +554,7 @@ maybe_t<tok_t> tokenizer_t::tok_next() {
break;
}
}
result.preceding_escaped_nl = preceding_escaped_nl;
return result;
}