github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Stop ignoring initial command in read -c

Browse Source 
`read` allows specifying the initial command line text. This was
text got accidentally ignored starting in a32248277f026fb. Fix this
regression and add a test.

Fixes #8633
This commit is contained in:
ridiculousfish 2022-01-16 13:34:45 -08:00
parent 49a0362c12
commit 1f8ce5ff6c
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/reader.cpp
View File

@ -4189,7 +4189,12 @@ bool reader_data_t::jump(jump_direction_t dir, jump_precision_t precision, edita
return success; return success;
} }
maybe_t<wcstring> reader_readline(int nchars) { return current_data()->readline(nchars); } maybe_t<wcstring> reader_readline(int nchars) {
auto *data = current_data();
// Apply any outstanding commandline changes (#8633).
data->apply_commandline_state_changes();
return data->readline(nchars);
}
int reader_reading_interrupted() { int reader_reading_interrupted() {
int res = reader_test_and_clear_interrupted(); int res = reader_test_and_clear_interrupted();

12
tests/pexpects/read.py
View File

@ -54,6 +54,18 @@ expect_prompt()
expect_marker(2) expect_marker(2)
print_var_contents("foo", "bar") print_var_contents("foo", "bar")
# read -c (see #8633)
sendline(r"read -c init_text somevar && echo $somevar")
expect_re("\r\n?read> init_text$")
sendline("someval")
expect_prompt("someval\r\n")
sendline(r"read --command='some other text' somevar && echo $somevar")
expect_re("\r\n?read> some other text$")
sendline("another value")
expect_prompt("another value\r\n")
# read -s # read -s
sendline("read -s foo") sendline("read -s foo")