From a551647ec1ca098caef33721c06a79b7035ded56 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 22 Dec 2023 12:12:39 +0100
Subject: [PATCH] Fix panic in completions menu

We were shifting all the positions while keeping the original
string, which caused problems later when combining highlighted
ranges with matched indices.
---
 crates/editor2/src/editor.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/editor2/src/editor.rs b/crates/editor2/src/editor.rs
index f1f053acbb..943ddf47bd 100644
--- a/crates/editor2/src/editor.rs
+++ b/crates/editor2/src/editor.rs
@@ -1350,15 +1350,15 @@ impl CompletionsMenu {
                 completion.sort_key(),
             )
         });
-        drop(completions);
 
         for mat in &mut matches {
-            let completions = self.completions.read();
-            let filter_start = completions[mat.candidate_id].label.filter_range.start;
+            let completion = &completions[mat.candidate_id];
+            mat.string = completion.label.text.clone();
             for position in &mut mat.positions {
-                *position += filter_start;
+                *position += completion.label.filter_range.start;
             }
         }
+        drop(completions);
 
         self.matches = matches.into();
         self.selected_item = 0;