github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 15:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for issue where fish_indent would lose blank lines

Browse Source
This commit is contained in:
ridiculousfish 2014-11-25 10:43:03 -08:00
parent 94a3203c74
commit 8526a82947
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fish_indent.cpp
View File

@ -91,7 +91,7 @@ static int indent(wcstring &out, const wcstring &in, int flags)
int prev_type = 0;
int prev_prev_type = 0;
tokenizer_t tok(in.c_str(), TOK_SHOW_COMMENTS);
tokenizer_t tok(in.c_str(), TOK_SHOW_COMMENTS | TOK_SHOW_BLANK_LINES);
for (; tok_has_next(&tok); tok_next(&tok))
{
int type = tok_last_type(&tok);

20
tokenizer.cpp
View File

@ -101,6 +101,7 @@ tokenizer_t::tokenizer_t(const wchar_t *b, tok_flags_t flags) : buff(NULL), orig
this->accept_unfinished = !!(flags & TOK_ACCEPT_UNFINISHED);
this->show_comments = !!(flags & TOK_SHOW_COMMENTS);
this->squash_errors = !!(flags & TOK_SQUASH_ERRORS);
this->show_blank_lines = !!(flags & TOK_SHOW_BLANK_LINES);
this->has_next = (*b != L'\0');
this->orig_buff = this->buff = b;
@ -562,7 +563,6 @@ const wchar_t *tok_get_desc(int type)
return _(tok_desc[type]);
}
void tok_next(tokenizer_t *tok)
{
@ -628,18 +628,18 @@ void tok_next(tokenizer_t *tok)
break;
case 13: // carriage return
case L'\n':
// Hack: when we get a newline, swallow as many as we can
// This compresses multiple subsequent newlines into a single one
while (*tok->buff == L'\n' || *tok->buff == 13 || *tok->buff == ' ' || *tok->buff == '\t')
{
tok->buff++;
}
tok->last_type = TOK_END;
break;
case L';':
tok->last_type = TOK_END;
tok->buff++;
// Hack: when we get a newline, swallow as many as we can
// This compresses multiple subsequent newlines into a single one
if (! tok->show_blank_lines)
{
while (*tok->buff == L'\n' || *tok->buff == 13 /* CR */ || *tok->buff == ' ' || *tok->buff == '\t')
{
tok->buff++;
}
}
break;
case L'&':
tok->last_type = TOK_BACKGROUND;

8
tokenizer.h
View File

@ -61,6 +61,10 @@ enum tokenizer_error
*/
#define TOK_SQUASH_ERRORS 4
/** Ordinarily, the tokenizer ignores newlines following a newline, or a semicolon.
This flag tells the tokenizer to return each of them as a separate END. */
#define TOK_SHOW_BLANK_LINES 8
typedef unsigned int tok_flags_t;
/**
@ -84,8 +88,10 @@ struct tokenizer_t
bool has_next;
/** Whether incomplete tokens are accepted*/
bool accept_unfinished;
/** Whether commants should be returned*/
/** Whether comments should be returned*/
bool show_comments;
/** Whether all blank lines are returned */
bool show_blank_lines;
/** Type of last quote, can be either ' or ".*/
wchar_t last_quote;
/** Last error */