Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-10 23:24:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix punctuation movement with one char tokens

Browse source 
Previously, in

    ls ^a bcd

(with "^" as the cursor), kill-word would delete the "a" and then go
on, remove the space and the "bcd".

With this, it will only kill the "a".

Fixes #4747.
This commit is contained in:
Fabian Homborg 2018-02-25 16:30:15 +01:00
parent 2747945c55
commit c793570f2c
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/fish_tests.cpp
View file

@ -1993,6 +1993,7 @@ static void test_word_motion() {
test_1_word_motion(word_motion_left, move_word_style_path_components,
L"^echo /^foo/^bar{^aaa,^bbb,^ccc}^bak/");
test_1_word_motion(word_motion_right, move_word_style_punctuation, L"a ^bcd^");
}
/// Test is_potential_path.

27
src/tokenizer.cpp
View file

@ -594,7 +594,7 @@ wcstring tok_first(const wcstring &str) {
}
bool move_word_state_machine_t::consume_char_punctuation(wchar_t c) {
enum { s_always_one = 0, s_whitespace, s_alphanumeric, s_end };
enum { s_always_one = 0, s_rest, s_whitespace_rest, s_whitespace, s_alphanumeric, s_end };
bool consumed = false;
while (state != s_end && !consumed) {
@ -602,15 +602,36 @@ bool move_word_state_machine_t::consume_char_punctuation(wchar_t c) {
case s_always_one: {
// Always consume the first character.
consumed = true;
state = s_whitespace;
if (iswspace(c)) {
state = s_whitespace;
} else {
// Don't allow switching type (ws->nonws) after non-whitespace.
state = s_rest;
}
break;
}
case s_rest: {
if (iswspace(c)) {
// Consume only trailing whitespace.
state = s_whitespace_rest;
} else if (iswalnum(c)) {
// Consume only alnums.
state = s_alphanumeric;
} else {
consumed = false;
state = s_end;
}
break;
}
case s_whitespace_rest:
case s_whitespace: {
// "whitespace" consumes whitespace and switches to alnums,
// "whitespace_rest" only consumes whitespace.
if (iswspace(c)) {
// Consumed whitespace.
consumed = true;
} else {
state = s_alphanumeric;
state = state == s_whitespace ? s_alphanumeric : s_end;
}
break;
}