feat(lsp): cache runnables and debuggables run with commands/code lenses

Author: Marc Jakobi

CHANGELOG.md

@@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.17.0] - 2024-01-20
+
+### Added
+
+- Cache runnables and debuggables run with commands/code lenses.
+
 ## [3.16.3] - 2024-01-20
 
 ### Changed

ftplugin/rust.lua

@@ -10,6 +10,8 @@ end
 
 vim.lsp.commands['rust-analyzer.runSingle'] = function(command)
   local runnables = require('rustaceanvim.runnables')
+  local cached_commands = require('rustaceanvim.cached_commands')
+  cached_commands.set_last_runnable(1, command.arguments)
   runnables.run_command(1, command.arguments)
 end
 
@@ -26,9 +28,12 @@ end
 
 vim.lsp.commands['rust-analyzer.debugSingle'] = function(command)
   local overrides = require('rustaceanvim.overrides')
-  overrides.sanitize_command_for_debugging(command.arguments[1].args.cargoArgs)
+  local args = command.arguments[1].args
+  overrides.sanitize_command_for_debugging(args)
+  local cached_commands = require('rustaceanvim.cached_commands')
+  cached_commands.set_last_debuggable(args)
   local rt_dap = require('rustaceanvim.dap')
-  rt_dap.start(command.arguments[1].args)
+  rt_dap.start(args)
 end
 
 lsp.start()

lua/rustaceanvim/cached_commands.lua

@@ -4,16 +4,16 @@ local M = {}
 local cache = {
   ---@type RADebuggableArgs | nil
   last_debuggable = nil,
-  ---@type { choice: integer, runnable: RARunnable }
+  ---@type { choice: integer, runnables: RARunnable[] }
   last_runnable = nil,
 }
 
 ---@param choice integer
----@param runnable RARunnable
-M.set_last_runnable = function(choice, runnable)
+---@param runnables RARunnable[]
+M.set_last_runnable = function(choice, runnables)
   cache.last_runnable = {
     choice = choice,
-    runnable = runnable,
+    runnables = runnables,
   }
 end
 
@@ -37,7 +37,7 @@ M.execute_last_runnable = function()
   local action = cache.last_runnable
   local runnables = require('rustaceanvim.runnables')
   if action then
-    runnables.run_command(action.choice, action.runnable)
+    runnables.run_command(action.choice, action.runnables)
   else
     runnables.runnables()
   end

lua/rustaceanvim/runnables.lua

@@ -20,7 +20,7 @@ end
 ---@field cargoExtraArgs string[]
 ---@field executableArgs string[]
 
----@param result RARunnable
+---@param result RARunnable[]
 local function get_options(result)
   local option_strings = {}
 
@@ -70,7 +70,7 @@ function M.run_command(choice, runnables)
   opts.executor.execute_command(command, args, cwd)
 end
 
----@param result RARunnable
+---@param result RARunnable[]
 local function handler(_, result)
   if result == nil then
     return