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

Add 'bigword' vi key bindings

Browse Source 
- Add four new functions: forward-bigword, backward-bigword,
  kill-bigword, backward-kill-bigword
- Add new enum move_word_style_whitespace and related state machine
  method
- Change vi key bindings to operate on bigwords: B, gE, W, E, dW, diW,
  daW, dE, dB, dgE, cW, ciW, caW, cE, cB, cgE, yW, yiW, yaW, yE, yB,
  ygE
This commit is contained in:
Michael Steed
2015-05-30 16:44:25 -06:00
committed by ridiculousfish
parent 7efbcc039d
commit cb984cf761
6 changed files with 139 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
tokenizer.cpp
View File

@@ -913,6 +913,59 @@ bool move_word_state_machine_t::consume_char_path_components(wchar_t c)
return consumed;
}
bool move_word_state_machine_t::consume_char_whitespace(wchar_t c)
{
enum
{
s_always_one = 0,
s_blank,
s_graph,
s_end
};
bool consumed = false;
while (state != s_end && ! consumed)
{
switch (state)
{
case s_always_one:
/* Always consume the first character */
consumed = true;
state = s_blank;
break;
case s_blank:
if (iswblank(c))
{
/* Consumed whitespace */
consumed = true;
}
else
{
state = s_graph;
}
break;
case s_graph:
if (iswgraph(c))
{
/* Consumed printable non-space */
consumed = true;
}
else
{
state = s_end;
}
break;
case s_end:
default:
break;
}
}
return consumed;
}
bool move_word_state_machine_t::consume_char(wchar_t c)
{
switch (style)
@@ -921,6 +974,8 @@ bool move_word_state_machine_t::consume_char(wchar_t c)
return consume_char_punctuation(c);
case move_word_style_path_components:
return consume_char_path_components(c);
case move_word_style_whitespace:
return consume_char_whitespace(c);
default:
return false;
}