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

Better error messages for EDITOR=vim git... type commands.

Browse Source 
https://github.com/fish-shell/fish-shell/issues/809
This commit is contained in:
ridiculousfish
2013-09-30 14:55:25 -07:00
parent cbe615224d
commit 2f33e5919d
3 changed files with 61 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tokenizer.cpp
View File

@@ -641,6 +641,31 @@ void tok_next(tokenizer_t *tok)
}
enum token_type tok_peek_next(tokenizer_t *tok, wcstring *out_next_string)
{
if (out_next_string != NULL)
{
out_next_string->clear();
}
enum token_type result = TOK_END;
if (tok_has_next(tok))
{
int saved = tok_get_pos(tok);
tok_next(tok);
result = tok_last_type(tok);
if (out_next_string != NULL)
{
const wchar_t *last = tok_last(tok);
out_next_string->assign(last ? last : L"");
}
tok_set_pos(tok, saved);
}
return result;
}
const wchar_t *tok_string(tokenizer_t *tok)
{
return tok?tok->orig_buff:0;