Run lua-format

Author: wbthomason

lua/lsp-status/extensions/clangd.lua

@@ -3,33 +3,24 @@ local util = require('lsp-status/util')
 local messages = {}
 
 ---@private
-local function init(_messages, _)
-  messages = _messages
-end
+local function init(_messages, _) messages = _messages end
 
 ---@private
-local function ensure_init(id)
-  util.ensure_init(messages, id, 'clangd')
-end
+local function ensure_init(id) util.ensure_init(messages, id, 'clangd') end
 
 local handlers = {
   ['textDocument/clangd.fileStatus'] = function(_, _, statusMessage, client_id)
     ensure_init(client_id)
-    messages[client_id].status = { uri = statusMessage.uri, content = statusMessage.state }
-  end,
+    messages[client_id].status = {uri = statusMessage.uri, content = statusMessage.state}
     vim.g.lsp_status_redraw = true
+  end
 }
 
 --- Return the handler {LSP Method: handler} table for `clangd`'s `fileStatus` extension
---@returns Table of extension method handlers, to be added to your `clangd` config
-local function setup()
-  return handlers
-end
-
-local M = {
-  _init = init,
-  setup = setup
-}
+-- @returns Table of extension method handlers, to be added to your `clangd` config
+local function setup() return handlers end
+
+local M = {_init = init, setup = setup}
 
 M = vim.tbl_extend('error', M, handlers)
 

lua/lsp-status/extensions/pyls_ms.lua

@@ -3,25 +3,21 @@ local statusline = require('lsp-status/statusline')
 
 local messages = {}
 ---@private
-local function init(_messages, _)
-  messages = _messages
-end
+local function init(_messages, _) messages = _messages end
 
 ---@private
-local function ensure_init(id)
-  util.ensure_init(messages, id, 'pyls_ms')
-end
+local function ensure_init(id) util.ensure_init(messages, id, 'pyls_ms') end
 
