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

style - simplify option handling

Browse source
This commit is contained in:
Michael Davis 2024-12-20 11:07:49 -05:00
parent 98e408f603
commit cebdc599d6
No known key found for this signature in database
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,26 +85,22 @@ impl menu::Item for CompletionItem {
Some(lsp::CompletionItemKind::ENUM) => "enum".into(),
Some(lsp::CompletionItemKind::KEYWORD) => "keyword".into(),
Some(lsp::CompletionItemKind::SNIPPET) => "snippet".into(),
Some(lsp::CompletionItemKind::COLOR) => {
let maybe_hex_color = match &item.documentation {
Some(Documentation::String(value)) => Some(value),
Some(Documentation::MarkupContent(MarkupContent { value, .. })) => {
Some(value)
}
None => None,
};
maybe_hex_color.map_or("color".into(), |hex| {
match Color::from_hex(hex) {
Some(color) => Spans::from(vec![
Span::raw("color "),
Span::styled("■", Style::default().fg(color)),
]),
// there is documentation but it cannot be parsed as a hex color
None => "color".into(),
}
Some(lsp::CompletionItemKind::COLOR) => item
.documentation
.as_ref()
.and_then(|docs| {
let text = match docs {
Documentation::String(text) => text,
Documentation::MarkupContent(MarkupContent { value, .. }) => value,
};
Color::from_hex(text)
})
}
.map_or("color".into(), |color| {
Spans::from(vec![
Span::raw("color "),
Span::styled("■", Style::default().fg(color)),
])
}),
Some(lsp::CompletionItemKind::FILE) => "file".into(),
Some(lsp::CompletionItemKind::REFERENCE) => "reference".into(),
Some(lsp::CompletionItemKind::FOLDER) => "folder".into(),