diff --git a/Cargo.lock b/Cargo.lock index 3fbb80c90..f417ad523 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1560,6 +1560,7 @@ dependencies = [ "serde", "serde_json", "slotmap", + "smartstring", "tempfile", "thiserror 2.0.12", "tokio", @@ -2423,6 +2424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" dependencies = [ "autocfg", + "serde", "static_assertions", "version_check", ] diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 2e15dcdcc..a7af4ca5d 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -44,6 +44,7 @@ use helix_core::{ use helix_view::{ document::{FormatterError, Mode, SCRATCH_BUFFER_NAME}, editor::Action, + icons::ICONS, info::Info, input::KeyEvent, keyboard::KeyCode, @@ -3296,12 +3297,28 @@ fn changed_file_picker(cx: &mut Context) { let columns = [ PickerColumn::new("change", |change: &FileChange, data: &FileChangeData| { + let icons = ICONS.load(); match change { - FileChange::Untracked { .. } => Span::styled("+ untracked", data.style_untracked), - FileChange::Modified { .. } => Span::styled("~ modified", data.style_modified), - FileChange::Conflict { .. } => Span::styled("x conflict", data.style_conflict), - FileChange::Deleted { .. } => Span::styled("- deleted", data.style_deleted), - FileChange::Renamed { .. } => Span::styled("> renamed", data.style_renamed), + FileChange::Untracked { .. } => Span::styled( + format!("{} untracked", icons.vcs().added()), + data.style_untracked, + ), + FileChange::Modified { .. } => Span::styled( + format!("{} modified", icons.vcs().modified()), + data.style_modified, + ), + FileChange::Conflict { .. } => Span::styled( + format!("{} conflict", icons.vcs().conflict()), + data.style_conflict, + ), + FileChange::Deleted { .. } => Span::styled( + format!("{} deleted", icons.vcs().removed()), + data.style_deleted, + ), + FileChange::Renamed { .. } => Span::styled( + format!("{} renamed", icons.vcs().renamed()), + data.style_renamed, + ), } .into() }), diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs index 8377f7c71..fdd02a5bf 100644 --- a/helix-term/src/commands/lsp.rs +++ b/helix-term/src/commands/lsp.rs @@ -22,6 +22,7 @@ use helix_view::{ document::{DocumentInlayHints, DocumentInlayHintsId}, editor::Action, handlers::lsp::SignatureHelpInvoked, + icons::ICONS, theme::Style, Document, View, }; @@ -242,11 +243,22 @@ fn diag_picker( ui::PickerColumn::new( "severity", |item: &PickerDiagnostic, styles: &DiagnosticStyles| { + let icons = ICONS.load(); match item.diag.severity { - Some(DiagnosticSeverity::HINT) => Span::styled("HINT", styles.hint), - Some(DiagnosticSeverity::INFORMATION) => Span::styled("INFO", styles.info), - Some(DiagnosticSeverity::WARNING) => Span::styled("WARN", styles.warning), - Some(DiagnosticSeverity::ERROR) => Span::styled("ERROR", styles.error), + Some(DiagnosticSeverity::HINT) => { + Span::styled(format!("{} HINT", icons.diagnostic().hint()), styles.hint) + } + Some(DiagnosticSeverity::INFORMATION) => { + Span::styled(format!("{} INFO", icons.diagnostic().info()), styles.info) + } + Some(DiagnosticSeverity::WARNING) => Span::styled( + format!("{} WARN", icons.diagnostic().warning()), + styles.warning, + ), + Some(DiagnosticSeverity::ERROR) => Span::styled( + format!("{} ERROR", icons.diagnostic().error()), + styles.error, + ), _ => Span::raw(""), } .into() @@ -397,7 +409,12 @@ pub fn symbol_picker(cx: &mut Context) { let call = move |_editor: &mut Editor, compositor: &mut Compositor| { let columns = [ ui::PickerColumn::new("kind", |item: &SymbolInformationItem, _| { - display_symbol_kind(item.symbol.kind).into() + let icons = ICONS.load(); + let name = display_symbol_kind(item.symbol.kind); + icons + .lsp() + .get(name) + .map_or_else(|| name.into(), |symbol| format!("{symbol} {name}").into()) }), // Some symbols in the document symbol picker may have a URI that isn't // the current file. It should be rare though, so we concatenate that @@ -515,7 +532,12 @@ pub fn workspace_symbol_picker(cx: &mut Context) { }; let columns = [ ui::PickerColumn::new("kind", |item: &SymbolInformationItem, _| { - display_symbol_kind(item.symbol.kind).into() + let icons = ICONS.load(); + let name = display_symbol_kind(item.symbol.kind); + icons + .lsp() + .get(name) + .map_or_else(|| name.into(), |symbol| format!("{symbol} {name}").into()) }), ui::PickerColumn::new("name", |item: &SymbolInformationItem, _| { item.symbol.name.as_str().into() diff --git a/helix-term/src/config.rs b/helix-term/src/config.rs index bcba8d8e1..615b95ddc 100644 --- a/helix-term/src/config.rs +++ b/helix-term/src/config.rs @@ -2,11 +2,13 @@ use crate::keymap; use crate::keymap::{merge_keys, KeyTrie}; use helix_loader::merge_toml_values; use helix_view::document::Mode; +use helix_view::icons::{Icons, ICONS}; use serde::Deserialize; use std::collections::HashMap; use std::fmt::Display; use std::fs; use std::io::Error as IOError; +use std::sync::Arc; use toml::de::Error as TomlError; #[derive(Debug, Clone, PartialEq)] @@ -22,6 +24,7 @@ pub struct ConfigRaw { pub theme: Option, pub keys: Option>, pub editor: Option, + pub icons: Option, } impl Default for Config { @@ -64,6 +67,7 @@ impl Config { global.and_then(|file| toml::from_str(&file).map_err(ConfigLoadError::BadConfig)); let local_config: Result = local.and_then(|file| toml::from_str(&file).map_err(ConfigLoadError::BadConfig)); + let res = match (global_config, local_config) { (Ok(global), Ok(local)) => { let mut keys = keymap::default(); @@ -84,6 +88,18 @@ impl Config { .map_err(ConfigLoadError::BadConfig)?, }; + let icons: Icons = match (global.icons, local.icons) { + (None, None) => Icons::default(), + (None, Some(val)) | (Some(val), None) => { + val.try_into().map_err(ConfigLoadError::BadConfig)? + } + (Some(global), Some(local)) => merge_toml_values(global, local, 3) + .try_into() + .map_err(ConfigLoadError::BadConfig)?, + }; + + ICONS.store(Arc::new(icons)); + Config { theme: local.theme.or(global.theme), keys, @@ -100,6 +116,14 @@ impl Config { if let Some(keymap) = config.keys { merge_keys(&mut keys, keymap); } + + let icons = config.icons.map_or_else( + || Ok(Icons::default()), + |val| val.try_into().map_err(ConfigLoadError::BadConfig), + )?; + + ICONS.store(Arc::new(icons)); + Config { theme: config.theme, keys, diff --git a/helix-term/src/handlers/document_colors.rs b/helix-term/src/handlers/document_colors.rs index 956cecbfb..ecee91c83 100644 --- a/helix-term/src/handlers/document_colors.rs +++ b/helix-term/src/handlers/document_colors.rs @@ -8,6 +8,7 @@ use helix_view::{ document::DocumentColorSwatches, events::{DocumentDidChange, DocumentDidOpen, LanguageServerExited, LanguageServerInitialized}, handlers::{lsp::DocumentColorsEvent, Handlers}, + icons::ICONS, DocumentId, Editor, Theme, }; use tokio::time::Instant; @@ -120,9 +121,11 @@ fn attach_document_colors( let mut color_swatches_padding = Vec::with_capacity(doc_colors.len()); let mut colors = Vec::with_capacity(doc_colors.len()); + let icons = ICONS.load(); + for (pos, color) in doc_colors { color_swatches_padding.push(InlineAnnotation::new(pos, " ")); - color_swatches.push(InlineAnnotation::new(pos, "■")); + color_swatches.push(InlineAnnotation::new(pos, icons.lsp().color())); colors.push(Theme::rgb_highlight( (color.red * 255.) as u8, (color.green * 255.) as u8, diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs index e17762bfc..230f350a1 100644 --- a/helix-term/src/ui/completion.rs +++ b/helix-term/src/ui/completion.rs @@ -9,6 +9,7 @@ use crate::{ use helix_core::snippets::{ActiveSnippet, RenderedSnippet, Snippet}; use helix_core::{self as core, chars, fuzzy::MATCHER, Change, Transaction}; use helix_lsp::{lsp, util, OffsetEncoding}; +use helix_view::icons::ICONS; use helix_view::{ editor::CompleteAction, handlers::lsp::SignatureHelpInvoked, @@ -45,7 +46,7 @@ impl menu::Item for CompletionItem { CompletionItem::Other(core::CompletionItem { label, .. }) => label, }; - let kind = match self { + let mut kind = match self { CompletionItem::Lsp(LspCompletionItem { item, .. }) => match item.kind { Some(lsp::CompletionItemKind::TEXT) => "text".into(), Some(lsp::CompletionItemKind::METHOD) => "method".into(), @@ -78,9 +79,13 @@ impl menu::Item for CompletionItem { }) .and_then(Color::from_hex) .map_or("color".into(), |color| { + let icons = ICONS.load(); Spans::from(vec![ Span::raw("color "), - Span::styled("■", Style::default().fg(color)), + Span::styled( + icons.lsp().color().to_string(), + Style::default().fg(color), + ), ]) }), Some(lsp::CompletionItemKind::FILE) => "file".into(), @@ -101,6 +106,13 @@ impl menu::Item for CompletionItem { CompletionItem::Other(core::CompletionItem { kind, .. }) => kind.as_ref().into(), }; + let icons = ICONS.load(); + let name = &kind.0[0].content; + + if let Some(icon) = icons.lsp().get(name) { + kind.0[0].content = format!("{icon} {name}").into(); + } + let label = Span::styled( label, if deprecated { diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs index 6be565747..012abf023 100644 --- a/helix-term/src/ui/editor.rs +++ b/helix-term/src/ui/editor.rs @@ -24,9 +24,10 @@ use helix_core::{ }; use helix_view::{ annotations::diagnostics::DiagnosticFilter, - document::{Mode, SCRATCH_BUFFER_NAME}, + document::{Mode, DEFAULT_LANGUAGE_NAME, SCRATCH_BUFFER_NAME}, editor::{CompleteAction, CursorShapeConfig}, graphics::{Color, CursorKind, Modifier, Rect, Style}, + icons::ICONS, input::{KeyEvent, MouseButton, MouseEvent, MouseEventKind}, keyboard::{KeyCode, KeyModifiers}, Document, Editor, Theme, View, @@ -647,7 +648,21 @@ impl EditorView { bufferline_inactive }; - let text = format!(" {}{} ", fname, if doc.is_modified() { "[+]" } else { "" }); + let lang = doc.language_name().unwrap_or(DEFAULT_LANGUAGE_NAME); + + let icons = ICONS.load(); + let icon = icons.mime().get(lang); + + let text = if lang == icon { + format!(" {} {}", fname, if doc.is_modified() { "[+] " } else { "" }) + } else { + format!( + " {icon} {} {}", + fname, + if doc.is_modified() { "[+] " } else { "" } + ) + }; + let used_width = viewport.x.saturating_sub(x); let rem_width = surface.area.width.saturating_sub(used_width); diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs index 7437cbd07..4aac9ae39 100644 --- a/helix-term/src/ui/statusline.rs +++ b/helix-term/src/ui/statusline.rs @@ -1,6 +1,7 @@ use helix_core::{coords_at_pos, encoding, Position}; use helix_lsp::lsp::DiagnosticSeverity; use helix_view::document::DEFAULT_LANGUAGE_NAME; +use helix_view::icons::ICONS; use helix_view::{ document::{Mode, SCRATCH_BUFFER_NAME}, graphics::Rect, @@ -240,10 +241,12 @@ where counts }); + let icons = ICONS.load(); + if warnings > 0 { write( context, - "●".to_string(), + icons.diagnostic().warning().to_string(), Some(context.editor.theme.get("warning")), ); write(context, format!(" {} ", warnings), None); @@ -252,7 +255,7 @@ where if errors > 0 { write( context, - "●".to_string(), + icons.diagnostic().error().to_string(), Some(context.editor.theme.get("error")), ); write(context, format!(" {} ", errors), None); @@ -282,10 +285,12 @@ where write(context, " W ".into(), None); } + let icons = ICONS.load(); + if warnings > 0 { write( context, - "●".to_string(), + icons.diagnostic().warning().to_string(), Some(context.editor.theme.get("warning")), ); write(context, format!(" {} ", warnings), None); @@ -294,7 +299,7 @@ where if errors > 0 { write( context, - "●".to_string(), + icons.diagnostic().error().to_string(), Some(context.editor.theme.get("error")), ); write(context, format!(" {} ", errors), None); @@ -410,9 +415,13 @@ fn render_file_type(context: &mut RenderContext, write: F) where F: Fn(&mut RenderContext, String, Option