kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat: resolve merge conflicts

Browse source
This commit is contained in:
Nikita Revenco 2024-12-19 21:33:37 +00:00
parent c2e24a44ac
commit f29f336c4d
1 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
helix-term/src/ui/completion.rs
View file

@ -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 {