Add macros for logging.

The shim is there but it isn't used yet.

Cargo.lock

@@ -1170,8 +1170,6 @@ name = "libclide"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "devicons",
- "libclide-macros",
  "log",
  "strum",
 ]

Cargo.toml

@@ -11,7 +11,6 @@ members = [".", "libclide", "libclide-macros", ]
 anyhow = "1.0.100"
 strum = "0.27.2"
 log = { version = "0.4.27", features = [] }
-devicons = "0.6.12"
 
 [dependencies]
 cxx = "1.0.95"
@@ -24,12 +23,12 @@ ratatui = "0.30.0"
 tui-tree-widget = "0.24.0"
 tui-logger = "0.18.1"
 edtui = "0.11.1"
+devicons = "0.6.12"
 libclide = { path = "./libclide" }
 libclide-macros = { path = "./libclide-macros" }
 anyhow = { workspace = true }
 strum = { workspace = true }
 log = { workspace = true }
-devicons = { workspace = true }
 
 [build-dependencies]
 # The link_qt_object_files feature is required for statically linking Qt 6.

libclide-macros/src/lib.rs

@@ -1,22 +1,25 @@
-// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
-//
-// SPDX-License-Identifier: GNU General Public License v3.0 or later
-
 use proc_macro::TokenStream;
 use quote::quote;
 use syn::{ItemStruct, parse_macro_input};
 
-#[proc_macro_derive(Loggable)]
-pub fn loggable(item: TokenStream) -> TokenStream {
+#[proc_macro_attribute]
+pub fn log_id(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemStruct);
+
     let struct_name = &input.ident;
     let generics = &input.generics;
 
+    // This is the important part
     let (impl_generics, type_generics, where_clause) = generics.split_for_impl();
+
     let struct_name_str = struct_name.to_string();
+
     let expanded = quote! {
-        impl #impl_generics libclide::log::Loggable for #struct_name #type_generics #where_clause {
-            const ID: &'static str = #struct_name_str;
+        #input
+
+        impl #impl_generics #struct_name #type_generics #where_clause {
+            #[allow(unused)]
+            pub const ID: &'static str = #struct_name_str;
         }
     };
 

libclide/Cargo.toml

@@ -7,5 +7,3 @@ edition = "2024"
 anyhow = { workspace = true }
 strum = { workspace = true }
 log = { workspace = true }
-devicons = { workspace = true }
-libclide-macros = { path = "../libclide-macros" }

libclide/src/fs.rs

@@ -3,5 +3,3 @@
 // SPDX-License-Identifier: GNU General Public License v3.0 or later
 
 pub mod entry_meta;
-
-pub use entry_meta::icon;

libclide/src/fs/entry_meta.rs

@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: GNU General Public License v3.0 or later
 
 use anyhow::{Context, Result};
-use devicons::FileIcon;
 use std::path::{Path, PathBuf};
 
 #[derive(Debug)]
@@ -11,7 +10,6 @@ pub struct EntryMeta {
     pub abs_path: String,
     pub file_name: String,
     pub is_dir: bool,
-    pub icon: FileIcon,
 }
 
 impl EntryMeta {
@@ -43,22 +41,10 @@ impl EntryMeta {
             .context(format!("Failed to get file name for path: {abs_path:?}"))?
             .to_string_lossy()
             .to_string();
-        let icon = crate::fs::icon(&abs_path);
         Ok(EntryMeta {
             abs_path,
             file_name,
             is_dir,
-            icon,
         })
     }
 }
-
-pub fn icon<P: AsRef<str>>(p: P) -> FileIcon {
-    let path = p.as_ref();
-    if Path::new(&path).is_dir() {
-        // Ensures directories are given a folder icon and not mistakenly resolved to a language.
-        // For example, a directory named `cpp` would otherwise return a C++ icon.
-        return FileIcon::from("dir/");
-    }
-    FileIcon::from(path)
-}

libclide/src/log.rs

@@ -3,7 +3,3 @@
 // SPDX-License-Identifier: GNU General Public License v3.0 or later
 
 pub mod macros;
-
-pub trait Loggable {
-    const ID: &'static str;
-}

