Update lspconfig, add indent-blanklineHEADmaster

indent-blankline is probably old because I've actually been using it for
ages, but I have a strict if-it-ain't-broke policy, so I'm not going to
update it.

lspconfig *was* broke though with nvim 0.10, so now it's fixed.

2 files changed, 0 insertions, 342 deletions

diff --git a/start/lspconfig-0.1.3/lua/lspconfig/ui/lspinfo.lua b/start/lspconfig-0.1.3/lua/lspconfig/ui/lspinfo.lua
deleted file mode 100644
index 42a7fed..0000000
--- a/start/lspconfig-0.1.3/lua/lspconfig/ui/lspinfo.lua
+++ /dev/null
@@ -1,225 +0,0 @@
-local configs = require 'lspconfig.configs'
-local windows = require 'lspconfig.ui.windows'
-local util = require 'lspconfig.util'
-
-local error_messages = {
-  cmd_not_found = 'Unable to find executable. Please check your path and ensure the server is installed',
-  no_filetype_defined = 'No filetypes defined, Please define filetypes in setup()',
-}
-
-local function trim_blankspace(cmd)
-  local trimmed_cmd = {}
-  for _, str in pairs(cmd) do
-    table.insert(trimmed_cmd, str:match '^%s*(.*)')
-  end
-  return trimmed_cmd
-end
-
-local function indent_lines(lines, offset)
-  return vim.tbl_map(function(val)
-    return offset .. val
-  end, lines)
-end
-
-local function remove_newlines(cmd)
-  cmd = trim_blankspace(cmd)
-  cmd = table.concat(cmd, ' ')
-  cmd = vim.split(cmd, '\n')
-  cmd = trim_blankspace(cmd)
-  cmd = table.concat(cmd, ' ')
-  return cmd
-end
-
-local function make_config_info(config)
-  local config_info = {}
-  config_info.name = config.name
-  if config.cmd then
-    config_info.cmd = remove_newlines(config.cmd)
-    if vim.fn.executable(config.cmd[1]) == 1 then
-      config_info.cmd_is_executable = 'true'
-    else
-      config_info.cmd_is_executable = error_messages.cmd_not_found
-    end
-  else
-    config_info.cmd = 'cmd not defined'
-    config_info.cmd_is_executable = 'NA'
-  end
-
-  local buffer_dir = vim.fn.expand '%:p:h'
-  config_info.root_dir = config.get_root_dir(buffer_dir) or 'NA'
-  config_info.autostart = (config.autostart and 'true') or 'false'
-  config_info.handlers = table.concat(vim.tbl_keys(config.handlers), ', ')
-  config_info.filetypes = table.concat(config.filetypes or {}, ', ')
-
-  local lines = {
-    'Config: ' .. config_info.name,
-  }
-
-  local info_lines = {
-    'filetypes:         ' .. config_info.filetypes,
-    'root directory:    ' .. config_info.root_dir,
-    'cmd:               ' .. config_info.cmd,
-    'cmd is executable: ' .. config_info.cmd_is_executable,
-    'autostart:         ' .. config_info.autostart,
-    'custom handlers:   ' .. config_info.handlers,
-  }
-
-  vim.list_extend(lines, indent_lines(info_lines, '\t'))
-
-  return lines
-end
-
-local function make_client_info(client)
-  local client_info = {}
-
-  client_info.cmd = remove_newlines(client.config.cmd)
-  if client.workspaceFolders then
-    client_info.root_dir = client.workspaceFolders[1].name
-  else
-    client_info.root_dir = 'Running in single file mode.'
-  end
-  client_info.filetypes = table.concat(client.config.filetypes or {}, ', ')
-  client_info.autostart = (client.config.autostart and 'true') or 'false'
-  client_info.attached_buffers_list = table.concat(vim.lsp.get_buffers_by_client_id(client.id), ', ')
-
-  local lines = {
-    '',
-    'Client: '
-      .. client.name
-      .. ' (id: '
-      .. tostring(client.id)
-      .. ', pid: '
-      .. tostring(client.rpc.pid)
-      .. ', bufnr: ['
-      .. client_info.attached_buffers_list
-      .. '])',
-  }
-
-  local info_lines = {
-    'filetypes:       ' .. client_info.filetypes,
-    'autostart:       ' .. client_info.autostart,
-    'root directory:  ' .. client_info.root_dir,
-    'cmd:             ' .. client_info.cmd,
-  }
-
-  if client.config.lspinfo then
-    local server_specific_info = client.config.lspinfo(client.config)
-    info_lines = vim.list_extend(info_lines, server_specific_info)
-  end
-
-  vim.list_extend(lines, indent_lines(info_lines, '\t'))
-
-  return lines
-end
-
-return function()
-  -- These options need to be cached before switching to the floating
-  -- buffer.
-  local buf_clients = vim.lsp.buf_get_clients()
-  local clients = vim.lsp.get_active_clients()
-  local buffer_filetype = vim.bo.filetype
-
-  local win_info = windows.percentage_range_window(0.8, 0.7)
-  local bufnr, win_id = win_info.bufnr, win_info.win_id
-
-  local buf_lines = {}
-
-  local buf_client_names = {}
-  for _, client in pairs(buf_clients) do
-    table.insert(buf_client_names, client.name)
-  end
-
-  local buf_client_ids = {}
-  for _, client in pairs(buf_clients) do
-    table.insert(buf_client_ids, client.id)
-  end
-
-  local other_active_clients = {}
-  local client_names = {}
-  for _, client in pairs(clients) do
-    if not vim.tbl_contains(buf_client_ids, client.id) then
-      table.insert(other_active_clients, client)
-    end
-    table.insert(client_names, client.name)
-  end
-
-  local header = {
-    '',
-    'Language client log: ' .. (vim.lsp.get_log_path()),
-    'Detected filetype:   ' .. buffer_filetype,
-  }
-  vim.list_extend(buf_lines, header)
-
-  local buffer_clients_header = {
-    '',
-    tostring(#vim.tbl_keys(buf_clients)) .. ' client(s) attached to this buffer: ',
-  }
-
-  vim.list_extend(buf_lines, buffer_clients_header)
-  for _, client in pairs(buf_clients) do
-    local client_info = make_client_info(client)
-    vim.list_extend(buf_lines, client_info)
-  end
-
-  local other_active_section_header = {
-    '',
-    tostring(#other_active_clients) .. ' active client(s) not attached to this buffer: ',
-  }
-  if not vim.tbl_isempty(other_active_clients) then
-    vim.list_extend(buf_lines, other_active_section_header)
-  end
-  for _, client in pairs(other_active_clients) do
-    local client_info = make_client_info(client)
-    vim.list_extend(buf_lines, client_info)
-  end
-
-  local other_matching_configs_header = {
-    '',
-    'Other clients that match the filetype: ' .. buffer_filetype,
-    '',
-  }
-
-  local other_matching_configs = util.get_other_matching_providers(buffer_filetype)
-
-  if not vim.tbl_isempty(other_matching_configs) then
-    vim.list_extend(buf_lines, other_matching_configs_header)
-    for _, config in pairs(other_matching_configs) do
-      vim.list_extend(buf_lines, make_config_info(config))
-    end
-  end
-
-  local matching_config_header = {
-    '',
-    'Configured servers list: ' .. table.concat(vim.tbl_keys(configs), ', '),
-  }
-  vim.list_extend(buf_lines, matching_config_header)
-
-  local fmt_buf_lines = indent_lines(buf_lines, ' ')
-
-  fmt_buf_lines = vim.lsp.util._trim(fmt_buf_lines, {})
-
-  vim.api.nvim_buf_set_lines(bufnr, 0, -1, true, fmt_buf_lines)
-  vim.api.nvim_buf_set_option(bufnr, 'modifiable', false)
-  vim.api.nvim_buf_set_option(bufnr, 'filetype', 'lspinfo')
-
-  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<esc>', '<cmd>bd<CR>', { noremap = true })
-  vim.api.nvim_command(
-    string.format('autocmd BufHidden,BufLeave <buffer> ++once lua pcall(vim.api.nvim_win_close, %d, true)', win_id)
-  )
-
-  vim.fn.matchadd(
-    'Error',
-    error_messages.no_filetype_defined .. '.\\|' .. 'cmd not defined\\|' .. error_messages.cmd_not_found
-  )
-  vim.cmd 'let m=matchadd("string", "true")'
-  vim.cmd 'let m=matchadd("error", "false")'
-  for _, config in pairs(configs) do
-    vim.fn.matchadd('Title', '\\%(Client\\|Config\\):.*\\zs' .. config.name .. '\\ze')
-    vim.fn.matchadd('Visual', 'list:.*\\zs' .. config.name .. '\\ze')
-    if config.filetypes then
-      for _, ft in pairs(config.filetypes) do
-        vim.fn.matchadd('Type', '\\%(filetypes\\|filetype\\):.*\\zs' .. ft .. '\\ze')
-      end
-    end
-  end
-end
diff --git a/start/lspconfig-0.1.3/lua/lspconfig/ui/windows.lua b/start/lspconfig-0.1.3/lua/lspconfig/ui/windows.lua
deleted file mode 100644
index 8a39204..0000000
--- a/start/lspconfig-0.1.3/lua/lspconfig/ui/windows.lua
+++ /dev/null
@@ -1,117 +0,0 @@
--- The following is extracted and modified from plenary.vnim by
--- TJ Devries. It is not a stable API, and is expected to change
---
-local function apply_defaults(original, defaults)
-  if original == nil then
-    original = {}
-  end
-
-  original = vim.deepcopy(original)
-
-  for k, v in pairs(defaults) do
-    if original[k] == nil then
-      original[k] = v
-    end
-  end
-
-  return original
-end
-
-local win_float = {}
-
-win_float.default_options = {
-  winblend = 15,
-  percentage = 0.9,
-}
-
-function win_float.default_opts(options)
-  options = apply_defaults(options, win_float.default_options)
-
-  local width = math.floor(vim.o.columns * options.percentage)
-  local height = math.floor(vim.o.lines * options.percentage)
-
-  local top = math.floor(((vim.o.lines - height) / 2) - 1)
-  local left = math.floor((vim.o.columns - width) / 2)
-
-  local opts = {
-    relative = 'editor',
-    row = top,
-    col = left,
-    width = width,
-    height = height,
-    style = 'minimal',
-    border = {
-      { ' ', 'NormalFloat' },
-      { ' ', 'NormalFloat' },
-      { ' ', 'NormalFloat' },
-      { ' ', 'NormalFloat' },
-      { ' ', 'NormalFloat' },
-      { ' ', 'NormalFloat' },
-      { ' ', 'NormalFloat' },
-      { ' ', 'NormalFloat' },
-    },
-  }
-
-  return opts
-end
-
---- Create window that takes up certain percentags of the current screen.
----
---- Works regardless of current buffers, tabs, splits, etc.
---@param col_range number | Table:
---                  If number, then center the window taking up this percentage of the screen.
---                  If table, first index should be start, second_index should be end
---@param row_range number | Table:
---                  If number, then center the window taking up this percentage of the screen.
---                  If table, first index should be start, second_index should be end
-function win_float.percentage_range_window(col_range, row_range, options)
-  options = apply_defaults(options, win_float.default_options)
-
-  local win_opts = win_float.default_opts(options)
-  win_opts.relative = 'editor'
-
-  local height_percentage, row_start_percentage
-  if type(row_range) == 'number' then
-    assert(row_range <= 1)
-    assert(row_range > 0)
-    height_percentage = row_range
-    row_start_percentage = (1 - height_percentage) / 2
-  elseif type(row_range) == 'table' then
-    height_percentage = row_range[2] - row_range[1]
-    row_start_percentage = row_range[1]
-  else
-    error(string.format("Invalid type for 'row_range': %p", row_range))
-  end
-
-  win_opts.height = math.ceil(vim.o.lines * height_percentage)
-  win_opts.row = math.ceil(vim.o.lines * row_start_percentage)
-
-  local width_percentage, col_start_percentage
-  if type(col_range) == 'number' then
-    assert(col_range <= 1)
-    assert(col_range > 0)
-    width_percentage = col_range
-    col_start_percentage = (1 - width_percentage) / 2
-  elseif type(col_range) == 'table' then
-    width_percentage = col_range[2] - col_range[1]
-    col_start_percentage = col_range[1]
-  else
-    error(string.format("Invalid type for 'col_range': %p", col_range))
-  end
-
-  win_opts.col = math.floor(vim.o.columns * col_start_percentage)
-  win_opts.width = math.floor(vim.o.columns * width_percentage)
-
-  local bufnr = options.bufnr or vim.api.nvim_create_buf(false, true)
-  local win_id = vim.api.nvim_open_win(bufnr, true, win_opts)
-  vim.api.nvim_win_set_buf(win_id, bufnr)
-
-  vim.cmd 'setlocal nocursorcolumn ts=2 sw=2'
-
-  return {
-    bufnr = bufnr,
-    win_id = win_id,
-  }
-end
-
-return win_float