Horizontally scroll long values when jumping to next search match, ev…

…en if the row wasn't on the screen before.
PaulJuliusMartinez · Jan 30, 2022 · 606bb96 · 606bb96
1 parent 1e4ec96
commit 606bb96
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 4 deletions.
diff --git a/src/flatjson.rs b/src/flatjson.rs
@@ -191,6 +191,9 @@ impl Row {
     pub fn is_container(&self) -> bool {
         self.value.is_container()
     }
+    pub fn is_string(&self) -> bool {
+        self.value.is_string()
+    }
     pub fn is_opening_of_container(&self) -> bool {
         self.value.is_opening_of_container()
     }
@@ -320,6 +323,13 @@ impl Value {
         }
     }
 
+    pub fn is_string(&self) -> bool {
+        match self {
+            Value::String => true,
+            _ => false,
+        }
+    }
+
     pub fn container_type(&self) -> Option<ContainerType> {
         match self {
             Value::OpenContainer { container_type, .. } => Some(*container_type),

diff --git a/src/lineprinter.rs b/src/lineprinter.rs
@@ -472,7 +472,35 @@ impl<'a, 'b, 'c> LinePrinter<'a, 'b, 'c> {
                     .and_modify(|tsv| {
                         *tsv = tsv.resize(value_ref, available_space);
                     })
-                    .or_insert_with(|| TruncatedStrView::init_start(value_ref, available_space))
+                    .or_insert_with(|| {
+                        let tsv = TruncatedStrView::init_start(value_ref, available_space);
+
+                        let mut range = self.value_range.clone();
+                        if quoted {
+                            range.start += 1;
+                            range.end -= 1;
+                        }
+
+                        // If we're showing a line for the first time, we might
+                        // need to focus on a search match.
+                        let no_overlap = self.focused_search_match.end <= range.start
+                            || range.end <= self.focused_search_match.start;
+                        if no_overlap {
+                            return tsv;
+                        }
+
+                        let value_range_start = range.start;
+                        let offset_focused_range = Range {
+                            start: self
+                                .focused_search_match
+                                .start
+                                .saturating_sub(value_range_start),
+                            end: (self.focused_search_match.end - value_range_start)
+                                .min(value_ref.len()),
+                        };
+
+                        tsv.focus(value_ref, &offset_focused_range)
+                    })
                     .clone()
             })
             .unwrap_or_else(|| TruncatedStrView::init_start(value_ref, available_space));

diff --git a/src/screenwriter.rs b/src/screenwriter.rs
@@ -608,13 +608,19 @@ impl ScreenWriter {
             let json_row = &viewer.flatjson[row];
             let value_ref = self.line_primitive_value_ref(json_row, &viewer).unwrap();
 
-            let no_overlap = focused_search_range.end <= json_row.range.start
-                || json_row.range.end <= focused_search_range.start;
+            let mut range = json_row.range.clone();
+            if json_row.is_string() {
+                range.start += 1;
+                range.end -= 1;
+            }
+
+            let no_overlap =
+                focused_search_range.end <= range.start || range.end <= focused_search_range.start;
             if no_overlap {
                 return;
             }
 
-            let mut value_range_start = json_row.range.start;
+            let mut value_range_start = range.start;
             if let Value::String = &json_row.value {
                 value_range_start += 1;
             }