libclide/src/log/macros.rs

@@ -1,75 +1,106 @@
-// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
-//
-// SPDX-License-Identifier: GNU General Public License v3.0 or later
-
 //! Logging targets allow filtering of log messages by their source. By default, the log crate sets
 //! the target to the module path where the log macro was invoked if no target is provided.
 //!
 //! These macros essentially disable using the default target and instead require the target to be
 //! explicitly set. This is to avoid implicit pooling of log messages under the same default target,
 //! which can make it difficult to filter log messages by their source.
-//!
-//! The Loggable trait can be implemented to automatically associate log messages with a struct.
-//! ```
-//! use libclide_macros::Loggable;
-//!
-//! #[derive(Loggable)]
-//! struct MyStruct;
-//! impl MyStruct {
-//!      fn my_method(&self) {
-//!          libclide::info!("This log message will use target <Self as Loggable>::ID, which is 'MyStruct'");
-//!      }
-//!  }
-//! ```
-//!
-//! If the struct does not derive or implement Loggable, the target variant of the log macros must
-//! be used instead.
-//! ```
-//! libclide::info!(target: "CustomTarget", "This log message will have the target 'CustomTarget'");
-//! ```
-//!
 
 #[macro_export]
 macro_rules! info {
+    // The target argument can be overridden using one of the following macros.
+    (logger: $logger:expr, target: $target:expr, $($arg:tt)+) => ({
+        log::info!(logger: $logger, target: $target, $($arg)+)
+    });
+
     (target: $target:expr, $($arg:tt)+) => ({
         log::info!(target: $target, $($arg)+)
     });
 
-    ($($arg:tt)+) => (log::info!(target: <Self as libclide::log::Loggable>::ID, $($arg)+))
+    // The target argument will default to Self::ID if not provided.
+    // Obviously, this is an error if Self::ID is not defined, forcing you to use the explicit form.
+    (logger: $logger:expr, $($arg:tt)+) => ({
+        log::info!(logger: $logger, target: Self::ID, $($arg)+)
+    });
+
+    ($($arg:tt)+) => (log::info!(target: Self::ID, $($arg)+))
 }
 
 #[macro_export]
 macro_rules! debug {
+    // The target argument can be overridden using one of the following macros.
+    (logger: $logger:expr, target: $target:expr, $($arg:tt)+) => ({
+        log::debug!(logger: $logger, target: $target, $($arg)+)
+    });
+
     (target: $target:expr, $($arg:tt)+) => ({
         log::debug!(target: $target, $($arg)+)
     });
 
-    ($($arg:tt)+) => (log::debug!(target: <Self as libclide::log::Loggable>::ID, $($arg)+))
+    // The target argument will default to Self::ID if not provided.
+    // Obviously, this is an error if Self::ID is not defined, forcing you to use the explicit form.
+    (logger: $logger:expr, $($arg:tt)+) => ({
+        log::debug!(logger: $logger, target: Self::ID, $($arg)+)
+    });
+
+    ($($arg:tt)+) => (log::debug!(target: Self::ID, $($arg)+))
 }
 
 #[macro_export]
 macro_rules! warn {
+    // The target argument can be overridden using one of the following macros.
+    (logger: $logger:expr, target: $target:expr, $($arg:tt)+) => ({
+        log::warn!(logger: $logger, target: $target, $($arg)+)
+    });
+
     (target: $target:expr, $($arg:tt)+) => ({
         log::warn!(target: $target, $($arg)+)
     });
 
-    ($($arg:tt)+) => (log::warn!(target: <Self as libclide::log::Loggable>::ID, $($arg)+))
+    // The target argument will default to Self::ID if not provided.
+    // Obviously, this is an error if Self::ID is not defined, forcing you to use the explicit form.
+    (logger: $logger:expr, $($arg:tt)+) => ({
+        log::warn!(logger: $logger, target: Self::ID, $($arg)+)
+    });
+
+    ($($arg:tt)+) => (log::warn!(target: Self::ID, $($arg)+))
 }
 
 #[macro_export]
 macro_rules! error {
+    // The target argument can be overridden using one of the following macros.
+    (logger: $logger:expr, target: $target:expr, $($arg:tt)+) => ({
+        log::error!(logger: $logger, target: $target, $($arg)+)
+    });
+
     (target: $target:expr, $($arg:tt)+) => ({
         log::error!(target: $target, $($arg)+)
     });
 
-    ($($arg:tt)+) => (log::error!(target: <Self as libclide::log::Loggable>::ID, $($arg)+))
+    // The target argument will default to Self::ID if not provided.
+    // Obviously, this is an error if Self::ID is not defined, forcing you to use the explicit form.
+    (logger: $logger:expr, $($arg:tt)+) => ({
+        log::error!(logger: $logger, target: Self::ID, $($arg)+)
+    });
+
+    ($($arg:tt)+) => (log::error!(target: Self::ID, $($arg)+))
 }
 
 #[macro_export]
 macro_rules! trace {
+    // The target argument can be overridden using one of the following macros.
+    (logger: $logger:expr, target: $target:expr, $($arg:tt)+) => ({
+        log::trace!(logger: $logger, target: $target, $($arg)+)
+    });
+
     (target: $target:expr, $($arg:tt)+) => ({
         log::trace!(target: $target, $($arg)+)
     });
 
-    ($($arg:tt)+) => (log::trace!(target: <Self as libclide::log::Loggable>::ID, $($arg)+))
+    // The target argument will default to Self::ID if not provided.
+    // Obviously, this is an error if Self::ID is not defined, forcing you to use the explicit form.
+    (logger: $logger:expr, $($arg:tt)+) => ({
+        log::trace!(logger: $logger, target: Self::ID, $($arg)+)
+    });
+
+    ($($arg:tt)+) => (log::trace!(target: Self::ID, $($arg)+))
 }

