2 files changed, 9 insertions, 11 deletions
diff --git a/.vim/after/plugin/godot.vim b/.vim/after/plugin/godot.vim
index 17e9e83..655710e 100644
--- a/.vim/after/plugin/godot.vim
+++ b/.vim/after/plugin/godot.vim
@@ -32,16 +32,6 @@ let g:ycm_language_server += [
                 \ }
             \ ]
 
-" vim-lsp
-if get(g:, 'lsp_loaded', 0) == 1
-    au User lsp_setup
-        \ call lsp#register_server({
-            \ 'name': 'godot',
-            \ 'tcp': {server_info->'localhost:6008'},
-            \ 'allowlist': ['gdscript', 'gdscript3']
-        \ })
-endif
-
 " ALE config
 
 call ale#linter#Define('gdscript', {
diff --git a/.vim/after/plugin/lsp.vim b/.vim/after/plugin/lsp.vim
index 3e81ed0..ae5f203 100644
--- a/.vim/after/plugin/lsp.vim
+++ b/.vim/after/plugin/lsp.vim
@@ -1,7 +1,6 @@
 if has('nvim')
     finish
 endif
-
 let g:lsp_diagnostics_enabled = 0
 let g:lsp_document_code_action_signs_enabled = 0
 
@@ -33,6 +32,15 @@ if executable('clangd')
                 \ })
 endif
 
+if executable('godot')
+    au User lsp_setup
+        \ call lsp#register_server({
+            \ 'name': 'godot',
+            \ 'tcp': {server_info->'localhost:6008'},
+            \ 'allowlist': ['gdscript', 'gdscript3']
+        \ })
+endif
+
 function! s:on_lsp_buffer_enabled() abort
     setlocal omnifunc=lsp#complete
     setlocal nocscopetag