fix #326: preview not updated anymore

lotabout · Jul 1, 2020 · d38b5fc · d38b5fc
1 parent 89c3d7a
commit d38b5fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/previewer.rs b/src/previewer.rs
@@ -33,7 +33,6 @@ pub struct Previewer {
     wrap: bool,
 
     prev_item: Option<Arc<dyn SkimItem>>,
-    prev_item_index: Option<usize>,
     prev_query: Option<String>,
     prev_cmd_query: Option<String>,
     prev_num_selected: usize,
@@ -69,7 +68,6 @@ impl Previewer {
             wrap: false,
 
             prev_item: None,
-            prev_item_index: None,
             prev_query: None,
             prev_cmd_query: None,
             prev_num_selected: 0,
@@ -103,11 +101,11 @@ impl Previewer {
         let new_query = new_query.into();
         let new_cmd_query = new_cmd_query.into();
 
-        let item_changed = match (self.prev_item_index.as_ref(), new_item.as_ref()) {
+        let item_changed = match (self.prev_item.as_ref(), new_item.as_ref()) {
             (None, None) => false,
             (None, Some(_)) => true,
             (Some(_), None) => true,
-            (Some(&prev_index), Some(_)) => prev_index == new_item_index,
+            (Some(prev), Some(new)) => !Arc::ptr_eq(prev, new),
         };
 
         let query_changed = match (self.prev_query.as_ref(), new_query.as_ref()) {
@@ -131,7 +129,6 @@ impl Previewer {
         }
 
         self.prev_item = new_item.clone();
-        self.prev_item_index = Some(new_item_index);
         self.prev_query = new_query;
         self.prev_cmd_query = new_cmd_query;
         self.prev_num_selected = num_selected;

diff --git a/src/selection.rs b/src/selection.rs
@@ -566,14 +566,14 @@ fn build_compare_function(criterion: Vec<RankCriteria>) -> CompareFunction<Match
                     if a.item.text().len() == b.item.text().len() {
                         continue;
                     } else {
-                        return a.item.text().len().cmp(&b.item.text().len())
+                        return a.item.text().len().cmp(&b.item.text().len());
                     }
                 }
                 RankCriteria::NegLength => {
                     if a.item.text().len() == b.item.text().len() {
                         continue;
                     } else {
-                        return b.item.text().len().cmp(&a.item.text().len())
+                        return b.item.text().len().cmp(&a.item.text().len());
                     }
                 }
             }