more fixes

Author: tstack

src/grep_proc.hh

@@ -198,13 +198,13 @@ public:
     };
 
     template<typename T>
-    request_until_t until_line(T line)
+    static request_until_t until_line(T line)
     {
         return {until_type_t::line, LineType(line)};
     }
 
     template<typename T>
-    request_until_t until_eof(T line)
+    static request_until_t until_eof(T line)
     {
         return {until_type_t::eof, LineType(line)};
     }

src/logfile_sub_source.cc

@@ -413,10 +413,10 @@ logfile_sub_source::text_value_for_line(textview_curses& tc,
             auto dts = fmt_ptr->build_time_scanner();
             exttm tm;
             timeval tv;
-            auto val_sf = string_fragment::from_str_range(
-                value_out,
-                lv_iter->lv_origin.lr_start,
-                lv_iter->lv_origin.lr_end);
+            auto val_sf
+                = string_fragment::from_str_range(value_out,
+                                                  lv_iter->lv_origin.lr_start,
+                                                  lv_iter->lv_origin.lr_end);
 
             if (dts.scan(val_sf.data(),
                          val_sf.length(),
@@ -427,10 +427,8 @@ logfile_sub_source::text_value_for_line(textview_curses& tc,
             {
                 char ts[64];
                 tm.et_gmtoff = tm.et_orig_gmtoff;
-                auto len = dts.ftime(ts,
-                                     sizeof(ts),
-                                     fmt_ptr->get_timestamp_formats(),
-                                     tm);
+                auto len = dts.ftime(
+                    ts, sizeof(ts), fmt_ptr->get_timestamp_formats(), tm);
                 ts[len] = '\0';
                 value_out.replace(lv_iter->lv_origin.lr_start,
                                   lv_iter->lv_origin.length(),
@@ -675,11 +673,10 @@ logfile_sub_source::text_attrs_for_line(textview_curses& lv,
     }
 
     // Apply shifts right-to-left so positions remain valid.
-    std::stable_sort(this->lss_token_shifts.begin(),
-                     this->lss_token_shifts.end(),
-                     [](const auto& a, const auto& b) {
-                         return a.first > b.first;
-                     });
+    std::stable_sort(
+        this->lss_token_shifts.begin(),
+        this->lss_token_shifts.end(),
+        [](const auto& a, const auto& b) { return a.first > b.first; });
     for (const auto& shift : this->lss_token_shifts) {
         shift_string_attrs(
             this->lss_token_al.al_attrs, shift.first + 1, shift.second);
@@ -2316,7 +2313,8 @@ logfile_sub_source::text_mark(const bookmark_type_t* bm,
     if (bm == &textview_curses::BM_META
         && this->lss_meta_grepper.gps_proc != nullptr)
     {
-        this->tss_view->search_range(line, line + 1_vl);
+        this->tss_view->search_range(
+            line, grep_proc<vis_line_t>::until_line(line + 1_vl));
         this->tss_view->search_new_data();
     }
 }

src/textview_curses.cc

@@ -1097,7 +1097,7 @@ textview_curses::set_user_mark(const bookmark_type_t* bm,
     }
 
     if (marked) {
-        this->search_range(vl, vl + 1_vl);
+        this->search_range(vl, grep_proc<vis_line_t>::until_line(vl + 1_vl));
         this->search_new_data();
     }
     this->set_needs_update();
@@ -1136,7 +1136,8 @@ textview_curses::toggle_user_mark(const bookmark_type_t* bm,
             this->tc_sub_source->text_mark(bm, curr_line, added);
         }
     }
-    this->search_range(start_line, end_line + 1_vl);
+    this->search_range(start_line,
+                       grep_proc<vis_line_t>::until_line(end_line + 1_vl));
     this->search_new_data();
 
     return retval;
@@ -1168,26 +1169,30 @@ textview_curses::redo_search()
 }
 
 void
-textview_curses::search_range(vis_line_t start, vis_line_t stop)
+textview_curses::search_range(vis_line_t start,
+                              grep_proc<vis_line_t>::request_until_t stop)
 {
     if (this->tc_search_child) {
         auto op_guard
             = lnav_opid_guard::resume(this->tc_search_op_id.value_or(""));
         auto* gp = this->tc_search_child->get_grep_proc();
-        gp->queue_request(start, gp->until_line(stop));
+        gp->queue_request(start, stop);
     }
     if (this->tc_source_search_child) {
         auto op_guard
             = lnav_opid_guard::resume(this->tc_search_op_id.value_or(""));
-        this->tc_source_search_child->queue_request(
-            start, this->tc_source_search_child->until_line(stop));
+        this->tc_source_search_child->queue_request(start, stop);
     }
 }
 
 void
 textview_curses::search_new_data(vis_line_t start)
 {
-    this->search_range(start);
+    if (this->tc_sub_source != nullptr) {
+        this->search_range(start,
+                           grep_proc<vis_line_t>::until_eof(
+                               this->tc_sub_source->text_line_count()));
+    }
     if (this->tc_search_child) {
         auto op_guard
             = lnav_opid_guard::resume(this->tc_search_op_id.value_or(""));

src/textview_curses.hh

@@ -135,8 +135,7 @@ public:
     };
 
     virtual bool matches(std::optional<line_source> ls,
-                         const shared_buffer_ref& line)
-        = 0;
+                         const shared_buffer_ref& line) = 0;
 
     virtual std::string to_command() const = 0;
 
@@ -429,8 +428,7 @@ public:
         = 0;
 
     virtual std::optional<vis_line_t> loc_history_forward(
-        vis_line_t current_top)
-        = 0;
+        vis_line_t current_top) = 0;
 
     const static int MAX_SIZE = 100;
 
@@ -496,13 +494,11 @@ public:
     virtual line_info text_value_for_line(textview_curses& tc,
                                           int line,
                                           std::string& value_out,
-                                          line_flags_t flags = 0)
-        = 0;
+                                          line_flags_t flags = 0) = 0;
 
     virtual size_t text_size_for_line(textview_curses& tc,
                                       int line,
-                                      line_flags_t raw = 0)
-        = 0;
+                                      line_flags_t raw = 0) = 0;
 
     /**
      * Inform the source that the given line has been marked/unmarked.  This
@@ -596,7 +592,10 @@ public:
     virtual void add_commands_for_session(
         const std::function<void(const std::string&)>& receiver);
 
-    [[nodiscard]] log_level_t get_min_log_level() const { return this->tss_min_log_level; }
+    [[nodiscard]] log_level_t get_min_log_level() const
+    {
+        return this->tss_min_log_level;
+    }
 
     void set_min_log_level(log_level_t level)
     {
@@ -665,8 +664,7 @@ public:
     virtual ~text_detail_provider() = default;
 
     virtual std::optional<json_string> text_row_details(
-        const textview_curses& tc)
-        = 0;
+        const textview_curses& tc) = 0;
 };
 
 /**
@@ -873,7 +871,8 @@ public:
 
     void redo_search();
 
-    void search_range(vis_line_t start, vis_line_t stop = -1_vl);
+    void search_range(vis_line_t start,
+                      grep_proc<vis_line_t>::request_until_t stop);
 
     void search_new_data(vis_line_t start = -1_vl);