refactor: make component icon take precedence over provider icon

lua/feline/generator.lua

@@ -6,8 +6,9 @@ local colors = feline.colors
 local separators = feline.separators
 local providers = require('feline.providers')
 
-local M ={}
-M.highlights = {}
+local M = {
+    highlights = {}
+}
 
 -- Check if current buffer is forced to have inactive statusline
 local function is_forced_inactive()
@@ -213,7 +214,9 @@ local function parse_component(component, winid)
 
     local hlname = parse_hl(hl)
 
-    if icon == nil and str ~= '' then
+    if is_component_empty then
+        icon = nil
+    elseif component.icon then
         icon = component.icon
     end
 

lua/feline/init.lua

@@ -67,6 +67,7 @@ function M.reset_highlights()
     M.update_inactive_windows()
 end
 
+-- Setup Feline using the provided configuration options
 function M.setup(config)
     -- Check if Neovim version is 0.5 or greater
     if fn.has('nvim-0.5') ~= 1 then

lua/feline/presets/default.lua

@@ -2,7 +2,6 @@ local lsp = require('feline.providers.lsp')
 local vi_mode_utils = require('feline.providers.vi_mode')
 
 local api = vim.api
-local b = vim.b
 
 local M = {
     components = {

lua/feline/presets/noicon.lua

@@ -2,7 +2,6 @@ local lsp = require('feline.providers.lsp')
 local vi_mode_utils = require('feline.providers.vi_mode')
 
 local api = vim.api
-local b = vim.b
 
 local M = {
     components = {

lua/feline/providers/file.lua

@@ -94,28 +94,17 @@ function M.file_info(component, winid)
     local extension = fn.fnamemodify(filename, ':e')
     local readonly_str, modified_str
 
-    local icon = component.icon
-
-    if not icon then
-        local ic, hl_group = require("nvim-web-devicons").get_icon(
-            filename, extension, { default = true }
-        )
-
-        local colored_icon
+    local icon_str, icon_hlname = require("nvim-web-devicons").get_icon(
+        filename, extension, { default = true }
+    )
 
-        if component.colored_icon == nil then
-            colored_icon = true
-        else
-            colored_icon = component.colored_icon
-        end
+    local icon = { str = icon_str }
 
-        icon = { str = ic }
+    if component.colored_icon == nil or component.colored_icon then
+        local fg = api.nvim_get_hl_by_name(icon_hlname, true).foreground
 
-        if colored_icon then
-            local fg = api.nvim_get_hl_by_name(hl_group, true)['foreground']
-            if fg then
-                icon["hl"] = { fg = string.format('#%06x', fg) }
-            end
+        if fg then
+            icon.hl = { fg = string.format('#%06x', fg) }
         end
     end
 

lua/feline/providers/git.lua

@@ -2,63 +2,37 @@ local api = vim.api
 
 local M = {}
 
-function M.git_branch(component, winid)
-    local icon
-    local str = ''
+function M.git_branch(_, winid)
     local ok, head = pcall(api.nvim_buf_get_var, api.nvim_win_get_buf(winid), 'gitsigns_head')
 
     if not ok then head = vim.g.gitsigns_head or '' end
-
-    if head ~= '' then
-        icon = component.icon or ' '
-        str = str .. head
-    end
-
-    return str, icon
+    return head, ' '
 end
 
-function M.git_diff_added(component, winid)
+-- Common function used by the git providers
+local function git_diff(winid, type)
     local ok, gsd = pcall(api.nvim_buf_get_var, api.nvim_win_get_buf(winid), 'gitsigns_status_dict')
 
-    local icon
-    local str = ''
-
-    if ok and gsd['added'] and gsd['added'] > 0 then
-        icon = component.icon or '  '
-        str = str .. gsd.added
+    if ok and gsd[type] and gsd[type] > 0 then
+        return tostring(gsd[type])
     end
 
-    return str, icon
+    return ''
 end
 
-function M.git_diff_removed(component, winid)
-    local ok, gsd = pcall(api.nvim_buf_get_var, api.nvim_win_get_buf(winid), 'gitsigns_status_dict')
-
-    local icon
-    local str = ''
-
-    if ok and gsd['removed'] and gsd['removed'] > 0 then
-        icon = component.icon or '  '
-        str = str .. gsd.removed
-    end
-
-    return str, icon
+function M.git_diff_added(_, winid)
+    return git_diff(winid, 'added'), '  '
 end
 
-function M.git_diff_changed(component, winid)
-    local ok, gsd = pcall(api.nvim_buf_get_var, api.nvim_win_get_buf(winid), 'gitsigns_status_dict')
-
-    local icon
-    local str = ''
-
-    if ok and gsd['changed'] and gsd['changed'] > 0 then
-        icon = component.icon or ' 柳'
-        str = str .. gsd.changed
-    end
+function M.git_diff_removed(_, winid)
+    return git_diff(winid, 'removed'), '  '
+end
 
-    return str, icon
+function M.git_diff_changed(_, winid)
+    return git_diff(winid, 'changed'),  ' 柳'
 end
 
+-- Utility function to check if git provider information is available
 function M.git_info_exists(winid)
     local ok, _ = pcall(api.nvim_buf_get_var, api.nvim_win_get_buf(winid), 'gitsigns_status_dict')
     return ok

lua/feline/providers/lsp.lua

@@ -16,6 +16,7 @@ function M.get_diagnostics_count(severity, bufnr)
     if not active_clients then return nil end
 
     local count = 0
+
     for _, client in pairs(active_clients) do
         count = count + vim.lsp.diagnostic.get_count(bufnr, severity, client.id)
     end
@@ -30,39 +31,38 @@ function M.diagnostics_exist(severity, bufnr)
     return diagnostics_count and diagnostics_count > 0
 end
 
-function M.lsp_client_names(component, winid)
+function M.lsp_client_names(_, winid)
     local clients = {}
-    local icon = component.icon or ' '
 
     for _, client in pairs(vim.lsp.buf_get_clients(api.nvim_win_get_buf(winid))) do
         clients[#clients+1] = client.name
     end
 
-    return table.concat(clients, ' '), icon
+    return table.concat(clients, ' '),  ' '
 end
 
-function M.diagnostic_errors(component, winid)
-    local count = M.get_diagnostics_count('Error', api.nvim_win_get_buf(winid))
+-- Common function used by the diagnostics providers
+local function diagnostics(winid, severity)
+    local count = M.get_diagnostics_count(severity, api.nvim_win_get_buf(winid))
+
     if not count or count == 0 then return '' end
-    return tostring(count), (component.icon or '  ')
+    return tostring(count)
 end
 
-function M.diagnostic_warnings(component, winid)
-    local count = M.get_diagnostics_count('Warning', api.nvim_win_get_buf(winid))
-    if not count or count == 0 then return '' end
-    return tostring(count), (component.icon or '  ')
+function M.diagnostic_errors(_, winid)
+    return diagnostics(winid, 'Error'), '  '
 end
 
-function M.diagnostic_hints(component, winid)
-    local count = M.get_diagnostics_count('Hint', api.nvim_win_get_buf(winid))
-    if not count or count == 0 then return '' end
-    return tostring(count), (component.icon or '  ')
+function M.diagnostic_warnings(_, winid)
+    return diagnostics(winid, 'Warning'), '  '
 end
 
-function M.diagnostic_info(component, winid)
-    local count = M.get_diagnostics_count('Information', api.nvim_win_get_buf(winid))
-    if not count or count == 0 then return '' end
-    return tostring(count), (component.icon or '  ')
+function M.diagnostic_hints(_, winid)
+    return diagnostics(winid, 'Hint'), '  '
+end
+
+function M.diagnostic_info(_, winid)
+    return diagnostics(winid, 'Information'), '  '
 end
 
 return M

lua/feline/providers/vi_mode.lua

@@ -55,12 +55,10 @@ function M.get_mode_highlight_name()
 end
 
 function M.vi_mode(component)
-    if component.icon then
-        if component.icon == '' then
-            return M.get_vim_mode()
-        else
-            return component.icon
-        end
+    if component.icon == '' then
+        return M.get_vim_mode()
+    elseif component.icon ~= nil then
+        return component.icon
     else
         return ''
     end