Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

reader: stop requiring edit_t to be an rvalue reference

Browse source 
While its true that we only ever call this with temporaries, there is no
fundamental reason for this restriction.  Taking by value is simpler and
more flexible. I think it does not change the generated code.

No functional change.
This commit is contained in:
Johannes Altmanninger 2022-09-15 04:13:39 +02:00
parent be64c53888
commit de353d3e04
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/reader.cpp
View file

@ -254,7 +254,7 @@ void editable_line_t::clear() {
set_position(0);
}
void editable_line_t::push_edit(edit_t &&edit, bool allow_coalesce) {
void editable_line_t::push_edit(edit_t edit, bool allow_coalesce) {
bool is_insertion = edit.length == 0;
/// Coalescing insertion does not create a new undo entry but adds to the last insertion.
if (allow_coalesce && is_insertion && want_to_coalesce_insertion_of(edit.replacement)) {
@ -830,7 +830,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
void erase_substring(editable_line_t *el, size_t offset, size_t length);
/// Replace the text of length @length at @offset by @replacement.
void replace_substring(editable_line_t *el, size_t offset, size_t length, wcstring replacement);
void push_edit(editable_line_t *el, edit_t &&edit);
void push_edit(editable_line_t *el, edit_t edit);
/// Insert the character into the command line buffer and print it to the screen using syntax
/// highlighting, etc.
@ -1714,7 +1714,7 @@ void reader_data_t::insert_string(editable_line_t *el, const wcstring &str) {
maybe_refilter_pager(el);
}
void reader_data_t::push_edit(editable_line_t *el, edit_t &&edit) {
void reader_data_t::push_edit(editable_line_t *el, edit_t edit) {
el->push_edit(std::move(edit), false);
maybe_refilter_pager(el);
}

2
src/reader.h
View file

@ -96,7 +96,7 @@ class editable_line_t {
/// Modify the commandline according to @edit. Most modifications to the
/// text should pass through this function.
void push_edit(edit_t &&edit, bool allow_coalesce);
void push_edit(edit_t edit, bool allow_coalesce);
/// Undo the most recent edit that was not yet undone. Returns true on success.
bool undo();