From bffa7a4d23addaedc64075b06c00f1cbb5dec667 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Tue, 2 Feb 2021 10:07:51 +0100 Subject: [PATCH] nvimlsp: do not check for :LspInstallInfo nvimlsp removed the :LspInstallInfo command. So instead check explicitly for neovim for enabling the nvimlsp extension. In the extension itself check that at least one LSP is attached to the buffer before returning warning and error messages. closes #2323 --- autoload/airline/extensions.vim | 2 +- autoload/airline/extensions/nvimlsp.vim | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim index cb0cb902..eda34b81 100644 --- a/autoload/airline/extensions.vim +++ b/autoload/airline/extensions.vim @@ -338,7 +338,7 @@ function! airline#extensions#load() endif if (get(g:, 'airline#extensions#nvimlsp#enabled', 1) - \ && exists(':LspInstallInfo')) + \ && has("nvim")) call airline#extensions#nvimlsp#init(s:ext) call add(s:loaded_ext, 'nvimlsp') endif diff --git a/autoload/airline/extensions/nvimlsp.vim b/autoload/airline/extensions/nvimlsp.vim index 4d1c766c..a5521894 100644 --- a/autoload/airline/extensions/nvimlsp.vim +++ b/autoload/airline/extensions/nvimlsp.vim @@ -5,7 +5,7 @@ scriptencoding utf-8 if !(get(g:, 'airline#extensions#nvimlsp#enabled', 1) - \ && exists(':LspInstallInfo')) + \ && has("nvim")) finish endif @@ -14,7 +14,7 @@ function! s:airline_nvimlsp_count(cnt, symbol) abort endfunction function! airline#extensions#nvimlsp#get(type) abort - if !exists(':LspInstallInfo') + if vim.lsp.buf_get_clients() == 0 return '' endif