From 0b599b0ace536391f34e4c5d65a13f0ca549c5d8 Mon Sep 17 00:00:00 2001
From: shadmansaleh <13149513+shadmansaleh@users.noreply.github.com>
Date: Mon, 11 Oct 2021 15:21:38 +0600
Subject: [PATCH] refactor: split diagnostics component (#81)

---
 lua/lualine/components/diagnostics.lua        | 219 ------------------
 lua/lualine/components/diagnostics/config.lua |  52 +++++
 lua/lualine/components/diagnostics/init.lua   | 109 +++++++++
 .../components/diagnostics/sources.lua        |  73 ++++++
 4 files changed, 234 insertions(+), 219 deletions(-)
 delete mode 100644 lua/lualine/components/diagnostics.lua
 create mode 100644 lua/lualine/components/diagnostics/config.lua
 create mode 100644 lua/lualine/components/diagnostics/init.lua
 create mode 100644 lua/lualine/components/diagnostics/sources.lua

diff --git a/lua/lualine/components/diagnostics.lua b/lua/lualine/components/diagnostics.lua
deleted file mode 100644
index b7fe114..0000000
--- a/lua/lualine/components/diagnostics.lua
+++ /dev/null
@@ -1,219 +0,0 @@
--- Copyright (c) 2020-2021 hoob3rt
--- MIT license, see LICENSE for more details.
-local lualine_require = require 'lualine_require'
-local modules = lualine_require.lazy_require {
-  highlight = 'lualine.highlight',
-  utils = 'lualine.utils.utils',
-  utils_notices = 'lualine.utils.notices',
-}
-
-local M = lualine_require.require 'lualine.component':extend()
-
-local default_symbols = {
-  icons = {
-    error = ' ', -- xf659
-    warn = ' ', -- xf529
-    info = ' ', -- xf7fc
-    hint = ' ', -- xf838
-  },
-  no_icons = { error = 'E:', warn = 'W:', info = 'I:', hint = 'H:' },
-}
-
-local default_options = {
-  colored = true,
-  update_in_insert = false,
-  sources = { 'nvim_lsp', 'coc' },
-  sections = { 'error', 'warn', 'info', 'hint' },
-  diagnostics_color = {
-    error = {
-      fg = modules.utils.extract_color_from_hllist(
-        'fg',
-        { 'DiagnosticError', 'LspDiagnosticsDefaultError', 'DiffDelete' },
-        '#e32636'
-      ),
-    },
-    warn = {
-      fg = modules.utils.extract_color_from_hllist(
-        'fg',
-        { 'DiagnosticWarn', 'LspDiagnosticsDefaultWarning', 'DiffText' },
-        '#ffa500'
-      ),
-    },
-    info = {
-      fg = modules.utils.extract_color_from_hllist(
-        'fg',
-        { 'DiagnosticInfo', 'LspDiagnosticsDefaultInformation', 'Normal' },
-        '#ffffff'
-      ),
-    },
-    hint = {
-      fg = modules.utils.extract_color_from_hllist(
-        'fg',
-        { 'DiagnosticHint', 'LspDiagnosticsDefaultHint', 'DiffChange' },
-        '#273faf'
-      ),
-    },
-  },
-}
--- Initializer
-function M:init(options)
-  -- Run super()
-  M.super.init(self, options)
-  -- Apply default options
-  self.options = vim.tbl_deep_extend('keep', self.options or {}, default_options)
-  -- Apply default symbols
-  self.symbols = vim.tbl_extend(
-    'keep',
-    self.options.symbols or {},
-    self.options.icons_enabled ~= false and default_symbols.icons or default_symbols.no_icons
-  )
-  -- Initialize highlight groups
-  if self.options.colored then
-    self.highlight_groups = {
-      error = modules.highlight.create_component_highlight_group(
-        self.options.diagnostics_color.error,
-        'diagnostics_error',
-        self.options
-      ),
-      warn = modules.highlight.create_component_highlight_group(
-        self.options.diagnostics_color.warn,
-        'diagnostics_warn',
-        self.options
-      ),
-      info = modules.highlight.create_component_highlight_group(
-        self.options.diagnostics_color.info,
-        'diagnostics_info',
-        self.options
-      ),
-      hint = modules.highlight.create_component_highlight_group(
-        self.options.diagnostics_color.hint,
-        'diagnostics_hint',
-        self.options
-      ),
-    }
-  end
-
-  -- Error out no source
-  if #self.options.sources < 1 then
-    print 'no sources for diagnostics configured'
-    return ''
-  end
-  -- Initialize variable to store last update so we can use it in insert
-  -- mode for no update_in_insert
-  self.last_update = ''
-end
-
-function M:update_status()
-  if not self.options.update_in_insert and vim.api.nvim_get_mode().mode:sub(1, 1) == 'i' then
-    return self.last_update
-  end
-  local error_count, warning_count, info_count, hint_count = 0, 0, 0, 0
-  local diagnostic_data = self.get_diagnostics(self.options.sources)
-  for _, data in pairs(diagnostic_data) do
-    error_count = error_count + data.error
-    warning_count = warning_count + data.warn
-    info_count = info_count + data.info
-    hint_count = hint_count + data.hint
-  end
-  local result = {}
-  local data = {
-    error = error_count,
-    warn = warning_count,
-    info = info_count,
-    hint = hint_count,
-  }
-  if self.options.colored then
-    local colors = {}
-    for name, hl in pairs(self.highlight_groups) do
-      colors[name] = modules.highlight.component_format_highlight(hl)
-    end
-    for _, section in ipairs(self.options.sections) do
-      if data[section] ~= nil and data[section] > 0 then
-        table.insert(result, colors[section] .. self.symbols[section] .. data[section])
-      end
-    end
-  else
-    for _, section in ipairs(self.options.sections) do
-      if data[section] ~= nil and data[section] > 0 then
-        table.insert(result, self.symbols[section] .. data[section])
-      end
-    end
-  end
-  self.last_update = ''
-  if result[1] ~= nil then
-    self.last_update = table.concat(result, ' ')
-  end
-  return self.last_update
-end
-
-M.diagnostic_sources = {
-  nvim_lsp = function()
-    local error_count = vim.lsp.diagnostic.get_count(0, 'Error')
-    local warning_count = vim.lsp.diagnostic.get_count(0, 'Warning')
-    local info_count = vim.lsp.diagnostic.get_count(0, 'Information')
-    local hint_count = vim.lsp.diagnostic.get_count(0, 'Hint')
-    return error_count, warning_count, info_count, hint_count
-  end,
-  nvim = function()
-    local diagnostics = vim.diagnostic.get(0)
-    local count = { 0, 0, 0, 0 }
-    for _, diagnostic in ipairs(diagnostics) do
-      count[diagnostic.severity] = count[diagnostic.severity] + 1
-    end
-    return count[vim.diagnostic.severity.ERROR],
-      count[vim.diagnostic.severity.WARN],
-      count[vim.diagnostic.severity.INFO],
-      count[vim.diagnostic.severity.HINT]
-  end,
-  coc = function()
-    local data = vim.b.coc_diagnostic_info
-    if data then
-      return data.error, data.warning, data.information, data.hint
-    else
-      return 0, 0, 0, 0
-    end
-  end,
-  ale = function()
-    local ok, data = pcall(vim.fn['ale#statusline#Count'], vim.fn.bufnr())
-    if ok then
-      return data.error + data.style_error, data.warning + data.style_warning, data.info, 0
-    else
-      return 0, 0, 0, 0
-    end
-  end,
-  vim_lsp = function()
-    local ok, data = pcall(vim.fn['lsp#get_buffer_diagnostics_counts'])
-    if ok then
-      return data.error, data.warning, data.information
-    else
-      return 0, 0, 0
-    end
-  end,
-}
-
-M.get_diagnostics = function(sources)
-  local result = {}
-  for index, source in ipairs(sources) do
-    if type(source) == 'string' then
-      local error_count, warning_count, info_count, hint_count = M.diagnostic_sources[source]()
-      result[index] = {
-        error = error_count,
-        warn = warning_count,
-        info = info_count,
-        hint = hint_count,
-      }
-    elseif type(source) == 'function' then
-      local source_result = source()
-      source_result = type(source_result) == 'table' and source_result or {}
-      result[index] = {
-        error = source_result.error or 0,
-        warn = source_result.warn or 0,
-        info = source_result.info or 0,
-        hint = source_result.hint or 0,
-      }
-    end
-  end
-  return result
-end
-
-return M
diff --git a/lua/lualine/components/diagnostics/config.lua b/lua/lualine/components/diagnostics/config.lua
new file mode 100644
index 0000000..4beb9b3
--- /dev/null
+++ b/lua/lualine/components/diagnostics/config.lua
@@ -0,0 +1,52 @@
+local require = require('lualine_require').require
+local utils = require 'lualine.utils.utils'
+local M = {}
+
+M.symbols = {
+  icons = {
+    error = ' ', -- xf659
+    warn = ' ', -- xf529
+    info = ' ', -- xf7fc
+    hint = ' ', -- xf838
+  },
+  no_icons = { error = 'E:', warn = 'W:', info = 'I:', hint = 'H:' },
+}
+
+M.options = {
+  colored = true,
+  update_in_insert = false,
+  sources = { 'nvim_lsp', 'coc' },
+  sections = { 'error', 'warn', 'info', 'hint' },
+  diagnostics_color = {
+    error = {
+      fg = utils.extract_color_from_hllist(
+        'fg',
+        { 'DiagnosticError', 'LspDiagnosticsDefaultError', 'DiffDelete' },
+        '#e32636'
+      ),
+    },
+    warn = {
+      fg = utils.extract_color_from_hllist(
+        'fg',
+        { 'DiagnosticWarn', 'LspDiagnosticsDefaultWarning', 'DiffText' },
+        '#ffa500'
+      ),
+    },
+    info = {
+      fg = utils.extract_color_from_hllist(
+        'fg',
+        { 'DiagnosticInfo', 'LspDiagnosticsDefaultInformation', 'Normal' },
+        '#ffffff'
+      ),
+    },
+    hint = {
+      fg = utils.extract_color_from_hllist(
+        'fg',
+        { 'DiagnosticHint', 'LspDiagnosticsDefaultHint', 'DiffChange' },
+        '#273faf'
+      ),
+    },
+  },
+}
+
+return M
diff --git a/lua/lualine/components/diagnostics/init.lua b/lua/lualine/components/diagnostics/init.lua
new file mode 100644
index 0000000..c5a19fe
--- /dev/null
+++ b/lua/lualine/components/diagnostics/init.lua
@@ -0,0 +1,109 @@
+-- Copyright (c) 2020-2021 hoob3rt
+-- MIT license, see LICENSE for more details.
+local lualine_require = require 'lualine_require'
+local modules = lualine_require.lazy_require {
+  default_config = 'lualine.components.diagnostics.config',
+  sources = 'lualine.components.diagnostics.sources',
+  highlight = 'lualine.highlight',
+  utils = 'lualine.utils.utils',
+  utils_notices = 'lualine.utils.notices',
+}
+
+local M = lualine_require.require('lualine.component'):extend()
+
+M.diagnostics_sources = modules.sources.sources
+M.get_diagnostics = modules.sources.get_diagnostics
+
+-- Initializer
+function M:init(options)
+  -- Run super()
+  M.super.init(self, options)
+  -- Apply default options
+  self.options = vim.tbl_deep_extend('keep', self.options or {}, modules.default_config.options)
+  -- Apply default symbols
+  self.symbols = vim.tbl_extend(
+    'keep',
+    self.options.symbols or {},
+    self.options.icons_enabled ~= false and modules.default_config.symbols.icons
+      or modules.default_config.symbols.no_icons
+  )
+  -- Initialize highlight groups
+  if self.options.colored then
+    self.highlight_groups = {
+      error = modules.highlight.create_component_highlight_group(
+        self.options.diagnostics_color.error,
+        'diagnostics_error',
+        self.options
+      ),
+      warn = modules.highlight.create_component_highlight_group(
+        self.options.diagnostics_color.warn,
+        'diagnostics_warn',
+        self.options
+      ),
+      info = modules.highlight.create_component_highlight_group(
+        self.options.diagnostics_color.info,
+        'diagnostics_info',
+        self.options
+      ),
+      hint = modules.highlight.create_component_highlight_group(
+        self.options.diagnostics_color.hint,
+        'diagnostics_hint',
+        self.options
+      ),
+    }
+  end
+
+  -- Error out no source
+  if #self.options.sources < 1 then
+    print 'no sources for diagnostics configured'
+    return ''
+  end
+  -- Initialize variable to store last update so we can use it in insert
+  -- mode for no update_in_insert
+  self.last_update = ''
+end
+
+function M:update_status()
+  if not self.options.update_in_insert and vim.api.nvim_get_mode().mode:sub(1, 1) == 'i' then
+    return self.last_update
+  end
+  local error_count, warning_count, info_count, hint_count = 0, 0, 0, 0
+  local diagnostic_data = modules.sources.get_diagnostics(self.options.sources)
+  for _, data in pairs(diagnostic_data) do
+    error_count = error_count + data.error
+    warning_count = warning_count + data.warn
+    info_count = info_count + data.info
+    hint_count = hint_count + data.hint
+  end
+  local result = {}
+  local data = {
+    error = error_count,
+    warn = warning_count,
+    info = info_count,
+    hint = hint_count,
+  }
+  if self.options.colored then
+    local colors = {}
+    for name, hl in pairs(self.highlight_groups) do
+      colors[name] = modules.highlight.component_format_highlight(hl)
+    end
+    for _, section in ipairs(self.options.sections) do
+      if data[section] ~= nil and data[section] > 0 then
+        table.insert(result, colors[section] .. self.symbols[section] .. data[section])
+      end
+    end
+  else
+    for _, section in ipairs(self.options.sections) do
+      if data[section] ~= nil and data[section] > 0 then
+        table.insert(result, self.symbols[section] .. data[section])
+      end
+    end
+  end
+  self.last_update = ''
+  if result[1] ~= nil then
+    self.last_update = table.concat(result, ' ')
+  end
+  return self.last_update
+end
+
+return M
diff --git a/lua/lualine/components/diagnostics/sources.lua b/lua/lualine/components/diagnostics/sources.lua
new file mode 100644
index 0000000..f221673
--- /dev/null
+++ b/lua/lualine/components/diagnostics/sources.lua
@@ -0,0 +1,73 @@
+local M = {}
+
+M.sources = {
+  nvim_lsp = function()
+    local error_count = vim.lsp.diagnostic.get_count(0, 'Error')
+    local warning_count = vim.lsp.diagnostic.get_count(0, 'Warning')
+    local info_count = vim.lsp.diagnostic.get_count(0, 'Information')
+    local hint_count = vim.lsp.diagnostic.get_count(0, 'Hint')
+    return error_count, warning_count, info_count, hint_count
+  end,
+  nvim = function()
+    local diagnostics = vim.diagnostic.get(0)
+    local count = { 0, 0, 0, 0 }
+    for _, diagnostic in ipairs(diagnostics) do
+      count[diagnostic.severity] = count[diagnostic.severity] + 1
+    end
+    return count[vim.diagnostic.severity.ERROR],
+      count[vim.diagnostic.severity.WARN],
+      count[vim.diagnostic.severity.INFO],
+      count[vim.diagnostic.severity.HINT]
+  end,
+  coc = function()
+    local data = vim.b.coc_diagnostic_info
+    if data then
+      return data.error, data.warning, data.information, data.hint
+    else
+      return 0, 0, 0, 0
+    end
+  end,
+  ale = function()
+    local ok, data = pcall(vim.fn['ale#statusline#Count'], vim.fn.bufnr())
+    if ok then
+      return data.error + data.style_error, data.warning + data.style_warning, data.info, 0
+    else
+      return 0, 0, 0, 0
+    end
+  end,
+  vim_lsp = function()
+    local ok, data = pcall(vim.fn['lsp#get_buffer_diagnostics_counts'])
+    if ok then
+      return data.error, data.warning, data.information
+    else
+      return 0, 0, 0
+    end
+  end,
+}
+
+M.get_diagnostics = function(sources)
+  local result = {}
+  for index, source in ipairs(sources) do
+    if type(source) == 'string' then
+      local error_count, warning_count, info_count, hint_count = M.sources[source]()
+      result[index] = {
+        error = error_count,
+        warn = warning_count,
+        info = info_count,
+        hint = hint_count,
+      }
+    elseif type(source) == 'function' then
+      local source_result = source()
+      source_result = type(source_result) == 'table' and source_result or {}
+      result[index] = {
+        error = source_result.error or 0,
+        warn = source_result.warn or 0,
+        info = source_result.info or 0,
+        hint = source_result.hint or 0,
+      }
+    end
+  end
+  return result
+end
+
+return M