github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-30 14:24:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adopt the new AST in bash history import

Browse Source 
This switches bash history importing from parsing with parse_tree to the
new ast.
This commit is contained in:
ridiculousfish 2020-06-20 17:43:54 -07:00
parent 46c4ec8d68
commit 358d7072a2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/history.cpp
View File

@ -29,6 +29,7 @@
#include <type_traits> #include <type_traits>
#include <unordered_set> #include <unordered_set>
#include "ast.h"
#include "common.h" #include "common.h"
#include "env.h" #include "env.h"
#include "fallback.h" // IWYU pragma: keep #include "fallback.h" // IWYU pragma: keep
@ -1096,8 +1097,7 @@ void history_impl_t::populate_from_config_path() {
static bool should_import_bash_history_line(const wcstring &line) { static bool should_import_bash_history_line(const wcstring &line) {
if (line.empty()) return false; if (line.empty()) return false;
parse_node_tree_t parse_tree; if (ast::ast_t::parse(line).errored()) return false;
if (!parse_tree_from_string(line, parse_flag_none, &parse_tree, nullptr)) return false;
// In doing this test do not allow incomplete strings. Hence the "false" argument. // In doing this test do not allow incomplete strings. Hence the "false" argument.
parse_error_list_t errors; parse_error_list_t errors;