From 99e0dc9937b124dee7d8107185e804ff96466279 Mon Sep 17 00:00:00 2001
From: Raphael <glepnir@neovim.pro>
Date: Fri, 26 Aug 2022 20:49:40 +0800
Subject: fix: remove the config.commands (#2092)

* fix: remove the config.commands

* fix: format by stylua and remove comamnds test

* fix: remove commands from doc

* fix: remove unused function
---
 lua/lspconfig/configs.lua | 27 ---------------------------
 lua/lspconfig/util.lua    | 35 -----------------------------------
 2 files changed, 62 deletions(-)

(limited to 'lua')

diff --git a/lua/lspconfig/configs.lua b/lua/lspconfig/configs.lua
index a0129776..4bfe3f5c 100644
--- a/lua/lspconfig/configs.lua
+++ b/lua/lspconfig/configs.lua
@@ -10,18 +10,7 @@ function configs.__newindex(t, config_name, config_def)
     default_config = { config_def.default_config, 't' },
     on_new_config = { config_def.on_new_config, 'f', true },
     on_attach = { config_def.on_attach, 'f', true },
-    commands = { config_def.commands, 't', true },
   }
-  if config_def.commands then
-    for k, v in pairs(config_def.commands) do
-      validate {
-        ['command.name'] = { k, 's' },
-        ['command.fn'] = { v[1], 'f' },
-      }
-    end
-  else
-    config_def.commands = {}
-  end
 
   local M = {}
 
@@ -39,16 +28,7 @@ function configs.__newindex(t, config_name, config_def)
       filetypes = { config.filetype, 't', true },
       on_new_config = { config.on_new_config, 'f', true },
       on_attach = { config.on_attach, 'f', true },
-      commands = { config.commands, 't', true },
     }
-    if config.commands then
-      for k, v in pairs(config.commands) do
-        validate {
-          ['command.name'] = { k, 's' },
-          ['command.fn'] = { v[1], 'f' },
-        }
-      end
-    end
 
     config = tbl_deep_extend('keep', config, default_config)
 
@@ -287,15 +267,8 @@ function configs.__newindex(t, config_name, config_def)
     if client.config._on_attach then
       client.config._on_attach(client, bufnr)
     end
-    if client.config.commands and not vim.tbl_isempty(client.config.commands) then
-      M.commands = vim.tbl_deep_extend('force', M.commands, client.config.commands)
-    end
-    if not M.commands_created and not vim.tbl_isempty(M.commands) then
-      util.create_module_commands(config_name, M.commands)
-    end
   end
 
-  M.commands = config_def.commands
   M.name = config_name
   M.document_config = config_def
 
diff --git a/lua/lspconfig/util.lua b/lua/lspconfig/util.lua
index 0729430f..41855fc2 100644
--- a/lua/lspconfig/util.lua
+++ b/lua/lspconfig/util.lua
@@ -60,41 +60,6 @@ function M.add_hook_after(func, new_fn)
   end
 end
 
--- Maps lspconfig-style command options to nvim_create_user_command (i.e. |command-attributes|) option names.
-local opts_aliases = {
-  ['description'] = 'desc',
-}
-
----@param command_definition table<string | integer, any>
-function M._parse_user_command_options(command_definition)
-  ---@type table<string, string | boolean | number>
-  local opts = {}
-  for k, v in pairs(command_definition) do
-    if type(k) == 'string' then
-      local attribute = k.gsub(k, '^%-+', '')
-      opts[opts_aliases[attribute] or attribute] = v
-    elseif type(k) == 'number' and type(v) == 'string' and v:match '^%-' then
-      -- Splits strings like "-nargs=* -complete=customlist,v:lua.something" into { "-nargs=*", "-complete=customlist,v:lua.something" }
-      for _, command_attribute in ipairs(vim.split(v, '%s')) do
-        -- Splits attribute into a key-value pair, like "-nargs=*" to { "-nargs", "*" }
-        local attribute, value = unpack(vim.split(command_attribute, '=', { plain = true }))
-        attribute = attribute.gsub(attribute, '^%-+', '')
-        opts[opts_aliases[attribute] or attribute] = value or true
-      end
-    end
-  end
-  return opts
-end
-
-function M.create_module_commands(module_name, commands)
-  for command_name, def in pairs(commands) do
-    local opts = M._parse_user_command_options(def)
-    api.nvim_create_user_command(command_name, function(info)
-      require('lspconfig')[module_name].commands[command_name][1](unpack(info.fargs))
-    end, opts)
-  end
-end
-
 -- Some path utilities
 M.path = (function()
   local is_windows = uv.os_uname().version:match 'Windows'
-- 
cgit v1.2.3-70-g09d2