From addb62c1fc07fa2d80f6467ef85f659aa6be9165 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Mon, 12 Jun 2023 11:55:27 +0300
Subject: [PATCH] Fix the duplicate hints

Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
---
 crates/editor/src/display_map.rs           |  2 +-
 crates/editor/src/display_map/inlay_map.rs | 22 ++++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 240582df8c..59ba9d8f4e 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -305,7 +305,7 @@ impl DisplayMap {
         let mut new_inlays = Vec::new();
         for (&location, hints) in new_hints {
             for hint in hints {
-                let mut hint_anchor =
+                let hint_anchor =
                     buffer_snapshot.anchor_in_excerpt(location.excerpt_id, hint.position);
                 new_inlays.push(InlayProperties {
                     position: hint_anchor.bias_left(&buffer_snapshot),
diff --git a/crates/editor/src/display_map/inlay_map.rs b/crates/editor/src/display_map/inlay_map.rs
index 9974c35bd2..9514e87b4a 100644
--- a/crates/editor/src/display_map/inlay_map.rs
+++ b/crates/editor/src/display_map/inlay_map.rs
@@ -11,7 +11,7 @@ use gpui::fonts::HighlightStyle;
 use language::{Chunk, Edit, Point, Rope, TextSummary};
 use parking_lot::Mutex;
 use std::{
-    cmp::{self, Reverse},
+    cmp,
     ops::{Add, AddAssign, Range, Sub},
 };
 use sum_tree::{Bias, Cursor, SumTree};
@@ -394,11 +394,8 @@ impl InlayMap {
                 .fold_snapshot
                 .to_fold_point(buffer_point, Bias::Left);
             let suggestion_point = snapshot.suggestion_snapshot.to_suggestion_point(fold_point);
-
-            // TODO kb consider changing Reverse to be dynamic depending on whether we appending to to the left or right of the anchor
-            // we want the newer (bigger) IDs to be closer to the "target" of the hint.
             inlays.insert(
-                (suggestion_point, inlay.position.bias(), Reverse(inlay.id)),
+                (suggestion_point, inlay.position.bias(), inlay.id),
                 Some(inlay),
             );
         }
@@ -411,10 +408,7 @@ impl InlayMap {
                     .fold_snapshot
                     .to_fold_point(buffer_point, Bias::Left);
                 let suggestion_point = snapshot.suggestion_snapshot.to_suggestion_point(fold_point);
-                inlays.insert(
-                    (suggestion_point, inlay.position.bias(), Reverse(inlay.id)),
-                    None,
-                );
+                inlays.insert((suggestion_point, inlay.position.bias(), inlay.id), None);
             }
         }
 
@@ -424,7 +418,7 @@ impl InlayMap {
             .transforms
             .cursor::<(SuggestionPoint, (InlayOffset, InlayPoint))>();
         let mut inlays = inlays.into_iter().peekable();
-        while let Some(((suggestion_point, bias, inlay_id), inlay)) = inlays.next() {
+        while let Some(((suggestion_point, bias, inlay_id), inlay_to_insert)) = inlays.next() {
             new_transforms.push_tree(cursor.slice(&suggestion_point, Bias::Left, &()), &());
 
             while let Some(transform) = cursor.item() {
@@ -438,11 +432,11 @@ impl InlayMap {
                         }
                     }
                     Transform::Inlay(inlay) => {
-                        if (inlay.position.bias(), Reverse(inlay.id)) > (bias, inlay_id) {
+                        if (inlay.position.bias(), inlay.id) < (bias, inlay_id) {
                             new_transforms.push(transform.clone(), &());
                             cursor.next(&());
                         } else {
-                            if inlay.id == inlay_id.0 {
+                            if inlay.id == inlay_id {
                                 let new_start = InlayOffset(new_transforms.summary().output.len);
                                 inlay_edits.push(Edit {
                                     old: cursor.start().1 .0..cursor.end(&()).1 .0,
@@ -456,7 +450,7 @@ impl InlayMap {
                 }
             }
 
-            if let Some(inlay) = inlay {
+            if let Some(inlay) = inlay_to_insert {
                 let prefix_suggestion_start = SuggestionPoint(new_transforms.summary().input.lines);
                 push_isomorphic(
                     &mut new_transforms,
@@ -1052,7 +1046,7 @@ mod tests {
                     (suggestion_offset, inlay.clone())
                 })
                 .collect::<Vec<_>>();
-            inlays.sort_by_key(|(offset, inlay)| (*offset, Reverse(inlay.id)));
+            inlays.sort_by_key(|(offset, inlay)| (*offset, inlay.position.bias(), inlay.id));
             let mut expected_text = Rope::from(suggestion_snapshot.text().as_str());
             for (offset, inlay) in inlays.into_iter().rev() {
                 expected_text.replace(offset.0..offset.0, &inlay.text.to_string());