src/gui/filesystem.rs

@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: GNU General Public License v3.0 or later
 
 use cxx_qt_lib::{QModelIndex, QString};
+use devicons::FileIcon;
 use dirs;
 use std::fs;
 use std::path::Path;
@@ -141,6 +142,13 @@ impl qobject::FileSystem {
     }
 
     fn icon(self: std::pin::Pin<&mut Self>, path: &QString) -> QString {
-        QString::from(libclide::fs::icon(path.to_string().as_str()).to_string())
+        let str = path.to_string();
+        if Path::new(&str).is_dir() {
+            // Ensures directories are given a folder icon and not mistakenly resolved to a language.
+            // For example, a directory named `cpp` would otherwise return a C++ icon.
+            return QString::from(FileIcon::from("dir/").to_string());
+        }
+        let icon = FileIcon::from(str);
+        QString::from(icon.to_string())
     }
 }

src/main.rs

@@ -4,6 +4,7 @@
 
 use anyhow::{Context, Result, anyhow};
 use clap::Parser;
+use log::{info, trace};
 use std::process::{Command, Stdio};
 
 pub mod gui;
@@ -55,7 +56,7 @@ impl AppContext {
             // If no path was provided, use the current directory.
             None => std::env::current_dir().context("Failed to obtain current directory")?,
         };
