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

Colors for items in the completion menu (#12299)

Browse source
This commit is contained in:
Nikita Revenco 2024-12-20 16:16:15 +00:00 • committed by GitHub
parent a91263d604
commit ba6e6dc3dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 87 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,10 +9,13 @@ use helix_view::{
document::SavePoint, document::SavePoint,
editor::CompleteAction, editor::CompleteAction,
handlers::lsp::SignatureHelpInvoked, handlers::lsp::SignatureHelpInvoked,
theme::{Modifier, Style}, theme::{Color, Modifier, Style},
ViewId, ViewId,
}; };
use tui::{buffer::Buffer as Surface, text::Span}; use tui::{
buffer::Buffer as Surface,
text::{Span, Spans},
};
use std::{borrow::Cow, sync::Arc}; use std::{borrow::Cow, sync::Arc};
@ -64,53 +67,69 @@ impl menu::Item for CompletionItem {
let kind = match self { let kind = match self {
CompletionItem::Lsp(LspCompletionItem { item, .. }) => match item.kind { CompletionItem::Lsp(LspCompletionItem { item, .. }) => match item.kind {
Some(lsp::CompletionItemKind::TEXT) => "text", Some(lsp::CompletionItemKind::TEXT) => "text".into(),
Some(lsp::CompletionItemKind::METHOD) => "method", Some(lsp::CompletionItemKind::METHOD) => "method".into(),
Some(lsp::CompletionItemKind::FUNCTION) => "function", Some(lsp::CompletionItemKind::FUNCTION) => "function".into(),
Some(lsp::CompletionItemKind::CONSTRUCTOR) => "constructor", Some(lsp::CompletionItemKind::CONSTRUCTOR) => "constructor".into(),
Some(lsp::CompletionItemKind::FIELD) => "field", Some(lsp::CompletionItemKind::FIELD) => "field".into(),
Some(lsp::CompletionItemKind::VARIABLE) => "variable", Some(lsp::CompletionItemKind::VARIABLE) => "variable".into(),
Some(lsp::CompletionItemKind::CLASS) => "class", Some(lsp::CompletionItemKind::CLASS) => "class".into(),
Some(lsp::CompletionItemKind::INTERFACE) => "interface", Some(lsp::CompletionItemKind::INTERFACE) => "interface".into(),
Some(lsp::CompletionItemKind::MODULE) => "module", Some(lsp::CompletionItemKind::MODULE) => "module".into(),
Some(lsp::CompletionItemKind::PROPERTY) => "property", Some(lsp::CompletionItemKind::PROPERTY) => "property".into(),
Some(lsp::CompletionItemKind::UNIT) => "unit", Some(lsp::CompletionItemKind::UNIT) => "unit".into(),
Some(lsp::CompletionItemKind::VALUE) => "value", Some(lsp::CompletionItemKind::VALUE) => "value".into(),
Some(lsp::CompletionItemKind::ENUM) => "enum", Some(lsp::CompletionItemKind::ENUM) => "enum".into(),
Some(lsp::CompletionItemKind::KEYWORD) => "keyword", Some(lsp::CompletionItemKind::KEYWORD) => "keyword".into(),
Some(lsp::CompletionItemKind::SNIPPET) => "snippet", Some(lsp::CompletionItemKind::SNIPPET) => "snippet".into(),
Some(lsp::CompletionItemKind::COLOR) => "color", Some(lsp::CompletionItemKind::COLOR) => item
Some(lsp::CompletionItemKind::FILE) => "file", .documentation
Some(lsp::CompletionItemKind::REFERENCE) => "reference", .as_ref()
Some(lsp::CompletionItemKind::FOLDER) => "folder", .and_then(|docs| {
Some(lsp::CompletionItemKind::ENUM_MEMBER) => "enum_member", let text = match docs {
Some(lsp::CompletionItemKind::CONSTANT) => "constant", lsp::Documentation::String(text) => text,
Some(lsp::CompletionItemKind::STRUCT) => "struct", lsp::Documentation::MarkupContent(lsp::MarkupContent {
Some(lsp::CompletionItemKind::EVENT) => "event", value, ..
Some(lsp::CompletionItemKind::OPERATOR) => "operator", }) => value,
Some(lsp::CompletionItemKind::TYPE_PARAMETER) => "type_param", };
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(),
Some(lsp::CompletionItemKind::ENUM_MEMBER) => "enum_member".into(),
Some(lsp::CompletionItemKind::CONSTANT) => "constant".into(),
Some(lsp::CompletionItemKind::STRUCT) => "struct".into(),
Some(lsp::CompletionItemKind::EVENT) => "event".into(),
Some(lsp::CompletionItemKind::OPERATOR) => "operator".into(),
Some(lsp::CompletionItemKind::TYPE_PARAMETER) => "type_param".into(),
Some(kind) => { Some(kind) => {
log::error!("Received unknown completion item kind: {:?}", kind); log::error!("Received unknown completion item kind: {:?}", kind);
"" "".into()
} }
None => "", None => "".into(),
}, },
CompletionItem::Other(core::CompletionItem { kind, .. }) => kind, CompletionItem::Other(core::CompletionItem { kind, .. }) => kind.as_ref().into(),
}; };
menu::Row::new([ let label = Span::styled(
menu::Cell::from(Span::styled( label,
label, if deprecated {
if deprecated { Style::default().add_modifier(Modifier::CROSSED_OUT)
Style::default().add_modifier(Modifier::CROSSED_OUT) } else if kind.0[0].content == "folder" {
} else if kind == "folder" { *dir_style
*dir_style } else {
} else { Style::default()
Style::default() },
}, );
)),
menu::Cell::from(kind), menu::Row::new([menu::Cell::from(label), menu::Cell::from(kind)])
])
} }
} }

25
helix-view/src/graphics.rs
View file

@ -263,6 +263,31 @@ pub enum Color {
Indexed(u8), Indexed(u8),
} }
impl Color {
/// Creates a `Color` from a hex string
///
/// # Examples
///
/// ```rust
/// use helix_view::theme::Color;
///
/// let color1 = Color::from_hex("#c0ffee").unwrap();
/// let color2 = Color::Rgb(192, 255, 238);
///
/// assert_eq!(color1, color2);
/// ```
pub fn from_hex(hex: &str) -> Option<Self> {
if !(hex.starts_with('#') && hex.len() == 7) {
return None;
}
match [1..=2, 3..=4, 5..=6].map(|i| hex.get(i).and_then(|c| u8::from_str_radix(c, 16).ok()))
{
[Some(r), Some(g), Some(b)] => Some(Self::Rgb(r, g, b)),
_ => None,
}
}
}
#[cfg(feature = "term")] #[cfg(feature = "term")]
impl From<Color> for crossterm::style::Color { impl From<Color> for crossterm::style::Color {
fn from(color: Color) -> Self { fn from(color: Color) -> Self {