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

---
 settings/pyls-ms.vim | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 settings/pyls-ms.vim

(limited to 'settings')

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


From ba103d61e0b332b1c1347f40e95f87c13c202e51 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Wed, 29 Jan 2020 22:45:53 +0900
Subject: Fix pyls-ms

---
 settings.json        | 2 +-
 settings/pyls-ms.vim | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'settings')

diff --git a/settings.json b/settings.json
index fdbfd1d..7fd1386 100644
--- a/settings.json
+++ b/settings.json
@@ -334,7 +334,7 @@
     {
       "command": "pyls-ms",
       "requires": [
-        "py"
+        "python"
       ]
     }
   ],
diff --git a/settings/pyls-ms.vim b/settings/pyls-ms.vim
index 4b5c17d..4963cd4 100644
--- a/settings/pyls-ms.vim
+++ b/settings/pyls-ms.vim
@@ -10,9 +10,9 @@ augroup vimlsp_settings_pyls_ms
       \   'displayOptions': {},
       \   'interpreter': {
       \      'properties': {
-	  \        'InterpreterPath': 'python', 
+	  \        'InterpreterPath': split(system('where python'), "\n")[0],
       \        'UseDefaultDatabase': v:true,
-      \        'Version': '3.8.1'
+      \        'Version': matchstr(system('python -V'), '\s\zs\S\+'),
       \      },
       \    },
 	  \  }),
-- 
cgit v1.2.3-54-g00ecf