[session] use permalink when restoring log view state

Author: tstack

NEWS.md

@@ -108,6 +108,8 @@ Bug Fixes:
   command.
 * The `:set-file-timezone` command was not working correctly in some 
   cases.
+* The location of views should be restored from the session when filters
+  are active.
 
 ## lnav v0.12.4
 

src/listview_curses.cc

@@ -183,9 +183,8 @@ listview_curses::reload_data()
                 auto curr_sel = this->get_selection();
 
                 if (curr_sel == -1_vl) {
-                    curr_sel = 0_vl;
+                    this->set_selection_without_context(0_vl);
                 }
-                this->set_selection_without_context(curr_sel);
             }
 
             this->update_top_from_selection();
@@ -969,7 +968,8 @@ listview_curses::handle_mouse(mouse_event& me)
                             this->lv_mouse_time = me.me_time;
                             this->lv_focused_overlay_top -= 1_vl;
                             if (this->lv_focused_overlay_selection
-                                >= this->lv_focused_overlay_top + (oc.oc_height - 1_vl))
+                                >= this->lv_focused_overlay_top
+                                    + (oc.oc_height - 1_vl))
                             {
                                 this->lv_focused_overlay_selection
                                     = this->lv_focused_overlay_top

src/log_data_helper.cc

@@ -32,6 +32,7 @@
 #include "log_data_helper.hh"
 
 #include "config.h"
+#include "logfile.hh"
 #include "pugixml/pugixml.hpp"
 #include "sql_util.hh"
 #include "xml_util.hh"
@@ -53,21 +54,19 @@ log_data_helper::clear()
 bool
 log_data_helper::parse_line(content_line_t line, bool allow_middle)
 {
-    logfile::iterator ll;
-    bool retval = false;
+    auto retval = false;
 
     this->ldh_source_line = this->ldh_line_index = line;
 
     this->ldh_file = this->ldh_log_source.find(this->ldh_line_index);
-    ll = this->ldh_file->begin() + this->ldh_line_index;
+    auto ll = this->ldh_file->begin() + this->ldh_line_index;
     this->ldh_y_offset = 0;
     while (allow_middle && ll->is_continued()) {
         --ll;
         this->ldh_y_offset += 1;
     }
     this->ldh_line = ll;
     if (!ll->is_message()) {
-        log_warning("failed to parse line %d", line);
         this->ldh_parser.reset();
         this->ldh_scanner.reset();
         this->ldh_namer.reset();

src/session_data.cc

@@ -864,6 +864,7 @@ read_files(yajlpp_parse_context* ypc,
 static const struct json_path_container view_def_handlers = {
     json_path_handler("top_line").for_field(&view_state::vs_top),
     json_path_handler("focused_line").for_field(&view_state::vs_selection),
+    json_path_handler("anchor").for_field(&view_state::vs_anchor),
     json_path_handler("search").for_field(&view_state::vs_search),
     json_path_handler("word_wrap").for_field(&view_state::vs_word_wrap),
     json_path_handler("filtering").for_field(&view_state::vs_filtering),
@@ -1595,6 +1596,7 @@ save_session_with_id(const std::string& session_id)
 
                 for (int lpc = 0; lpc < LNV__MAX; lpc++) {
                     auto& tc = lnav_data.ld_views[lpc];
+                    auto* ta = dynamic_cast<text_anchors*>(tc.get_sub_source());
 
                     top_view_map.gen(lnav_view_strings[lpc]);
 
@@ -1614,6 +1616,15 @@ save_session_with_id(const std::string& session_id)
                     {
                         view_map.gen("focused_line");
                         view_map.gen((long long) tc.get_selection());
+
+                        if (ta != nullptr) {
+                            auto anchor_opt
+                                = ta->anchor_for_row(tc.get_selection());
+                            if (anchor_opt) {
+                                view_map.gen("anchor");
+                                view_map.gen(anchor_opt.value());
+                            }
+                        }
                     }
 
                     view_map.gen("search");
@@ -1836,6 +1847,7 @@ lnav::session::restore_view_states()
     for (size_t view_index = 0; view_index < LNV__MAX; view_index++) {
         const auto& vs = session_data.sd_view_states[view_index];
         auto& tview = lnav_data.ld_views[view_index];
+        auto* ta = dynamic_cast<text_anchors*>(tview.get_sub_source());
         bool has_loc = false;
 
         if (view_index == LNV_TEXT) {
@@ -1878,29 +1890,11 @@ lnav::session::restore_view_states()
                 if (row_opt) {
                     log_info("setting LOG view to desired loc: %s",
                              anchor.c_str());
-                    lnav_data.ld_views[LNV_LOG].set_selection(row_opt.value());
+                    tview.set_selection(row_opt.value());
                 }
             }
         }
 
-        if (!has_loc && vs.vs_top >= 0
-            && (view_index == LNV_LOG || tview.get_top() == 0_vl
-                || tview.get_top() == tview.get_top_for_last_row()))
-        {
-            log_info("restoring %s view top: %d",
-                     lnav_view_strings[view_index],
-                     vs.vs_top);
-            lnav_data.ld_views[view_index].set_top(vis_line_t(vs.vs_top), true);
-            lnav_data.ld_views[view_index].set_selection(-1_vl);
-        }
-        if (!has_loc && vs.vs_selection) {
-            log_info("restoring %s view selection: %d",
-                     lnav_view_strings[view_index],
-                     vs.vs_selection.value());
-            lnav_data.ld_views[view_index].set_selection(
-                vis_line_t(vs.vs_selection.value()));
-        }
-
         if (!vs.vs_search.empty()) {
             tview.execute_search(vs.vs_search);
             tview.set_follow_search_for(-1, {});
@@ -1934,6 +1928,42 @@ lnav::session::restore_view_states()
                 };
             }
         }
+
+        if (!has_loc && vs.vs_top >= 0
+            && (view_index == LNV_LOG || tview.get_top() == 0_vl
+                || tview.get_top() == tview.get_top_for_last_row()))
+        {
+            log_info("restoring %s view top: %d",
+                     lnav_view_strings[view_index],
+                     vs.vs_top);
+            tview.set_top(vis_line_t(vs.vs_top), true);
+            tview.set_selection(-1_vl);
+        }
+        if (!has_loc && vs.vs_selection) {
+            log_info("restoring %s view selection: %d",
+                     lnav_view_strings[view_index],
+                     vs.vs_selection.value());
+            tview.set_selection(vis_line_t(vs.vs_selection.value()));
+        }
+        if (ta != nullptr && vs.vs_anchor && !vs.vs_anchor->empty()) {
+            auto curr_anchor = ta->anchor_for_row(tview.get_selection());
+
+            if (!curr_anchor || curr_anchor.value() != vs.vs_anchor.value()) {
+                log_info("%s view anchor mismatch %s != %s",
+                         lnav_view_strings[view_index],
+                         curr_anchor.value_or("").c_str(),
+                         vs.vs_anchor.value().c_str());
+
+                auto row_opt = ta->row_for_anchor(vs.vs_anchor.value());
+                if (row_opt) {
+                    tview.set_selection(row_opt.value());
+                }
+            }
+        }
+        log_info("%s view actual top/selection: %d/%d",
+                 lnav_view_strings[view_index],
+                 tview.get_top(),
+                 tview.get_selection());
     }
 }
 

src/session_data.hh

@@ -47,6 +47,7 @@ struct file_state {
 struct view_state {
     int64_t vs_top{0};
     std::optional<int64_t> vs_selection;
+    std::optional<std::string> vs_anchor;
     std::string vs_search;
     bool vs_word_wrap{false};
     bool vs_filtering{true};

src/textinput_curses.cc

@@ -258,41 +258,39 @@ textinput_curses::textinput_curses()
 }
 
 void
-textinput_curses::set_content(const attr_line_t& al)
+textinput_curses::content_to_lines(std::string content, int x)
 {
-    auto al_copy = al;
+    auto al = attr_line_t(content);
 
     if (!this->tc_prefix.empty()) {
-        al_copy.insert(0, this->tc_prefix);
+        al.insert(0, this->tc_prefix);
+        x += this->tc_prefix.length();
     }
-    highlight_syntax(this->tc_text_format, al_copy, this->tc_prefix.length());
+    highlight_syntax(this->tc_text_format, al, x);
     if (!this->tc_prefix.empty()) {
         // XXX yuck
-        al_copy.erase(0, this->tc_prefix.al_string.size());
+        al.erase(0, this->tc_prefix.al_string.size());
     }
-    this->tc_doc_meta = lnav::document::discover(al_copy)
+    this->tc_doc_meta = lnav::document::discover(al)
                             .with_text_format(this->tc_text_format)
                             .save_words()
                             .perform();
-    lnav::document::hier_node::depth_first(
-        this->tc_doc_meta.m_sections_root.get(),
-        [this](lnav::document::hier_node* hn) {
-            log_debug("hier_node: %p %s",
-                      hn,
-                      fmt::format(FMT_STRING("{}"),
-                                  this->tc_doc_meta.path_for_range(
-                                      hn->hn_start, hn->hn_start))
-                          .c_str());
-        });
-    this->tc_lines = al_copy.split_lines();
-    if (endswith(al_copy.al_string, "\n")) {
+    this->tc_lines = al.split_lines();
+    if (endswith(al.al_string, "\n")) {
         this->tc_lines.emplace_back();
     }
     if (this->tc_lines.empty()) {
         this->tc_lines.emplace_back();
     } else {
         this->apply_highlights();
     }
+}
+
+void
+textinput_curses::set_content(std::string content)
+{
+    this->content_to_lines(std::move(content), this->tc_prefix.length());
+
     this->tc_change_log.clear();
     this->tc_marks.clear();
     this->tc_notice = std::nullopt;
@@ -1601,6 +1599,10 @@ textinput_curses::replace_selection_no_change(string_fragment sf)
 
     this->tc_drag_selection = std::nullopt;
     if (retval == sf) {
+        if (!sf.empty()) {
+            this->content_to_lines(this->get_content(),
+                                   this->get_cursor_offset());
+        }
     } else {
         this->update_lines();
     }
@@ -1713,31 +1715,8 @@ textinput_curses::move_cursor_to(input_point ip)
 void
 textinput_curses::update_lines()
 {
-    auto content = attr_line_t(this->get_content());
-    auto x = this->get_cursor_offset();
-
-    if (!this->tc_prefix.empty()) {
-        content.insert(0, this->tc_prefix);
-        x += this->tc_prefix.length();
-    }
-    highlight_syntax(this->tc_text_format, content, x);
-    if (!this->tc_prefix.empty()) {
-        // XXX yuck
-        content.erase(0, this->tc_prefix.al_string.size());
-    }
-    this->tc_doc_meta = lnav::document::discover(content)
-                            .with_text_format(this->tc_text_format)
-                            .save_words()
-                            .perform();
-    this->tc_lines = content.split_lines();
-    if (endswith(content.al_string, "\n")) {
-        this->tc_lines.emplace_back();
-    }
-    if (this->tc_lines.empty()) {
-        this->tc_lines.emplace_back();
-    } else {
-        this->apply_highlights();
-    }
+    const auto x = this->get_cursor_offset();
+    this->content_to_lines(this->get_content(), x);
     this->ensure_cursor_visible();
 
     this->tc_marks.clear();

src/textinput_curses.hh

@@ -290,7 +290,7 @@ public:
 
     textinput_curses(const textinput_curses&) = delete;
 
-    void set_content(const attr_line_t& al);
+    void set_content(std::string al);
 
     void set_height(int height);
 
@@ -304,6 +304,8 @@ public:
 
     bool handle_key(const ncinput& ch);
 
+    void content_to_lines(std::string content, int x);
+
     void update_lines();
 
     void ensure_cursor_visible();