Skip to content

Commit

Permalink
fix(health): only report error if lspconfig.hls has been set up
Browse files Browse the repository at this point in the history
  • Loading branch information
mrcjkb committed Dec 22, 2023
1 parent ab80d62 commit 06dcb82
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,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.1.1] - 2023-12-22

### Fixed

- Health: Only report error if `lspconfig.hls` has been set up,
not other configurations.

## [3.1.0] - 2023-12-18

### Added
Expand Down
2 changes: 1 addition & 1 deletion lua/haskell-tools/health.lua
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ end
local function check_for_conflicts()
start('Checking for conflicting plugins')
for _, autocmd in ipairs(vim.api.nvim_get_autocmds { event = 'FileType', pattern = 'haskell' }) 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(' hls ') then
error('lspconfig.hls has been setup. This will likely lead to conflicts with the haskell-tools LSP client.')
return
end
Expand Down

0 comments on commit 06dcb82

Please sign in to comment.