-        libclide::info!(target:"main()", "Root path detected: {path:?}");
+        info!(target:"main()", "Root path detected: {path:?}");
 
         Ok(Self {
             path,
@@ -79,7 +80,7 @@ fn main() -> Result<()> {
         RunMode::GuiAttached => gui::run(app_context),
         RunMode::Tui => tui::run(app_context),
         RunMode::Gui => {
-            libclide::trace!(target:"main()", "Starting GUI in a new process");
+            trace!(target:"main()", "Starting GUI in a new process");
             Command::new(std::env::current_exe()?)
                 .args(["--gui", app_context.path.to_str().unwrap()])
                 .stdout(Stdio::null())

src/tui.rs

@@ -13,7 +13,7 @@ mod menu_bar;
 
 use crate::AppContext;
 use anyhow::{Context, Result};
-use libclide_macros::Loggable;
+use libclide_macros::log_id;
 use log::LevelFilter;
 use ratatui::Terminal;
 use ratatui::backend::CrosstermBackend;
@@ -29,19 +29,20 @@ use tui_logger::{
     TuiLoggerFile, TuiLoggerLevelOutput, init_logger, set_default_level, set_log_file,
 };
 
-#[derive(Loggable)]
+#[log_id]
 struct Tui {
     terminal: Terminal<CrosstermBackend<Stdout>>,
     root_path: std::path::PathBuf,
 }
 
 pub fn run(app_context: AppContext) -> Result<()> {
-    libclide::trace!(target: "clide::tui::run", "Starting TUI");
+    libclide::trace!(target:Tui::ID, "Starting TUI");
     Tui::new(app_context)?.start()
 }
 
 impl Tui {
     fn new(app_context: AppContext) -> Result<Self> {
+        libclide::trace!("Building {}", Self::ID);
         init_logger(LevelFilter::Trace)?;
         set_default_level(LevelFilter::Trace);
         libclide::debug!("Logging initialized");

src/tui/about.rs

@@ -2,13 +2,13 @@
 //
 // SPDX-License-Identifier: GNU General Public License v3.0 or later
 
-use libclide_macros::Loggable;
+use libclide_macros::log_id;
 use ratatui::buffer::Buffer;
 use ratatui::layout::{Constraint, Direction, Layout, Rect};
 use ratatui::text::{Line, Span};
 use ratatui::widgets::{Block, Borders, Clear, Padding, Paragraph, Widget, Wrap};
 
-#[derive(Loggable)]
+#[log_id]
 pub struct About {}
 
 impl About {

src/tui/app.rs

@@ -9,8 +9,7 @@ use crate::tui::explorer::Explorer;
 use crate::tui::logger::Logger;
 use crate::tui::menu_bar::MenuBar;
 use anyhow::{Context, Result};
-use libclide::log::Loggable;
-use libclide_macros::Loggable;
+use libclide_macros::log_id;
 use ratatui::DefaultTerminal;
 use ratatui::buffer::Buffer;
 use ratatui::crossterm::event;
@@ -31,7 +30,7 @@ pub enum AppComponent {
     MenuBar,
 }
 
-#[derive(Loggable)]
+#[log_id]
 pub struct App<'a> {
     editor_tab: EditorTab,
     explorer: Explorer<'a>,
@@ -43,7 +42,7 @@ pub struct App<'a> {
 
 impl<'a> App<'a> {
     pub fn new(root_path: PathBuf) -> Result<Self> {
-        libclide::trace!("Building {}", <Self as Loggable>::ID);
+        libclide::trace!(target:Self::ID, "Building {}", Self::ID);
         let app = Self {
             editor_tab: EditorTab::new(),
             explorer: Explorer::new(&root_path)?,
@@ -57,13 +56,13 @@ impl<'a> App<'a> {
 
     /// Logic that should be executed once on application startup.
     pub fn start(&mut self) -> Result<()> {
-        libclide::trace!("Starting App");
+        libclide::trace!(target:Self::ID, "Starting App");
         Ok(())
     }
 
     pub fn run(mut self, mut terminal: DefaultTerminal) -> Result<()> {
         self.start()?;
-        libclide::trace!("Entering App run loop");
+        libclide::trace!(target:Self::ID, "Entering App run loop");
         loop {
             terminal.draw(|f| {
                 f.render_widget(&mut self, f.area());
@@ -89,7 +88,7 @@ impl<'a> App<'a> {
                 Some(editor) => editor.component_state.help_text.clone(),
                 None => {
                     if !self.editor_tab.is_empty() {
-                        libclide::error!("Failed to get Editor while drawing bottom status bar");
+                        libclide::error!(target:Self::ID, "Failed to get Editor while drawing bottom status bar");
                     }
                     "Failed to get current Editor while getting widget help text".to_string()
                 }
@@ -113,26 +112,26 @@ impl<'a> App<'a> {
     }
 
     fn clear_focus(&mut self) {
-        libclide::info!("Clearing all widget focus");
+        libclide::info!(target:Self::ID, "Clearing all widget focus");
         self.explorer.component_state.set_focus(Focus::Inactive);
         self.explorer.component_state.set_focus(Focus::Inactive);
         self.logger.component_state.set_focus(Focus::Inactive);
         self.menu_bar.component_state.set_focus(Focus::Inactive);
         match self.editor_tab.current_editor_mut() {
             None => {
-                libclide::error!("Failed to get current Editor while clearing focus")
+                libclide::error!(target:Self::ID, "Failed to get current Editor while clearing focus")
             }
             Some(editor) => editor.component_state.set_focus(Focus::Inactive),
         }
     }
 
     fn change_focus(&mut self, focus: AppComponent) {
-        libclide::info!("Changing widget focus to {:?}", focus);
+        libclide::info!(target:Self::ID, "Changing widget focus to {:?}", focus);
         self.clear_focus();
         match focus {
             AppComponent::Editor => match self.editor_tab.current_editor_mut() {
                 None => {
-                    libclide::error!("Failed to get current Editor while changing focus")
+                    libclide::error!(target:Self::ID, "Failed to get current Editor while changing focus")
                 }
                 Some(editor) => editor.component_state.set_focus(Focus::Active),
             },
@@ -275,15 +274,13 @@ impl<'a> Component for App<'a> {
             Action::Quit | Action::Handled => Ok(action),
             Action::Save => match self.editor_tab.current_editor_mut() {
                 None => {
-                    libclide::error!(
-                        "Failed to get current editor while handling App Action::Save"
-                    );
+                    libclide::error!(target:Self::ID, "Failed to get current editor while handling App Action::Save");
                     Ok(Action::Noop)
                 }
                 Some(editor) => match editor.save() {
                     Ok(_) => Ok(Action::Handled),
                     Err(e) => {
-                        libclide::error!("Failed to save editor contents: {e}");
+                        libclide::error!(target:Self::ID, "Failed to save editor contents: {e}");
                         Ok(Action::Noop)
                     }
                 },
@@ -302,16 +299,14 @@ impl<'a> Component for App<'a> {
                 Err(_) => Ok(Action::Noop),
             },
             Action::ReloadFile => {
-                libclide::trace!("Reloading file for current editor");
+                libclide::trace!(target:Self::ID, "Reloading file for current editor");
                 if let Some(editor) = self.editor_tab.current_editor_mut() {
                     editor
                         .reload_contents()
                         .map(|_| Action::Handled)
                         .context("Failed to handle Action::ReloadFile")
                 } else {
-                    libclide::error!(
-                        "Failed to get current editor while handling App Action::ReloadFile"
-                    );
+                    libclide::error!(target:Self::ID, "Failed to get current editor while handling App Action::ReloadFile");
                     Ok(Action::Noop)
                 }
             }

src/tui/component.rs

@@ -8,7 +8,7 @@ use crate::tui::component::Focus::Inactive;
 use Focus::Active;
 use anyhow::Result;
 use libclide::theme::colors::Colors;
-use libclide_macros::Loggable;
+use libclide_macros::log_id;
 use ratatui::crossterm::event::{Event, KeyEvent, MouseEvent};
 use ratatui::style::Color;
 
@@ -62,7 +62,8 @@ pub trait Component {
     }
 }
 
-#[derive(Debug, Clone, Default, Loggable)]
+#[derive(Debug, Clone, Default)]
+#[log_id]
 pub struct ComponentState {
     pub(crate) focus: Focus,
     pub(crate) vis: Visibility,

src/tui/editor.rs

@@ -7,8 +7,7 @@ use anyhow::{Context, Result, bail};
 use edtui::{
     EditorEventHandler, EditorState, EditorTheme, EditorView, LineNumbers, Lines, SyntaxHighlighter,
 };
-use libclide::log::Loggable;
-use libclide_macros::Loggable;
+use libclide_macros::log_id;
 use ratatui::buffer::Buffer;
 use ratatui::crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
 use ratatui::layout::{Alignment, Rect};
@@ -17,18 +16,18 @@ use ratatui::widgets::{Block, Borders, Padding, Widget};
 use std::path::PathBuf;
 use syntect::parsing::SyntaxSet;
 
-#[derive(Loggable)]
+#[log_id]
 pub struct Editor {
     pub state: EditorState,
     pub event_handler: EditorEventHandler,
-    pub file_path: Option<PathBuf>,
+    pub file_path: Option<std::path::PathBuf>,
     syntax_set: SyntaxSet,
     pub(crate) component_state: ComponentState,
 }
 
 impl Editor {
     pub fn new(path: &std::path::Path) -> Self {
-        libclide::trace!("Building {}", <Self as Loggable>::ID);
+        libclide::trace!(target:Self::ID, "Building {}", Self::ID);
         Editor {
             state: EditorState::default(),
             event_handler: EditorEventHandler::default(),
@@ -42,10 +41,10 @@ impl Editor {
     }
 
     pub fn reload_contents(&mut self) -> Result<()> {
-        libclide::trace!("Reloading editor file contents {:?}", self.file_path);
+        libclide::trace!(target:Self::ID, "Reloading editor file contents {:?}", self.file_path);
         match self.file_path.clone() {
             None => {
-                libclide::error!("Failed to reload editor contents with None file_path");
+                libclide::error!(target:Self::ID, "Failed to reload editor contents with None file_path");
                 bail!("Failed to reload editor contents with None file_path")
             }
             Some(path) => self.set_contents(&path),
@@ -53,7 +52,7 @@ impl Editor {
     }
 
     pub fn set_contents(&mut self, path: &std::path::Path) -> Result<()> {
-        libclide::trace!("Setting Editor contents from path {:?}", path);
+        libclide::trace!(target:Self::ID, "Setting Editor contents from path {:?}", path);
         if let Ok(contents) = std::fs::read_to_string(path) {
             let lines: Vec<_> = contents
                 .lines()
@@ -69,10 +68,10 @@ impl Editor {
 
     pub fn save(&self) -> Result<()> {
         if let Some(path) = &self.file_path {
-            libclide::trace!("Saving Editor contents {:?}", path);
+            libclide::trace!(target:Self::ID, "Saving Editor contents {:?}", path);
             return std::fs::write(path, self.state.lines.to_string()).map_err(|e| e.into());
         };
-        libclide::error!("Failed saving Editor contents; file_path was None");
+        libclide::error!(target:Self::ID, "Failed saving Editor contents; file_path was None");
         bail!("File not saved. No file path set.")
     }
 }

src/tui/editor_tab.rs

@@ -5,8 +5,7 @@
 use crate::tui::component::{Action, Component, Focus, FocusState};
 use crate::tui::editor::Editor;
 use anyhow::{Context, Result, anyhow};
-use libclide::log::Loggable;
-use libclide_macros::Loggable;
+use libclide_macros::log_id;
 use ratatui::buffer::Buffer;
 use ratatui::crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
 use ratatui::layout::Rect;
@@ -17,7 +16,7 @@ use std::collections::HashMap;
 // Render the tabs with keys as titles
 // Tab keys can be file names.
 // Render the editor using the key as a reference for lookup
-#[derive(Loggable)]
+#[log_id]
 pub struct EditorTab {
     pub(crate) editors: HashMap<String, Editor>,
     tab_order: Vec<String>,
@@ -26,7 +25,7 @@ pub struct EditorTab {
 
 impl EditorTab {
     pub fn new() -> Self {
-        libclide::trace!("Building {}", <Self as Loggable>::ID);
+        libclide::trace!(target:Self::ID, "Building {}", Self::ID);
         Self {
             editors: HashMap::new(),
             tab_order: Vec::new(),
@@ -36,11 +35,7 @@ impl EditorTab {
 
     pub fn next_editor(&mut self) {
         let next = (self.current_editor + 1) % self.tab_order.len();
-        libclide::trace!(
-            "Moving from {} to next editor tab at {}",
-            self.current_editor,
-            next
-        );
+        libclide::trace!(target:Self::ID, "Moving from {} to next editor tab at {}", self.current_editor, next);
         self.set_tab_focus(Focus::Active, next);
         self.current_editor = next;
     }
@@ -50,11 +45,7 @@ impl EditorTab {
             .current_editor
             .checked_sub(1)
             .unwrap_or(self.tab_order.len() - 1);
-        libclide::trace!(
-            "Moving from {} to previous editor tab at {}",
-            self.current_editor,
-            prev
-        );
+        libclide::trace!(target:Self::ID, "Moving from {} to previous editor tab at {}", self.current_editor, prev);
         self.set_tab_focus(Focus::Active, prev);
         self.current_editor = prev;
     }
@@ -63,7 +54,7 @@ impl EditorTab {
         match self.tab_order.get(index) {
             None => {
                 if !self.tab_order.is_empty() {
-                    libclide::error!("Failed to get editor tab key with invalid index {index}");
+                    libclide::error!(target:Self::ID, "Failed to get editor tab key with invalid index {index}");
                 }
                 None
             }
@@ -81,19 +72,16 @@ impl EditorTab {
     }
 
     pub fn set_current_tab_focus(&mut self, focus: Focus) {
-        libclide::trace!(
-            "Setting current tab {} focus to {:?}",
-            self.current_editor,
-            focus
-        );
+        libclide::trace!(target:Self::ID, "Setting current tab {} focus to {:?}", self.current_editor, focus);
         self.set_tab_focus(focus, self.current_editor)
     }
 
     pub fn set_tab_focus(&mut self, focus: Focus, index: usize) {
-        libclide::trace!("Setting tab {} focus to {:?}", index, focus);
+        libclide::trace!(target:Self::ID, "Setting tab {} focus to {:?}", index, focus);
         if focus == Focus::Active && index != self.current_editor {
             // If we are setting another tab to active, disable the current one.
             libclide::trace!(
+                target:Self::ID,
                 "New tab {} focus set to Active; Setting current tab {} to Inactive",
                 index,
                 self.current_editor
@@ -102,11 +90,12 @@ impl EditorTab {
         }
         match self.get_editor_key(index) {
             None => {
-                libclide::error!("Failed setting tab focus for invalid key {index}");
+                libclide::error!(target:Self::ID, "Failed setting tab focus for invalid key {index}");
             }
             Some(key) => match self.editors.get_mut(&key) {
                 None => {
                     libclide::error!(
+                        target:Self::ID,
                         "Failed to update tab focus at index {} with invalid key: {}",
                         self.current_editor,
                         self.tab_order[self.current_editor]
@@ -118,12 +107,12 @@ impl EditorTab {
     }
 
     pub fn open_tab(&mut self, path: &std::path::Path) -> Result<()> {
-        libclide::trace!("Opening new EditorTab with path {:?}", path);
+        libclide::trace!(target:Self::ID, "Opening new EditorTab with path {:?}", path);
         if self
             .editors
             .contains_key(&path.to_string_lossy().to_string())
         {
-            libclide::warn!("EditorTab already opened with this file");
+            libclide::warn!(target:Self::ID, "EditorTab already opened with this file");
             return Ok(());
         }
 
@@ -148,12 +137,12 @@ impl EditorTab {
             .to_owned();
         match self.editors.remove(&key) {
             None => {
-                libclide::error!("Failed to remove editor tab {key} with invalid index {index}")
+                libclide::error!(target:Self::ID, "Failed to remove editor tab {key} with invalid index {index}")
             }
             Some(_) => {
                 self.prev_editor();
                 self.tab_order.remove(index);
-                libclide::info!("Closed editor tab {key} at index {index}")
+                libclide::info!(target:Self::ID, "Closed editor tab {key} at index {index}")
             }
         }
         Ok(())

src/tui/explorer.rs

@@ -5,8 +5,7 @@
 use crate::tui::component::{Action, Component, ComponentState, Focus, FocusState};
 use anyhow::{Context, Result, bail};
 use libclide::fs::entry_meta::EntryMeta;
-use libclide::log::Loggable;
-use libclide_macros::Loggable;
+use libclide_macros::log_id;
 use ratatui::buffer::Buffer;
 use ratatui::crossterm::event::{Event, KeyCode, KeyEvent, MouseEvent, MouseEventKind};
 use ratatui::layout::{Alignment, Position, Rect};
@@ -17,7 +16,8 @@ use std::fs;
 use std::path::{Path, PathBuf};
 use tui_tree_widget::{Tree, TreeItem, TreeState};
 
-#[derive(Debug, Loggable)]
+#[derive(Debug)]
+#[log_id]
 pub struct Explorer<'a> {
     root_path: EntryMeta,
     tree_items: TreeItem<'a, String>,
@@ -27,7 +27,7 @@ pub struct Explorer<'a> {
 
 impl<'a> Explorer<'a> {
     pub fn new(path: &PathBuf) -> Result<Self> {
-        libclide::trace!("Building {}", <Self as Loggable>::ID);
+        libclide::trace!("Building {}", Self::ID);
         let explorer = Explorer {
             root_path: EntryMeta::new(path)?,
             tree_items: Self::build_tree_from_path(path)?,
@@ -63,17 +63,17 @@ impl<'a> Explorer<'a> {
                 } else {
                     children.push(TreeItem::new_leaf(
                         entry_meta.abs_path.clone(),
-                        format!("{} {}", entry_meta.icon.icon, entry_meta.file_name.as_str()),
+                        entry_meta.file_name.clone(),
                     ));
                 }
             }
         }
 
-        // Note: The first argument is a unique identifier, where no. 2 TreeItems may share the same.
+        // Note: The first argument is a unique identifier, where no 2 TreeItems may share the same.
         // For a file tree this is fine because we shouldn't list the same object twice.
         TreeItem::new(
             path_meta.abs_path.clone(),
-            format!("{} {}", path_meta.icon.icon, path_meta.file_name.as_str()),
+            path_meta.file_name.clone(),
             children,
         )
         .context(format!(

src/tui/logger.rs

@@ -3,8 +3,7 @@
 // SPDX-License-Identifier: GNU General Public License v3.0 or later
 
 use crate::tui::component::{Action, Component, ComponentState, Focus, FocusState};
-use libclide::log::Loggable;
-use libclide_macros::Loggable;
+use libclide_macros::log_id;
 use log::LevelFilter;
 use ratatui::buffer::Buffer;
 use ratatui::crossterm::event::{Event, KeyCode, KeyEvent};
@@ -15,7 +14,7 @@ use tui_logger::{TuiLoggerLevelOutput, TuiLoggerSmartWidget, TuiWidgetEvent, Tui
 
 /// Any log written as info!(target:self.id(), "message") will work with this logger.
 /// The logger is bound to info!, debug!, error!, trace! macros within Tui::new().
-#[derive(Loggable)]
+#[log_id]
 pub struct Logger {
     state: TuiWidgetState,
     pub(crate) component_state: ComponentState,
@@ -23,7 +22,7 @@ pub struct Logger {
 
 impl Logger {
     pub fn new() -> Self {
-        libclide::trace!("Building {}", <Self as Loggable>::ID);
+        libclide::trace!(target:Self::ID, "Building {}", Self::ID);
         let state = TuiWidgetState::new();
         state.transition(TuiWidgetEvent::HideKey);
         Self {

src/tui/menu_bar.rs

@@ -7,7 +7,7 @@ use crate::tui::menu_bar::MenuBarItemOption::{
     About, CloseTab, Exit, Reload, Save, ShowHideExplorer, ShowHideLogger,
 };
 use anyhow::Context;
-use libclide_macros::Loggable;
+use libclide_macros::log_id;
 use ratatui::buffer::Buffer;
 use ratatui::crossterm::event::{KeyCode, KeyEvent};
 use ratatui::layout::Rect;
@@ -80,7 +80,7 @@ impl MenuBarItem {
     }
 }
 
-#[derive(Debug, Loggable)]
+#[log_id]
 pub struct MenuBar {
     selected: MenuBarItem,
     opened: Option<MenuBarItem>,
@@ -91,7 +91,7 @@ pub struct MenuBar {
 impl MenuBar {
     const DEFAULT_HELP: &str = "(←/h)/(→/l): Select option | Enter: Choose selection";
     pub fn new() -> Self {
-        libclide::trace!("Building");
+        libclide::trace!("Building {}", Self::ID);
         Self {
             selected: MenuBarItem::File,
             opened: None,