Show inline documentation in menu even if documentation is disabled (#22137)

Thorsten Ball and Danilo created 1 year ago

This makes inline completions show up in the completion menu even if the
user has set `"show_completion_documentation": false` in their settings,
because there is no other way to show the Zeta completion.

Follow-up to #22093

Release Notes:

- N/A

Co-authored-by: Danilo <[e-mail]>

Change summary

crates/editor/src/code_context_menus.rs | 35 +++++++++++++-------------
1 file changed, 17 insertions(+), 18 deletions(-)

Detailed changes

crates/editor/src/code_context_menus.rs

@@ -401,9 +401,9 @@ impl CompletionsMenu {
         let selected_item = self.selected_item;
         let style = style.clone();
 
-        let multiline_docs = if show_completion_documentation {
-            match &self.entries[selected_item] {
-                CompletionEntry::Match(mat) => match &completions[mat.candidate_id].documentation {
+        let multiline_docs = match &self.entries[selected_item] {
+            CompletionEntry::Match(mat) if show_completion_documentation => {
+                match &completions[mat.candidate_id].documentation {
                     Some(Documentation::MultiLinePlainText(text)) => {
                         Some(div().child(SharedString::from(text.clone())))
                     }
@@ -420,26 +420,25 @@ impl CompletionsMenu {
                         Some(div().child("No documentation"))
                     }
                     _ => None,
-                },
-                CompletionEntry::InlineCompletionHint(hint) => Some(match &hint.text {
-                    InlineCompletionText::Edit { text, highlights } => div()
-                        .my_1()
-                        .rounded_md()
-                        .bg(cx.theme().colors().editor_background)
-                        .child(
-                            gpui::StyledText::new(text.clone())
-                                .with_highlights(&style.text, highlights.clone()),
-                        ),
-                    InlineCompletionText::Move(text) => div().child(text.clone()),
-                }),
+                }
             }
-        } else {
-            None
+            CompletionEntry::InlineCompletionHint(hint) => Some(match &hint.text {
+                InlineCompletionText::Edit { text, highlights } => div()
+                    .my_1()
+                    .rounded_md()
+                    .bg(cx.theme().colors().editor_background)
+                    .child(
+                        gpui::StyledText::new(text.clone())
+                            .with_highlights(&style.text, highlights.clone()),
+                    ),
+                InlineCompletionText::Move(text) => div().child(text.clone()),
+            }),
+            _ => None,
         };
 
         let aside_contents = if let Some(multiline_docs) = multiline_docs {
             Some(multiline_docs)
-        } else if self.aside_was_displayed.get() {
+        } else if show_completion_documentation && self.aside_was_displayed.get() {
             Some(div().child("Fetching documentation..."))
         } else {
             None