refactor(lualine): Rewrite sections, fix faulty annotations.

Signed-off-by: Guennadi Maximov C <[email protected]>

Author: DrKJeff16

lua/plugin/lualine/presets.lua

@@ -1,6 +1,3 @@
----@diagnostic disable:unused-function
----@diagnostic disable:unused-local
-
 local user = require('user_api')
 local Check = user.check
 local types = user.types.lualine
@@ -12,169 +9,166 @@ local floor = math.floor
 local M = {}
 
 ---@diagnostic disable-next-line:missing-fields
-M.components = {
-    buffers = {
-        'buffers',
-
-        filetype_names = {
-            TelescopePrompt = 'Telescope',
-            dashboard = 'Dashboard',
-            packer = 'Packer',
-            lazy = 'Lazy',
-            fzf = 'FZF',
-            alpha = 'Alpha',
-            NvimTree = 'Nvim Tree',
-        },
-
-        symbols = {
-            modified = ' ●', -- Text to show when the buffer is modified
-            alternate_file = '#', -- Text to show to identify the alternate file
-            directory = '', -- Text to show when the buffer is a directory
-        },
-
-        buffers_color = {
-            active = 'lualine_a_normal',
-            inactive = 'lualine_a_inactive',
-        },
+M.components = {}
+M.components.buffers = {
+    'buffers',
 
-        max_length = floor(vim.opt.columns:get() * 2 / 3),
+    filetype_names = {
+        TelescopePrompt = 'Telescope',
+        dashboard = 'Dashboard',
+        packer = 'Packer',
+        lazy = 'Lazy',
+        fzf = 'FZF',
+        alpha = 'Alpha',
+        NvimTree = 'Nvim Tree',
     },
 
-    diff = {
-        'diff',
-        colored = true,
-        diff_color = {
-            added = 'LuaLineDiffAdd',
-            modified = 'LuaLineDiffChange',
-            removed = 'LuaLineDiffDelete',
-        },
-
-        symbols = {
-            added = '+',
-            modified = '~',
-            removed = '-',
-        },
+    symbols = {
+        modified = ' ●', -- Text to show when the buffer is modified
+        alternate_file = '#', -- Text to identify the alternate file
+        directory = '', -- Text to show when the buffer is a directory
     },
 
-    encoding = { 'encoding' },
-    hostname = { 'hostname' },
-    location = { 'location' },
-    selectioncount = { 'selectioncount' },
+    buffers_color = {
+        active = 'lualine_a_normal',
+        inactive = 'lualine_a_inactive',
+    },
 
-    filename = {
-        'filename',
+    max_length = floor(vim.opt.columns:get() / 4),
+}
 
-        file_status = true,
-        newfile_status = false,
-        path = 4,
+M.components.diff = {
+    'diff',
+    colored = true,
+    diff_color = {
+        added = 'LuaLineDiffAdd',
+        modified = 'LuaLineDiffChange',
+        removed = 'LuaLineDiffDelete',
     },
 
-    filetype = {
-        'filetype',
-        colored = true,
-        icon_only = false,
-        icon = { align = 'right' },
+    symbols = {
+        added = '+',
+        modified = '~',
+        removed = '-',
     },
+}
 
-    branch = { 'branch' },
+M.components.branch = { 'branch' }
+M.components.encoding = { 'encoding' }
+M.components.hostname = { 'hostname' }
+M.components.location = { 'location' }
+M.components.selectioncount = { 'selectioncount' }
+M.components.filesize = { 'filesize' }
 
-    fileformat = {
-        'fileformat',
+M.components.filename = {
+    'filename',
 
-        symbols = {
-            unix = '', -- e712
-            dos = '', -- e70f
-            mac = '', -- e711
-        },
-    },
+    file_status = true,
+    newfile_status = false,
+    path = 4,
+}
 
-    searchcount = {
-        maxcount = 999,
-        timeout = 500,
-    },
+M.components.filetype = {
+    'filetype',
+    colored = true,
+    icon_only = false,
+    icon = { align = 'right' },
+}
+
+M.components.fileformat = {
+    'fileformat',
 
-    filesize = {
-        'filesize',
+    symbols = {
+        unix = '', -- e712
+        dos = '', -- e70f
+        mac = '', -- e711
     },
+}
 
-    tabs = {
-        'tabs',
+M.components.searchcount = {
+    'searchcount',
+    maxcount = 999,
+    timeout = 500,
+}
 
-        tab_max_length = floor(vim.opt.columns:get() / 3),
+M.components.tabs = {
+    'tabs',
 
-        mode = 2,
-        path = 1,
-    },
+    tab_max_length = floor(vim.opt.columns:get() / 3),
 
+    mode = 2,
+    path = 1,
     tabs_color = {
         active = 'lualine_b_normal',
         inactive = 'lualine_b_inactive',
     },
+}
 
-    windows = {
-        'windows',
-
-        max_length = floor(vim.opt.columns:get() * 2 / 3),
+M.components.windows = {
+    'windows',
 
-        disabled_buftypes = {
-            'quickfix',
-            'prompt',
-        },
+    max_length = floor(vim.opt.columns:get() / 5),
 
-        windows_color = {
-            active = 'lualine_z_normal',
-            inactive = 'lualine_z_inactive',
-        },
+    disabled_buftypes = {
+        'quickfix',
+        'prompt',
     },
 
-    diagnostics = {
-        'diagnostics',
-
-        sources = {
-            'nvim_workspace_diagnostic',
-        },
+    windows_color = {
+        active = 'lualine_z_normal',
+        inactive = 'lualine_z_inactive',
+    },
+}
 
-        sections = { 'error', 'warn' },
+M.components.diagnostics = {
+    'diagnostics',
 
-        diagnostics_color = {
-            error = 'DiagnosticError',
-            warn = 'DiagnosticWarn',
-            info = 'DiagnosticInfo',
-            hint = 'DiagnosticHint',
-        },
+    sources = {
+        'nvim_workspace_diagnostic',
+    },
 
-        symbols = {
-            error = '󰅚 ',
-            hint = '󰌶 ',
-            info = ' ',
-            warn = '󰀪 ',
-        },
+    sections = { 'error', 'warn', 'info', 'hint' },
 
-        colored = true,
-        update_in_insert = false,
-        always_visible = true,
+    diagnostics_color = {
+        error = 'DiagnosticError',
+        warn = 'DiagnosticWarn',
+        info = 'DiagnosticInfo',
+        hint = 'DiagnosticHint',
     },
 
-    datetime = {
-        'datetime',
-        style = 'uk',
+    symbols = {
+        error = '󰅚 ',
+        hint = '󰌶 ',
+        info = ' ',
+        warn = '󰀪 ',
     },
 
-    mode = {
-        'mode',
-        fmt = function(str) return str:sub(1, 1) end,
-    },
+    colored = true,
+    update_in_insert = false,
+    always_visible = true,
+}
+
+M.components.datetime = {
+    'datetime',
+    style = 'uk',
+}
+
+M.components.mode = {
+    'mode',
+    fmt = function(str) return str:sub(1, 1) end,
 }
 
 M.default = {
     lualine_a = {
         M.components.mode,
     },
     lualine_b = {
+        M.components.branch,
         M.components.filename,
     },
     lualine_c = {
         M.components.diagnostics,
+        M.components.diff,
     },
     lualine_x = {
         M.components.encoding,

lua/user_api/types/lualine.lua

@@ -75,16 +75,16 @@
 ---@field style? 'default'|'us'|'uk'|'iso'|string
 
 ---@class DiagnosticsInteger
----@field error? integer
----@field warn? integer
----@field info? integer
----@field hint? integer
+---@field error? string|integer
+---@field warn? string|integer
+---@field info? string|integer
+---@field hint? string|integer
 
 ---@class DiagnosticsColor: DiagnosticsInteger
----@field error? integer
----@field warn? integer
----@field info? integer
----@field hint? integer
+---@field error? string|integer
+---@field warn? string|integer
+---@field info? string|integer
+---@field hint? string|integer
 
 ---@class LuaLine.Components.Diagnostics
 ---@field [1] 'diagnostics'