From 054856be3d3aecd09ec408fa5fd070c7debaa570 Mon Sep 17 00:00:00 2001
From: lsp <lsp@ableton.com>
Date: Wed, 18 Sep 2019 17:39:58 +0200
Subject: [PATCH] Don't start the lsp server until after mspyls is optionally
 required

Otherwise, lsp will attempt to use pyls when the user wanted to use mspyls
---
 CHANGELOG.develop            | 1 +
 layers/+lang/python/funcs.el | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index ece7cecc9..2baab9739 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -2353,6 +2353,7 @@ Other:
 - Various fixes for =lsp-python-ms= setup (thanks to Trapez Breen)
 - Added lazy loading of =lsp-python-ms= (thanks to Ying Qu)
 - Make pylookup makefile use correct shell (thanks to Koray Al)
+- Fix lazy loading of =lsp-python-ms= (thanks to lsp-ableton)
 **** Racket
 - Restore smart closing paren behavior in racket-mode (thanks to Don March)
 - Updated racket logo (thanks to Vityou)
diff --git a/layers/+lang/python/funcs.el b/layers/+lang/python/funcs.el
index a8fd916bc..c483b6abb 100644
--- a/layers/+lang/python/funcs.el
+++ b/layers/+lang/python/funcs.el
@@ -62,9 +62,9 @@
   "Setup lsp backend."
   (if (configuration-layer/layer-used-p 'lsp)
       (progn
-        (lsp)
         (when (eq python-lsp-server 'mspyls)
-          (require 'lsp-python-ms)))
+          (require 'lsp-python-ms))
+        (lsp))
     (message "`lsp' layer is not installed, please add `lsp' layer to your dotfile."))
   (if (configuration-layer/layer-used-p 'dap)
     (progn