From 58d42f6faf8bd2167d566af7bde8658969782247 Mon Sep 17 00:00:00 2001
From: Seong Yong-ju <sei40kr@gmail.com>
Date: Tue, 16 Jan 2018 11:40:16 +0900
Subject: [PATCH] Revert "Fix language client config"

This reverts commit eeef756b8a53317e90fe274b9a5f420a6591b4b7.
---
 autoload/SpaceVim/layers/lsp.vim              | 53 +++++++++++++++++-
 .../plugins_before/LanguageClient-neovim.vim  | 56 -------------------
 2 files changed, 50 insertions(+), 59 deletions(-)
 delete mode 100644 config/plugins_before/LanguageClient-neovim.vim

diff --git a/autoload/SpaceVim/layers/lsp.vim b/autoload/SpaceVim/layers/lsp.vim
index 09cf5a1f6..e36c948b4 100644
--- a/autoload/SpaceVim/layers/lsp.vim
+++ b/autoload/SpaceVim/layers/lsp.vim
@@ -3,7 +3,7 @@ function! SpaceVim#layers#lsp#plugins() abort
 
   if has('nvim')
     call add(plugins, ['SpaceVim/LanguageClient-neovim',
-          \ { 'merged': 0, 'if': has('python3'), 'loadconf_before': 1 }])
+          \ { 'merged': 0, 'if': has('python3') }])
   else
     call add(plugins, ['prabirshrestha/async.vim', {'merged' : 0}])
     call add(plugins, ['prabirshrestha/vim-lsp', {'merged' : 0}])
@@ -13,10 +13,57 @@ function! SpaceVim#layers#lsp#plugins() abort
 endfunction
 
 function! SpaceVim#layers#lsp#config() abort
-  " prabirshrestha/vim-lsp {{{
+  " SpaceVim/LanguageClient-neovim {{{
+  let g:LanguageClient_diagnosticsDisplay = {
+        \ 1: {
+        \ 'name': 'Error',
+        \ 'signText': g:spacevim_error_symbol,
+        \ },
+        \ 2: {
+        \ 'name': 'Warning',
+        \ 'signText': g:spacevim_warning_symbol,
+        \ },
+        \ 3: {
+        \ 'name': 'Information',
+        \ 'signText': g:spacevim_info_symbol,
+        \ },
+        \ 4: {
+        \ 'name': 'Hint',
+        \ 'signText': g:spacevim_info_symbol,
+        \ },
+        \ }
+
+  if g:spacevim_enable_neomake
+    let g:LanguageClient_diagnosticsDisplay[1].texthl = 'NeomakeError'
+    let g:LanguageClient_diagnosticsDisplay[1].signTexthl = 'NeomakeErrorSign'
+
+    let g:LanguageClient_diagnosticsDisplay[2].texthl = 'NeomakeWarning'
+    let g:LanguageClient_diagnosticsDisplay[2].signTexthl = 
+          \ 'NeomakeWarningSign'
+
+    let g:LanguageClient_diagnosticsDisplay[3].texthl = 'NeomakeInfo'
+    let g:LanguageClient_diagnosticsDisplay[3].signTexthl = 'NeomakeInfoSign'
+
+    let g:LanguageClient_diagnosticsDisplay[4].texthl = 'NeomakeMessage'
+    let g:LanguageClient_diagnosticsDisplay[4].signTexthl = 
+          \ 'NeomakeMessageSign'
+  elseif g:spacevim_enable_ale
+    let g:LanguageClient_diagnosticsDisplay[1].texthl = 'ALEError'
+    let g:LanguageClient_diagnosticsDisplay[1].signTexthl = 'ALEErrorSign'
+
+    let g:LanguageClient_diagnosticsDisplay[2].texthl = 'ALEWarning'
+    let g:LanguageClient_diagnosticsDisplay[2].signTexthl = 'ALEWarningSign'
+
+    let g:LanguageClient_diagnosticsDisplay[3].texthl = 'ALEInfo'
+    let g:LanguageClient_diagnosticsDisplay[3].signTexthl = 'ALEInfoSign'
+
+    let g:LanguageClient_diagnosticsDisplay[4].texthl = 'ALEInfo'
+    let g:LanguageClient_diagnosticsDisplay[4].signTexthl = 'ALEInfoSign'
+  endif
+
+  let g:LanguageClient_autoStart = 1
   let g:lsp_async_completion = 1
   " }}}
-
   for ft in s:enabled_fts
     call SpaceVim#lsp#reg_server(ft, s:lsp_servers[ft])
   endfor
diff --git a/config/plugins_before/LanguageClient-neovim.vim b/config/plugins_before/LanguageClient-neovim.vim
deleted file mode 100644
index d0ac6dd7c..000000000
--- a/config/plugins_before/LanguageClient-neovim.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-"=============================================================================
-" LanguageClient-neovim.vim
-" Copyright (c) 2012-2016 Shidong Wang & Contributors
-" Author: Seong Yong-ju <sei40kr@gmail.com>
-" URL: https://spacevim.org
-" License: MIT license
-"=============================================================================
-
-let g:LanguageClient_autoStart = 1
-
-let g:LanguageClient_diagnosticsDisplay = {
-      \ 1: {
-      \ 'name': 'Error',
-      \ 'signText': g:spacevim_error_symbol,
-      \ },
-      \ 2: {
-      \ 'name': 'Warning',
-      \ 'signText': g:spacevim_warning_symbol,
-      \ },
-      \ 3: {
-      \ 'name': 'Information',
-      \ 'signText': g:spacevim_info_symbol,
-      \ },
-      \ 4: {
-      \ 'name': 'Hint',
-      \ 'signText': g:spacevim_info_symbol,
-      \ },
-      \ }
-
-if g:spacevim_enable_neomake
-  let g:LanguageClient_diagnosticsDisplay[1].texthl = 'NeomakeError'
-  let g:LanguageClient_diagnosticsDisplay[1].signTexthl = 'NeomakeErrorSign'
-
-  let g:LanguageClient_diagnosticsDisplay[2].texthl = 'NeomakeWarning'
-  let g:LanguageClient_diagnosticsDisplay[2].signTexthl = 
-        \ 'NeomakeWarningSign'
-
-  let g:LanguageClient_diagnosticsDisplay[3].texthl = 'NeomakeInfo'
-  let g:LanguageClient_diagnosticsDisplay[3].signTexthl = 'NeomakeInfoSign'
-
-  let g:LanguageClient_diagnosticsDisplay[4].texthl = 'NeomakeMessage'
-  let g:LanguageClient_diagnosticsDisplay[4].signTexthl = 
-        \ 'NeomakeMessageSign'
-elseif g:spacevim_enable_ale
-  let g:LanguageClient_diagnosticsDisplay[1].texthl = 'ALEError'
-  let g:LanguageClient_diagnosticsDisplay[1].signTexthl = 'ALEErrorSign'
-
-  let g:LanguageClient_diagnosticsDisplay[2].texthl = 'ALEWarning'
-  let g:LanguageClient_diagnosticsDisplay[2].signTexthl = 'ALEWarningSign'
-
-  let g:LanguageClient_diagnosticsDisplay[3].texthl = 'ALEInfo'
-  let g:LanguageClient_diagnosticsDisplay[3].signTexthl = 'ALEInfoSign'
-
-  let g:LanguageClient_diagnosticsDisplay[4].texthl = 'ALEInfo'
-  let g:LanguageClient_diagnosticsDisplay[4].signTexthl = 'ALEInfoSign'
-endif