From 071a55a7abdb1d38e961d02780645537ce9a9ca2 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 31 Jan 2022 13:25:46 -0800
Subject: [PATCH] Allow selecting items from the autocomplete list

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 crates/editor/src/editor.rs         | 35 +++++++++++++++++++++++++++--
 crates/theme/src/theme.rs           |  1 +
 crates/zed/assets/themes/_base.toml |  4 ++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index c36eccb682..813f087f54 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -426,6 +426,7 @@ struct BracketPairState {
 
 struct CompletionState {
     completions: Arc<[Completion]>,
+    selected_item: usize,
     list: UniformListState,
 }
 
@@ -1520,6 +1521,7 @@ impl Editor {
                 this.update(&mut cx, |this, cx| {
                     this.completion_state = Some(CompletionState {
                         completions: completions.into(),
+                        selected_item: 0,
                         list: Default::default(),
                     });
                     cx.notify();
@@ -1540,16 +1542,23 @@ impl Editor {
             let build_settings = self.build_settings.clone();
             let settings = build_settings(cx);
             let completions = state.completions.clone();
+            let selected_item = state.selected_item;
             UniformList::new(
                 state.list.clone(),
                 state.completions.len(),
                 move |range, items, cx| {
                     let settings = build_settings(cx);
-                    for completion in &completions[range] {
+                    let start_ix = range.start;
+                    for (ix, completion) in completions[range].iter().enumerate() {
+                        let item_style = if start_ix + ix == selected_item {
+                            settings.style.autocomplete.selected_item
+                        } else {
+                            settings.style.autocomplete.item
+                        };
                         items.push(
                             Label::new(completion.label().to_string(), settings.style.text.clone())
                                 .contained()
-                                .with_style(settings.style.autocomplete.item)
+                                .with_style(item_style)
                                 .boxed(),
                         );
                     }
@@ -2256,6 +2265,17 @@ impl Editor {
     }
 
     pub fn move_up(&mut self, _: &MoveUp, cx: &mut ViewContext<Self>) {
+        if let Some(completion_state) = &mut self.completion_state {
+            if completion_state.selected_item > 0 {
+                completion_state.selected_item -= 1;
+                completion_state
+                    .list
+                    .scroll_to(ScrollTarget::Show(completion_state.selected_item));
+            }
+            cx.notify();
+            return;
+        }
+
         if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate_action();
             return;
@@ -2294,6 +2314,17 @@ impl Editor {
     }
 
     pub fn move_down(&mut self, _: &MoveDown, cx: &mut ViewContext<Self>) {
+        if let Some(completion_state) = &mut self.completion_state {
+            if completion_state.selected_item + 1 < completion_state.completions.len() {
+                completion_state.selected_item += 1;
+                completion_state
+                    .list
+                    .scroll_to(ScrollTarget::Show(completion_state.selected_item));
+            }
+            cx.notify();
+            return;
+        }
+
         if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate_action();
             return;
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index 1c669c57f4..aca5e7d245 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -327,6 +327,7 @@ pub struct AutocompleteStyle {
     #[serde(flatten)]
     pub container: ContainerStyle,
     pub item: ContainerStyle,
+    pub selected_item: ContainerStyle,
 }
 
 #[derive(Clone, Copy, Default, Deserialize)]
diff --git a/crates/zed/assets/themes/_base.toml b/crates/zed/assets/themes/_base.toml
index 4281812d0e..6a0c98c67f 100644
--- a/crates/zed/assets/themes/_base.toml
+++ b/crates/zed/assets/themes/_base.toml
@@ -319,6 +319,10 @@ background = "$surface.2"
 border = { width = 1, color = "$border.1" }
 item.padding = 2
 
+[editor.autocomplete.selected_item]
+extends = "$editor.autocomplete.item"
+background = "$state.hover"
+
 [project_diagnostics]
 background = "$surface.1"
 empty_message = { extends = "$text.0", size = 18 }