From d920610f9628e9edd16a50caddb61c057c1b811c Mon Sep 17 00:00:00 2001 From: Fabian Boehm Date: Sat, 2 Jul 2022 09:23:11 +0200 Subject: [PATCH] Fix special readline functions after and/or Here we needed to handle self-insert immediately, but we ended up returning it. Fixes #9051 --- src/input.cpp | 8 ++++---- tests/pexpects/bind.py | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/input.cpp b/src/input.cpp index 237cf0274..eef039c97 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -752,12 +752,12 @@ char_event_t inputter_t::read_char(const command_handler_t &command_handler) { } case readline_cmd_t::func_and: case readline_cmd_t::func_or: { - // If previous function has right status, we keep reading tokens + // If previous function has correct status, we keep reading tokens if (evt.get_readline() == readline_cmd_t::func_and) { - if (function_status_) return readch(); + // Don't return immediately, we might need to handle it here - like self-insert. + if (function_status_) continue; } else { - assert(evt.get_readline() == readline_cmd_t::func_or); - if (!function_status_) return readch(); + if (!function_status_) continue; } // Else we flush remaining tokens do { diff --git a/tests/pexpects/bind.py b/tests/pexpects/bind.py index f45f7e84b..cb980749e 100644 --- a/tests/pexpects/bind.py +++ b/tests/pexpects/bind.py @@ -292,6 +292,16 @@ send("echo git@github.com:fish-shell/fish-shell") send("\x17\x17\x17\r") expect_prompt("git@", unmatched="ctrl-w does not stop at @") +sendline("abbr --add foo 'echo foonanana'") +expect_prompt() +sendline("bind ' ' expand-abbr or self-insert") +expect_prompt() +send("foo ") +expect_str("echo foonanana") +send(" banana\r") +expect_str(" banana\r") +expect_prompt("foonanana banana") + # Ensure that nul can be bound properly (#3189). send("bind -k nul 'echo nul seen'\r") expect_prompt()