From 9dbc0b9d0c61803c768355426831a0f74b56f5ff Mon Sep 17 00:00:00 2001 From: Trapez Breen Date: Thu, 4 Jul 2019 21:27:12 +0200 Subject: [PATCH] Fix failing lsp-python-ms setup Configuring lsp-python-ms variables properly. --- CHANGELOG.develop | 1 + layers/+lang/python/packages.el | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index 5b7748fa9..734d3cd01 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -2196,6 +2196,7 @@ Other: - Made python-send-shell-* functions faster (thanks to Trapez Breen) - Added support for 'black' formatter (thanks to Mike Macpherson) - Enabled =eldoc= for =anaconda-mode= (thanks to Vikash Balasubramanian) +- Various fixes for =lsp-python-ms= setup (thanks to Trapez Breen) **** Racket - Restore smart closing paren behavior in racket-mode (thanks to Don March) **** Ranger diff --git a/layers/+lang/python/packages.el b/layers/+lang/python/packages.el index 9ba29a4dc..44bd200bc 100644 --- a/layers/+lang/python/packages.el +++ b/layers/+lang/python/packages.el @@ -428,12 +428,14 @@ fix this issue." :if (eq python-lsp-server 'mspyls) :ensure nil :config - - (if python-lsp-git-root + (when python-lsp-git-root ;; Use dev version of language server checked out from github - (progn - (setq lsp-python-ms-dir - (expand-file-name (concat python-lsp-git-root "/output/bin/Release/"))) - (message "lsp-python-ms: Using version at `%s'" lsp-python-ms-dir)) + (setq lsp-python-ms-dir + (expand-file-name (concat python-lsp-git-root + "/output/bin/Release/"))) + (message "lsp-python-ms: Using version at `%s'" lsp-python-ms-dir) ;; Use a precompiled exe - (setq lsp-python-ms-executable "Microsoft.Python.LanguageServer")))) + (setq lsp-python-ms-executable (concat lsp-python-ms-dir + "Microsoft.Python.LanguageServer" + (and (eq system-type 'windows-nt) + ".exe"))))))