fix(lsp): load rust-analyzer.json into correct config field

Author: Marc Jakobi

CHANGELOG.md

@@ -8,9 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [4.6.0] - 2024-02-07
 
+### Added
+
+- LSP: New `tools.enable_clippy` option (defaults to `true`).
+  Enable clippy lints on save if a `cargo-clippy` installation
+  is detected.
+
 ### Fixed
 
 - testables/neotest: Don't use nextest if disabled in the config.
+- LSP: load project-local rust-analyzer.json configs into
+ `server['rust-analyzer']`, instead of replacing the `server` config.
 
 ## [4.5.2] - 2024-02-06
 

README.md

@@ -664,7 +664,7 @@ vim.g.rustaceanvim = {
     on_attach = function(client, bufnr)
       -- you can also put keymaps in here
     end,
-    settings = {
+    default_settings = {
       -- rust-analyzer language server configuration
       ['rust-analyzer'] = {
       },
@@ -735,7 +735,7 @@ end
 By default, this plugin will look for a `rust-analyzer.json`[^2]
 file in the project root directory, and attempt to load it.
 If the file does not exist, or it can't be decoded,
-the default settings will be used.
+the `server.default_settings` will be used.
 
 [^2]: See [this example](https://github.com/rust-analyzer/rust-project.json-example/blob/master/.vscode/settings.json)
       and the rust-analyzer [configuration manual](https://rust-analyzer.github.io/manual.html#configuration).

lua/rustaceanvim/config/server.lua

@@ -38,15 +38,16 @@ function server.load_rust_analyzer_settings(project_root, opts)
   if #results == 0 then
     return default_settings
   end
-  local settings_json = results[1]
-  local content = read_file(settings_json)
-  local success, settings = pcall(vim.json.decode, content)
+  local config_json = results[1]
+  local content = read_file(config_json)
+  local success, rust_analyzer_settings = pcall(vim.json.decode, content)
   if not success then
-    local msg = 'Could not decode ' .. settings_json .. '. Falling back to default settings.'
+    local msg = 'Could not decode ' .. config_json .. '. Falling back to default settings.'
     vim.notify('rustaceanvim: ' .. msg, vim.log.levels.ERROR)
     return default_settings
   end
-  return settings or default_settings
+  default_settings['rust-analyzer'] = rust_analyzer_settings
+  return default_settings
 end
 
 return server