Skip to content

Commit

Permalink
fix(health): only error if lspconfig.rust_analyzer has been setup
Browse files Browse the repository at this point in the history
  • Loading branch information
mrcjkb committed Dec 22, 2023
1 parent fefc240 commit 259f881
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

## [3.10.5] - 2023-12-22

### Fixed

- Health: Only report error if `lspconfig.rust_analyzer` has been setup,
not other lspconfig configurations.

## [3.10.4] - 2023-12-20

### Fixed
Expand Down
7 changes: 6 additions & 1 deletion lua/rustaceanvim/health.lua
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,12 @@ end
local function check_for_conflicts()
start('Checking for conflicting plugins')
for _, autocmd in ipairs(vim.api.nvim_get_autocmds { event = 'FileType', pattern = 'rust' }) do
if autocmd.group_name and autocmd.group_name == 'lspconfig' then
if
autocmd.group_name
and autocmd.group_name == 'lspconfig'
and autocmd.desc
and autocmd.desc:match('rust_analyzer')
then
error(
'lspconfig.rust_analyzer has been setup. This will likely lead to conflicts with the rustaceanvim LSP client.'
)
Expand Down

0 comments on commit 259f881

Please sign in to comment.