refactor: Remove utils.request shim

* This is no longer needed as people have probably moved on from 0.5
This commit is contained in:
Simrat Grewal
2022-08-10 16:58:24 -07:00
parent d7542aab11
commit 197a9aa45f
5 changed files with 4 additions and 40 deletions

View File

@@ -1,7 +1,6 @@
local vim = vim local vim = vim
local main = require 'symbols-outline' local main = require 'symbols-outline'
local buf_request = require('symbols-outline.utils.lsp_utils').request
local M = {} local M = {}
@@ -24,8 +23,7 @@ function M.show_code_actions()
local node = main.state.flattened_outline_items[current_line] local node = main.state.flattened_outline_items[current_line]
local params = get_action_params(node, main.state.code_win) local params = get_action_params(node, main.state.code_win)
vim.lsp.buf_request(
buf_request(
params.bufnr, params.bufnr,
'textDocument/codeAction', 'textDocument/codeAction',
params, params,

View File

@@ -1,6 +1,5 @@
local so = require 'symbols-outline' local so = require 'symbols-outline'
local util = vim.lsp.util local util = vim.lsp.util
local buf_request = require('symbols-outline.utils.lsp_utils').request
local M = {} local M = {}
@@ -22,10 +21,11 @@ function M.show_hover()
local hover_params = get_hover_params(node, so.state.code_win) local hover_params = get_hover_params(node, so.state.code_win)
buf_request( vim.lsp.buf_request(
hover_params.bufnr, hover_params.bufnr,
'textDocument/hover', 'textDocument/hover',
hover_params, hover_params,
---@diagnostic disable-next-line: param-type-mismatch
function(_, result, _, config) function(_, result, _, config)
if not (result and result.contents) then if not (result and result.contents) then
-- return { 'No information available' } -- return { 'No information available' }

View File

@@ -1,7 +1,6 @@
local vim = vim local vim = vim
local main = require 'symbols-outline' local main = require 'symbols-outline'
local config = require 'symbols-outline.config' local config = require 'symbols-outline.config'
local buf_request = require('symbols-outline.utils.lsp_utils').request
local M = {} local M = {}

View File

@@ -1,5 +1,4 @@
local so = require 'symbols-outline' local so = require 'symbols-outline'
local buf_request = require('symbols-outline.utils.lsp_utils').request
local M = {} local M = {}
@@ -27,7 +26,7 @@ function M.rename()
params.newName = new_name params.newName = new_name
buf_request( vim.lsp.buf_request(
params.bufnr, params.bufnr,
'textDocument/rename', 'textDocument/rename',
params, params,

View File

@@ -1,37 +1,5 @@
local vim = vim
local M = {} local M = {}
-- callback args changed in Neovim 0.5.1/0.6. See:
-- https://github.com/neovim/neovim/pull/15504
local function mk_handler(fn)
return function(...)
local config_or_client_id = select(4, ...)
local is_new = type(config_or_client_id) ~= 'number'
if is_new then
fn(...)
else
local err = select(1, ...)
local method = select(2, ...)
local result = select(3, ...)
local client_id = select(4, ...)
local bufnr = select(5, ...)
local config = select(6, ...)
fn(
err,
result,
{ method = method, client_id = client_id, bufnr = bufnr },
config
)
end
end
end
-- from mfussenegger/nvim-lsp-compl@29a81f3
function M.request(bufnr, method, params, handler)
return vim.lsp.buf_request(bufnr, method, params, mk_handler(handler))
end
function M.is_buf_attached_to_lsp(bufnr) function M.is_buf_attached_to_lsp(bufnr)
local clients = vim.lsp.buf_get_clients(bufnr or 0) local clients = vim.lsp.buf_get_clients(bufnr or 0)
return clients ~= nil and #clients > 0 return clients ~= nil and #clients > 0