-local handlers =  {
+local handlers = {
   ['python/setStatusBarMessage'] = function(_, _, message, client_id)
     ensure_init(client_id)
-    messages[client_id].static_message = { content = message[1] }
+    messages[client_id].static_message = {content = message[1]}
     vim.g.lsp_status_redraw = true
   end,
   ['python/beginProgress'] = function(_, _, _, client_id)
     ensure_init(client_id)
     if not messages[client_id].progress[1] then
-      messages[client_id].progress[1] = { spinner = 1, title = 'MPLS' }
+      messages[client_id].progress[1] = {spinner = 1, title = 'MPLS'}
     end
   end,
   ['python/reportProgress'] = function(_, _, message, client_id)
@@ -31,21 +27,16 @@ local handlers =  {
   end,
   ['python/endProgress'] = function(_, _, _, client_id)
     messages[client_id].progress[1] = nil
-  end,
     vim.g.lsp_status_redraw = true
+  end
 }
 
 --- Return the handler {LSP Method: handler} table for `MPLS`'s progress and statusbar message
 --- extensions
---@returns Table of extension method handlers, to be added to your `pyls_ms` config
-local function setup()
-  return handlers
-end
+-- @returns Table of extension method handlers, to be added to your `pyls_ms` config
+local function setup() return handlers end
 
-local M = {
-  _init = init,
-  setup = setup
-}
+local M = {_init = init, setup = setup}
 
 M = vim.tbl_extend('error', M, handlers)
 

lua/lsp-status/statusline.lua

@@ -8,9 +8,7 @@ local icons
 
 local diagnostics = require('lsp-status/diagnostics')
 local messages = require('lsp-status/messaging').messages
-local aliases = {
-  pyls_ms = 'MPLS',
-}
+local aliases = {pyls_ms = 'MPLS'}
 
 local function make_statusline_component(diagnostics_key)
   return function(bufh)
@@ -27,7 +25,7 @@ local function init(_, _config)
     errors = config.indicator_errors,
     warnings = config.indicator_warnings,
     hints = config.indicator_hint,
-    info = config.indicator_info,
+    info = config.indicator_info
   }
 
   _errors = make_statusline_component('errors')
@@ -38,35 +36,36 @@ end
 
 local function get_lsp_statusline(bufnr)
   bufnr = bufnr or 0
-  if #vim.lsp.buf_get_clients(bufnr) == 0 then
-    return ''
-  end
-
+  if #vim.lsp.buf_get_clients(bufnr) == 0 then return '' end
   local buf_diagnostics = diagnostics(bufnr)
   local buf_messages = messages()
   local only_hint = true
   local some_diagnostics = false
   local status_parts = {}
   if buf_diagnostics.errors and buf_diagnostics.errors > 0 then
-    table.insert(status_parts, config.indicator_errors .. config.indicator_separator .. buf_diagnostics.errors)
+    table.insert(status_parts,
+                 config.indicator_errors .. config.indicator_separator .. buf_diagnostics.errors)
     only_hint = false
     some_diagnostics = true
   end
 
   if buf_diagnostics.warnings and buf_diagnostics.warnings > 0 then
-    table.insert(status_parts, config.indicator_warnings .. config.indicator_separator .. buf_diagnostics.warnings)
+    table.insert(status_parts, config.indicator_warnings .. config.indicator_separator ..
+                   buf_diagnostics.warnings)
     only_hint = false
     some_diagnostics = true
   end
 
   if buf_diagnostics.info and buf_diagnostics.info > 0 then
-    table.insert(status_parts, config.indicator_info .. config.indicator_separator .. buf_diagnostics.info)
+    table.insert(status_parts,
+                 config.indicator_info .. config.indicator_separator .. buf_diagnostics.info)
     only_hint = false
     some_diagnostics = true
   end
 
   if buf_diagnostics.hints and buf_diagnostics.hints > 0 then
-    table.insert(status_parts, config.indicator_hint .. config.indicator_separator .. buf_diagnostics.hints)
+    table.insert(status_parts,
+                 config.indicator_hint .. config.indicator_separator .. buf_diagnostics.hints)
     some_diagnostics = true
   end
 
@@ -77,26 +76,21 @@ local function get_lsp_statusline(bufnr)
     local contents
     if msg.progress then
       contents = msg.title
-      if msg.message then
-        contents = contents .. ' ' .. msg.message
-      end
+      if msg.message then contents = contents .. ' ' .. msg.message end
 
-      if msg.percentage then
-        contents = contents .. ' (' .. msg.percentage .. ')'
-      end
+      if msg.percentage then contents = contents .. ' (' .. msg.percentage .. ')' end
 
       if msg.spinner then
-        contents = config.spinner_frames[(msg.spinner % #config.spinner_frames) + 1] .. ' ' .. contents
+        contents = config.spinner_frames[(msg.spinner % #config.spinner_frames) + 1] .. ' ' ..
+                     contents
       end
     elseif msg.status then
       contents = msg.content
       if msg.uri then
         local filename = vim.uri_to_fname(msg.uri)
         filename = vim.fn.fnamemodify(filename, ':~:.')
         local space = math.min(60, math.floor(0.6 * vim.fn.winwidth(0)))
-        if #filename > space then
-          filename = vim.fn.pathshorten(filename)
-        end
+        if #filename > space then filename = vim.fn.pathshorten(filename) end
 
         contents = '(' .. filename .. ') ' .. contents
       end
@@ -116,26 +110,16 @@ local function get_lsp_statusline(bufnr)
     end
   end
 
-  if base_status ~= '' then
-    return symbol .. base_status .. ' '
-  end
-
+  if base_status ~= '' then return symbol .. base_status .. ' ' end
   return symbol .. config.indicator_ok .. ' '
 end
 
 local function get_component_functions()
-  return {
-    errors = _errors,
-    warnings = _warnings,
-    hints = _hints,
-    info = _info,
-  }
+  return {errors = _errors, warnings = _warnings, hints = _hints, info = _info}
 end
 
 -- Status line component for nvim-lsp
-local function lsp_status()
-  return vim.b.lsp_status_statusline or ''
-end
+local function lsp_status() return vim.g.lsp_status_statusline or '' end
 
 local M = {
   _init = init,

lua/lsp-status/timer.lua

@@ -1,9 +1,9 @@
 --- Timer instance
 local timer = nil
---- This flag is used to redraw one more time after the las LSP update.
+--- This flag is used to redraw one more time after the last LSP update.
 -- NOTE: This is achieved by setting the redraw_flag to true if
--- vim.b.lsp_status_redraw is true and there has been an update. Next time if
--- vim.b.lsp_status_redraw is false (no update) it will still redraw the
+-- vim.g.lsp_status_redraw is true and there has been an update. Next time if
+-- vim.g.lsp_status_redraw is false (no update) it will still redraw the
 -- statusline and this flag will be set to false.
 local redraw_flag = false
 
@@ -15,13 +15,13 @@ local function init(_, _config) config = vim.tbl_extend('force', config, _config
 -- so it should call in the vim.schedule_wrap()
 local function timer_callback()
   -- Check if need to redraw
-  local update_flag = vim.b.lsp_status_redraw
+  local update_flag = vim.g.lsp_status_redraw
   if update_flag or redraw_flag then
-    vim.b.lsp_status_redraw = false
+    vim.g.lsp_status_redraw = false
     -- Schedule the command when it's safe to call it
     local new_state = require('lsp-status/statusline').get_lsp_statusline()
-    if new_state ~= vim.b.lsp_status_statusline then
-      vim.b.lsp_status_statusline = new_state
+    if new_state ~= vim.g.lsp_status_statusline then
+      vim.g.lsp_status_statusline = new_state
       vim.api.nvim_command('redrawstatus!')
       -- If this was an lsp update (update_flag is true) redraw also next time
       -- by setting redraw_flag
@@ -40,9 +40,7 @@ end
 -- stopped
 local function register_timer()
   -- Guard the for an already defined timer
-  if timer ~= nil then
-    return
-  end
+  if timer ~= nil then return end
   timer = vim.loop.new_timer()
   -- Execute the timer every update_interval milliseconds
   timer:start(0, config.update_interval, vim.schedule_wrap(timer_callback))