From 6ad45ced73c5de6887a9ac7999a24895602587f7 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Wed, 2 Nov 2022 00:44:01 +0800 Subject: [PATCH] fix(java): enable jc2 only when no lsp --- autoload/SpaceVim/layers/lang/java.vim | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/autoload/SpaceVim/layers/lang/java.vim b/autoload/SpaceVim/layers/lang/java.vim index a12cf1b9c..ac67dfc63 100644 --- a/autoload/SpaceVim/layers/lang/java.vim +++ b/autoload/SpaceVim/layers/lang/java.vim @@ -131,9 +131,11 @@ let s:java_file_head = [ let s:java_interpreter = 'java' function! SpaceVim#layers#lang#java#plugins() abort - let plugins = [ - \ [g:_spacevim_root_dir . 'bundle/vim-javacomplete2', { 'on_ft' : ['java','jsp'], 'loadconf' : 1}], - \ ] + let plugins = [] + if !SpaceVim#layers#lsp#check_filetype('java') + \ && !SpaceVim#layers#lsp#check_server('jdtls') + call add(plugins, [g:_spacevim_root_dir . 'bundle/vim-javacomplete2', { 'on_ft' : ['java','jsp'], 'loadconf' : 1}]) + endif call add(plugins, [g:_spacevim_root_dir . 'bundle/JavaUnit.vim', {'on_ft' : 'java'}]) call add(plugins, [g:_spacevim_root_dir . 'bundle/java_getset.vim', {'on_ft' : 'java'}]) call add(plugins, [g:_spacevim_root_dir . 'bundle/vim-dict', {'on_ft' : 'java'}])