From 9f72af3b7306ac17c4c35b0b64ab5facb1eb6284 Mon Sep 17 00:00:00 2001
From: yqu212 <yqu212@gmail.com>
Date: Sun, 4 Aug 2019 20:24:28 +0800
Subject: [PATCH] Add lazy loading of lsp-python-ms

---
 CHANGELOG.develop               | 1 +
 layers/+lang/python/funcs.el    | 5 ++++-
 layers/+lang/python/packages.el | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index 6afb7d8e5..f53c9aaf2 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -2315,6 +2315,7 @@ Other:
 - 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)
+- Added lazy loading of =lsp-python-ms= (thanks to Ying Qu)
 **** 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 96706bfa4..a8fd916bc 100644
--- a/layers/+lang/python/funcs.el
+++ b/layers/+lang/python/funcs.el
@@ -61,7 +61,10 @@
 (defun spacemacs//python-setup-lsp ()
   "Setup lsp backend."
   (if (configuration-layer/layer-used-p 'lsp)
-      (lsp)
+      (progn
+        (lsp)
+        (when (eq python-lsp-server 'mspyls)
+          (require 'lsp-python-ms)))
     (message "`lsp' layer is not installed, please add `lsp' layer to your dotfile."))
   (if (configuration-layer/layer-used-p 'dap)
     (progn
diff --git a/layers/+lang/python/packages.el b/layers/+lang/python/packages.el
index 44bd200bc..2d6f61da2 100644
--- a/layers/+lang/python/packages.el
+++ b/layers/+lang/python/packages.el
@@ -427,6 +427,7 @@ fix this issue."
   (use-package lsp-python-ms
     :if (eq python-lsp-server 'mspyls)
     :ensure nil
+    :defer t
     :config
     (when python-lsp-git-root
       ;; Use dev version of language server checked out from github