From 4f1f0a36c564424c0feb104e95bd47e539839f77 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Wed, 29 Jan 2020 19:31:44 +0900
Subject: Add pyls-ms

---
 plugin/lsp_settings.vim |  9 +++++----
 settings.json           |  6 ++++++
 settings/pyls-ms.vim    | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 settings/pyls-ms.vim

diff --git a/plugin/lsp_settings.vim b/plugin/lsp_settings.vim
index 9c70970..5b2c351 100644
--- a/plugin/lsp_settings.vim
+++ b/plugin/lsp_settings.vim
@@ -169,13 +169,14 @@ function! s:vim_lsp_install_server(ft, command) abort
 endfunction
 
 function! s:vim_lsp_settings_suggest(ft) abort
-  if empty(s:vim_lsp_installer(a:ft))
+  let l:entry = empty(s:vim_lsp_installer(a:ft))
+  if empty(l:entry)
     return
   endif
   if exists(':LspInstallServer') !=# 2
-    redraw
+    redraw!
     echohl Directory
-    echomsg 'Please do :LspInstallServer to enable Language Server'
+    echomsg 'Please do :LspInstallServer to enable Language Server ' . l:entry[0]
     echohl None
     command! -nargs=? -buffer -complete=customlist,lsp_settings#complete_install LspInstallServer call s:vim_lsp_install_server(&l:filetype, <q-args>)
   endif
@@ -210,6 +211,7 @@ function! s:vim_lsp_settings() abort
   augroup vim_lsp_suggest
     autocmd!
     autocmd BufNewFile,BufRead * call s:vim_lsp_suggest_plugin()
+    autocmd VimEnter * call s:vim_lsp_load_or_suggest('_')
   augroup END
   command! -nargs=? -complete=customlist,lsp_settings#complete_uninstall LspUninstallServer call s:vim_lsp_uninstall_server(<q-args>)
 endfunction
@@ -314,4 +316,3 @@ function! s:load_or_suggest_group_name(ft) abort
 endfunction
 
 call s:vim_lsp_settings()
-call s:vim_lsp_load_or_suggest('_')
diff --git a/settings.json b/settings.json
index 3878bee..fdbfd1d 100644
--- a/settings.json
+++ b/settings.json
@@ -330,6 +330,12 @@
       "requires": [
         "python3"
       ]
+    },
+    {
+      "command": "pyls-ms",
+      "requires": [
+        "py"
+      ]
     }
   ],
   "reason": [
diff --git a/settings/pyls-ms.vim b/settings/pyls-ms.vim
new file mode 100644
index 0000000..4b5c17d
--- /dev/null
+++ b/settings/pyls-ms.vim
@@ -0,0 +1,32 @@
+augroup vimlsp_settings_pyls_ms
+  au!
+  LspRegisterServer {
+      \ 'name': 'pyls-ms',
+      \ 'cmd': {server_info->lsp_settings#get('pyls-ms', 'cmd', [lsp_settings#exec_path('pyls-ms')])},
+      \ 'root_uri':{server_info->lsp_settings#get('pyls-ms', 'root_uri', lsp_settings#root_uri(g:lsp_settings_root_markers))},
+	  \ 'initialization_options': lsp_settings#get('pyls-ms', 'initialization_options', {
+      \   'analysisUpdates': v:true,
+      \   'asyncStartup': v:true,
+      \   'displayOptions': {},
+      \   'interpreter': {
+      \      'properties': {
+	  \        'InterpreterPath': 'python', 
+      \        'UseDefaultDatabase': v:true,
+      \        'Version': '3.8.1'
+      \      },
+      \    },
+	  \  }),
+      \ 'whitelist': lsp_settings#get('pyls-ms', 'whitelist', ['python']),
+      \ 'blacklist': lsp_settings#get('pyls-ms', 'blacklist', []),
+      \ 'config': lsp_settings#get('pyls-ms', 'config', {}),
+      \ 'workspace_config': lsp_settings#get('pyls-ms', 'workspace_config', {
+      \   'python': {
+      \     'analysis': {
+      \       'errors': [],
+      \       'info': [],
+      \       'disabled': [],
+      \     },
+      \   },
+      \ }),
+      \ }
+augroup END
-- 
cgit v1.2.3-54-g00ecf