update codeaction

lua/navigator/codeAction.lua

@@ -5,9 +5,102 @@ local code_action = {}
 local gui = require "navigator.gui"
 local config = require("navigator").config_values()
 local api = vim.api
+trace = log
 
 local sign_name = "NavigatorLightBulb"
 
+--- `codeAction/resolve`
+-- from neovim buf.lua, change vim.ui.select to gui
+local function on_code_action_results(results, ctx)
+  local action_tuples = {}
+  log(results)
+  for client_id, result in pairs(results) do
+    for _, action in pairs(result.result or {}) do
+      table.insert(action_tuples, {client_id, action})
+    end
+  end
+  if #action_tuples == 0 then
+    vim.notify('No code actions available', vim.log.levels.INFO)
+    return
+  end
+
+  log(action_tuples, ctx)
+  local data = {"   Auto Fix  <C-o> Apply <C-e> Exit"}
+  for i, act in pairs(action_tuples) do
+    local title = 'apply action'
+    local action = act[2]
+
+    if action.edit and action.edit.title then
+      title = action.edit.title:gsub("\r\n", "\\r\\n")
+    elseif action.title then
+      title = action.title:gsub("\r\n", "\\r\\n")
+    end
+    title = title:gsub("\n", "\\n")
+    title = string.format("[%d] %s", i, title)
+    table.insert(data, title)
+    action_tuples[i].display_title = title
+  end
+
+  log(action_tuples)
+  local width = 42
+  for _, str in ipairs(data) do
+    if #str > width then
+      width = #str
+    end
+  end
+
+  local divider = string.rep('─', width + 2)
+
+  table.insert(data, 2, divider)
+  -- local apply = require('navigator.lspwrapper').apply_action
+  -- local function apply_action(action)
+  --   local action_chosen = nil
+  --   for key, value in pairs(actions) do
+  --     if value.display_title == action then
+  --       action_chosen = value
+  --     end
+  --   end
+  --
+  --   if action_chosen == nil then
+  --     log("no match for ", action, actions)
+  --     return
+  --   end
+  --   apply(action_chosen)
+  -- end
+
+  local listview = gui.new_list_view {
+    items = data,
+    width = width + 4,
+    loc = "top_center",
+    relative = "cursor",
+    rawdata = true,
+    data = data,
+    on_confirm = function(item)
+      trace(item)
+      local action_chosen = nil
+      for key, value in pairs(action_tuples) do
+        if value.display_title == item then
+          action_chosen = value
+        end
+      end
+      if action_chosen == nil then
+        log("no match for ", item, action_tuples)
+        return
+      end
+      require('navigator.lspwrapper').on_user_choice(action_chosen, ctx)
+
+    end,
+    on_move = function(pos)
+      trace(pos)
+      return pos
+    end
+  }
+
+  log("new buffer", listview.bufnr)
+  vim.api.nvim_buf_add_highlight(listview.bufnr, -1, 'Title', 0, 0, -1)
+
+end
+
 local diagnostic = vim.diagnostic or vim.lsp.diagnostic
 code_action.code_action_handler = util.mk_handler(function(err, actions, ctx, cfg)
   if actions == nil or vim.tbl_isempty(actions) or err then
@@ -165,7 +258,6 @@ function code_action:render_action_virtual_text(line, diagnostics)
 end
 
 local special_buffers = {
-  ["LspSagaCodecode_action"] = true,
   ["lspsagafinder"] = true,
   ["NvimTree"] = true,
   ["vista"] = true,
@@ -191,13 +283,34 @@ local code_action_req = function(_call_back_fn, diagnostics)
   vim.lsp.buf_request(0, "textDocument/codeAction", params, callback)
 end
 
--- code_action.code_action = function()
---   local diagnostics = vim.lsp.diagnostic.get_line_diagnostics()
---   code_action_req(action_call_back, diagnostics)
--- end
+local function code_action_request(params)
+  local bufnr = vim.api.nvim_get_current_buf()
+  local method = 'textDocument/codeAction'
+  vim.lsp.buf_request_all(bufnr, method, params, function(results)
+    on_code_action_results(results, {bufnr = bufnr, method = method, params = params})
+  end)
+end
+
+code_action.code_action = function()
+  local diagnostics = vim.lsp.diagnostic.get_line_diagnostics()
+  local context = {diagnostics = diagnostics}
+  local params = vim.lsp.util.make_range_params()
+  params.context = context
+  -- vim.lsp.buf_request(0, "textDocument/codeAction", params, code_action.code_action_handler)
+  code_action_request(params)
+end
+
+code_action.range_code_action = function(startpos, endpos)
+  local context = {}
+  context.diagnostics = vim.lsp.diagnostic.get_line_diagnostics()
+  local params = util.make_given_range_params(startpos, endpos)
+  params.context = context
+  code_action_request(params)
+end
 
 code_action.code_action_prompt = function()
   if special_buffers[vim.bo.filetype] then
+    log('skip buffer', vim.bo.filetype)
     return
   end
 

lua/navigator/codelens.lua

@@ -109,6 +109,7 @@ function M.run_action()
   local bufnr = api.nvim_get_current_buf()
 
   local lenses = codelens.get(bufnr)
+  log(lenses)
   if lenses == nil or #lenses == 0 then
     return
   end
@@ -147,7 +148,7 @@ function M.run_action()
   local divider = string.rep('─', width + 2)
 
   table.insert(data, 2, divider)
-  if #data > 0 then
+  if #data > 2 then
     local lv = gui.new_list_view {
       items = data,
       width = width + 4,
@@ -166,6 +167,9 @@ function M.run_action()
     }
 
     vim.api.nvim_buf_add_highlight(lv.bufnr, -1, 'Title', 0, 0, -1)
+  else
+    print('no codelense in current line')
+
   end
 end
 

lua/navigator/lspwrapper.lua

@@ -434,6 +434,58 @@ function M.apply_action(action_chosen)
 
 end
 
+local function apply_action(action, client, ctx)
+  log(action, client)
+  if action.edit then
+    require('vim.lsp.util').apply_workspace_edit(action.edit)
+  end
+  if action.command then
+    local command = type(action.command) == 'table' and action.command or action
+    local fn = vim.lsp.commands[command.command]
+    if fn then
+      local enriched_ctx = vim.deepcopy(ctx)
+      enriched_ctx.client_id = client.id
+      fn(command, ctx)
+    else
+      M.execute_command(command)
+    end
+  end
+end
+
+function M.on_user_choice(action_tuple, ctx)
+  if not action_tuple then
+    return
+  end
+  log(action_tuple)
+  -- textDocument/codeAction can return either Command[] or CodeAction[]
+  --
+  -- CodeAction
+  --  ...
+  --  edit?: WorkspaceEdit    -- <- must be applied before command
+  --  command?: Command
+  --
+  -- Command:
+  --  title: string
+  --  command: string
+  --  arguments?: any[]
+  --
+  local client = vim.lsp.get_client_by_id(action_tuple[1])
+  local action = action_tuple[2]
+  if not action.edit and client and type(client.resolved_capabilities.code_action) == 'table'
+      and client.resolved_capabilities.code_action.resolveProvider then
+
+    client.request('codeAction/resolve', action, function(err, resolved_action)
+      if err then
+        vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
+        return
+      end
+      apply_action(resolved_action, client, ctx)
+    end)
+  else
+    apply_action(action, client, ctx)
+  end
+end
+
 function M.symbol_to_items(locations)
   if not locations or vim.tbl_isempty(locations) then
     print("list not avalible")