diff --git a/CHANGELOG.md b/CHANGELOG.md index c401dc19..f17dcb72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ 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). +## [4.26.1] - 2024-07-10 + +### Fixed + +- DAP: rust-analyzer [removed the `cargoExtraArgs` field](https://github.com/rust-lang/rust-analyzer/pull/17547), + which is a breaking change. + ## [4.26.0] - 2024-07-07 ### Added diff --git a/lua/rustaceanvim/commands/debuggables.lua b/lua/rustaceanvim/commands/debuggables.lua index f5dc8052..6845db6f 100644 --- a/lua/rustaceanvim/commands/debuggables.lua +++ b/lua/rustaceanvim/commands/debuggables.lua @@ -23,7 +23,7 @@ local function build_label(args) ret = ret .. value .. ' ' end - for _, value in ipairs(args.cargoExtraArgs) do + for _, value in ipairs(args.cargoExtraArgs or {}) do ret = ret .. value .. ' ' end diff --git a/lua/rustaceanvim/dap.lua b/lua/rustaceanvim/dap.lua index 33473099..3f060a7a 100644 --- a/lua/rustaceanvim/dap.lua +++ b/lua/rustaceanvim/dap.lua @@ -43,7 +43,7 @@ local function get_cargo_args_from_runnables_args(runnable_args) table.insert(cargo_args, message_json) end - for _, value in ipairs(runnable_args.cargoExtraArgs) do + for _, value in ipairs(runnable_args.cargoExtraArgs or {}) do if not compat.list_contains(cargo_args, value) then table.insert(cargo_args, value) end diff --git a/lua/rustaceanvim/runnables.lua b/lua/rustaceanvim/runnables.lua index 63752bca..cb7e6bf2 100644 --- a/lua/rustaceanvim/runnables.lua +++ b/lua/rustaceanvim/runnables.lua @@ -23,7 +23,7 @@ end ---@class RARunnableArgs ---@field workspaceRoot string ---@field cargoArgs string[] ----@field cargoExtraArgs string[] +---@field cargoExtraArgs? string[] ---@field executableArgs string[] ---@param option string