From 8cadf66e97119352313f011df4ccb8c3db0b95f1 Mon Sep 17 00:00:00 2001 From: Toby Vincent Date: Wed, 30 Nov 2022 14:01:02 -0600 Subject: revert(rust): revert custom expand_macro impl --- .../nvim/lua/tobyvin/plugins/rust-tools.lua | 40 ---------------------- 1 file changed, 40 deletions(-) (limited to 'nvim/.config') diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua b/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua index 18a0124..d98ae32 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua @@ -8,46 +8,6 @@ local utils = require("tobyvin.utils") local lsp = require("tobyvin.lsp") local dap = require("tobyvin.plugins.dap") -local function parse_lines(t) - local ret = {} - - local name = t.name - local text = "// Recursive expansion of the " .. name .. " macro" - table.insert(ret, "// " .. string.rep("=", string.len(text) - 3)) - table.insert(ret, text) - table.insert(ret, "// " .. string.rep("=", string.len(text) - 3)) - table.insert(ret, "") - - local expansion = t.expansion - for string in string.gmatch(expansion, "([^\n]+)") do - table.insert(ret, string) - end - - return ret -end - -local handler = function(_, result) - if result == nil then - vim.api.nvim_out_write("No macro under cursor!\n") - return - end - - local contents = parse_lines(result) - local opts = { - focus_id = "expand_macro", - close_events = { "BufLeave", "CursorMoved", "InsertEnter", "FocusLost" }, - border = "single", - scope = "cursor", - } - vim.lsp.util.open_floating_preview(contents, "rust", opts) -end - -require("rust-tools.expand_macro").expand_macro = function() - ---@diagnostic disable-next-line: missing-parameter - local params = vim.lsp.util.make_position_params() - rust_tools.utils.request(0, "rust-analyzer/expandMacro", params, handler) -end - rust_tools.setup({ tools = { hover_actions = { -- cgit v1.2.3-70-g09d2