1 files changed, 18 insertions, 9 deletions
diff --git a/.vim/plugin/godot.vim b/.vim/plugin/godot.vim
index 6bcf679..655710e 100644
--- a/.vim/plugin/godot.vim
+++ b/.vim/plugin/godot.vim
@@ -1,19 +1,11 @@
 if has('macunix')
     let g:godot_executable = '/Applications/Godot.app'
 endif
+
 if has('win32') || has('win32unix')
     let g:godot_executable = ''
 endif
 
-let g:ycm_language_server += [
-            \ {
-                \ 'name': 'godot',
-                \ 'filetypes': ['gdscript'],
-                \ 'project_root_files': ['project.godot'],
-                \ 'port': 6008
-                \ }
-            \ ]
-
 func! s:godot_settings() abort
     setlocal tabstop=4
     nnoremap <buffer> <leader>rl :GodotRunLast<CR>
@@ -25,6 +17,23 @@ augroup godot | au!
     au FileType gdscript call s:godot_settings()
 augroup end
 
+"YCM config
+
+if !has_key( g:, 'ycm_language_server' )
+  let g:ycm_language_server = []
+endif
+
+let g:ycm_language_server += [
+            \ {
+                \ 'name': 'godot',
+                \ 'filetypes': ['gdscript'],
+                \ 'project_root_files': ['project.godot'],
+                \ 'port': 6008
+                \ }
+            \ ]
+
+" ALE config
+
 call ale#linter#Define('gdscript', {
 \   'name': 'godot',
 \   'lsp': 'socket',