h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-12 14:51:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate the global list of scoped transient commandlines

Browse Source 
Store this in a parser's libdata instead.
This commit is contained in:
ridiculousfish
2019-06-09 14:11:25 -07:00
parent 421cf92380
commit 1baa479bbf
5 changed files with 20 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/builtin_commandline.cpp
View File

@@ -12,6 +12,7 @@
#include "input.h"
#include "io.h"
#include "parse_util.h"
#include "parser.h"
#include "proc.h"
#include "reader.h"
#include "tokenizer.h"
@@ -35,36 +36,6 @@ enum {
APPEND_MODE // insert at end of current token/command/buffer
};
static owning_lock<wcstring_list_t> &get_transient_stack() {
ASSERT_IS_MAIN_THREAD();
static owning_lock<wcstring_list_t> s_transient_stack;
return s_transient_stack;
}
static bool get_top_transient(wcstring *out_result) {
auto stack = get_transient_stack().acquire();
if (stack->empty()) {
return false;
}
out_result->assign(stack->back());
return true;
}
builtin_commandline_scoped_transient_t::builtin_commandline_scoped_transient_t(
const wcstring &cmd) {
ASSERT_IS_MAIN_THREAD();
auto stack = get_transient_stack().acquire();
stack->push_back(cmd);
this->token = stack->size();
}
builtin_commandline_scoped_transient_t::~builtin_commandline_scoped_transient_t() {
ASSERT_IS_MAIN_THREAD();
auto stack = get_transient_stack().acquire();
assert(this->token == stack->size());
stack->pop_back();
}
/// Replace/append/insert the selection with/at/after the specified string.
///
/// \param begin beginning of selection
@@ -178,8 +149,10 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
int paging_mode = 0;
const wchar_t *begin = NULL, *end = NULL;
const auto &ld = parser.libdata();
wcstring transient_commandline;
if (get_top_transient(&transient_commandline)) {
if (!ld.transient_commandlines.empty()) {
transient_commandline = ld.transient_commandlines.back();
current_buffer = transient_commandline.c_str();
current_cursor_pos = transient_commandline.size();
} else {