From f29f336c4d65b15a80c7fecc4e258891d7ef7852 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Thu, 19 Dec 2024 21:33:37 +0000
Subject: [PATCH] feat: resolve merge conflicts

---
 helix-term/src/ui/completion.rs | 35 ++++++++++++---------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index e969ef1c..f9b4330d 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -68,20 +68,6 @@ impl menu::Item for CompletionItem {
             CompletionItem::Other(core::CompletionItem { label, .. }) => label,
         };
 
-        let first_cell = menu::Cell::from(Span::styled(
-            label,
-            if deprecated {
-                Style::default().add_modifier(Modifier::CROSSED_OUT)
-            } else if kind.stuff == "folder" {
-                *dir_style
-            } else {
-                Style::default()
-            },
-        ));
-
-        menu::Row::new([first_cell, menu::Cell::from(kind)])
-        
-
         let kind = match self {
             CompletionItem::Lsp(LspCompletionItem { item, .. }) => match item.kind {
                 Some(lsp::CompletionItemKind::TEXT) => "text".into(),
@@ -133,15 +119,20 @@ impl menu::Item for CompletionItem {
             },
             CompletionItem::Other(core::CompletionItem { kind, .. }) => Span::raw(kind.to_string()),
         };
+
+        let first_cell = menu::Cell::from(Span::styled(
+            label,
+            if deprecated {
+                Style::default().add_modifier(Modifier::CROSSED_OUT)
+            } else if kind.content == "folder" {
+                *dir_style
+            } else {
+                Style::default()
+            },
+        ));
+
         menu::Row::new([
-            menu::Cell::from(Span::styled(
-                label,
-                if deprecated {
-                    Style::default().add_modifier(Modifier::CROSSED_OUT)
-                } else {
-                    Style::default()
-                },
-            )),
+            first_cell,
             if kind.content == "■" {
                 menu::Cell::from(Spans::from(vec![Span::raw("color "), kind]))
             } else {