From 934141a01e48d041c6abc9a2281f7a11e5f4eb4d Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Fri, 5 Jul 2024 16:54:24 -0400
Subject: [PATCH] refactor!(python): remove lsp-python-ms

BREAKING CHANGE: This removes the lsp-python-ms package (along with it,
lsp-python-ms support), since the package no longer works in recent
versions of Python and is no longer maintained upstream.
---
 modules/lang/python/README.org  | 10 ++++------
 modules/lang/python/config.el   | 18 +++++-------------
 modules/lang/python/packages.el |  5 ++---
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/modules/lang/python/README.org b/modules/lang/python/README.org
index cb70cb9e1..977365736 100644
--- a/modules/lang/python/README.org
+++ b/modules/lang/python/README.org
@@ -10,7 +10,7 @@ This module adds [[https://www.python.org/][Python]] support to Doom Emacs.
 - Snippets
 - Run tests ([[doom-package:nose]], [[doom-package:pytest]])
 - Auto-format (with ~black~, requires [[doom-module::editor format]])
-- LSP integration (=mspyls=, =pyls=, or =pyright=)
+- LSP integration (=pyls=, =jedi=, =ruff=, or =pyright=)
 
 ** Maintainers
 - [[doom-user:][@hlissner]]
@@ -23,15 +23,15 @@ This module adds [[https://www.python.org/][Python]] support to Doom Emacs.
 - +cython ::
   Enable support for Cython files support.
 - +lsp ::
-  Enable LSP support for ~python-mode~. Requires [[doom-module::tools lsp]] and a langserver
-  (supports mspyls, pyls, and pyright).
+  Enable LSP support for ~python-mode~. Requires [[doom-module::tools lsp]] and a
+  langserver (=pyls=, =jedi=, =ruff=, or =pyright=).
 - +poetry ::
   Enable Python packaging, dependency management, and virtual environment
   support via [[https://python-poetry.org/][Poetry]].
 - +pyenv ::
   Enable Python virtual environment support via [[https://github.com/pyenv/pyenv][pyenv]]
 - +pyright ::
-  Use the pyright LSP server instead of mspyls or pyls (requires [[doom-module:+lsp]]).
+  Add support for the pyright LSP server (requires [[doom-module:+lsp]]).
 - +tree-sitter ::
   Leverages tree-sitter for better syntax highlighting and structural text
   editing. Requires [[doom-module::tools tree-sitter]].
@@ -53,8 +53,6 @@ This module adds [[https://www.python.org/][Python]] support to Doom Emacs.
 - if [[doom-module:+lsp]]
   - if [[doom-module:+pyright]]
     - [[doom-package:lsp-pyright]]
-  - else
-    - [[doom-package:lsp-python-ms]]
 
 ** Hacks
 - [[doom-package:anaconda-mode]] is configured to activate when [[doom-package:lsp-mode]] (or [[doom-package:eglot]]) don't -- or
diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index 373f580b6..58d496644 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -342,16 +342,8 @@
 ;;
 ;;; LSP
 
-(eval-when! (and (modulep! +lsp)
-                 (not (modulep! :tools lsp +eglot)))
-
-  (use-package! lsp-python-ms
-    :unless (modulep! +pyright)
-    :after lsp-mode
-    :preface
-    (after! python
-      (setq lsp-python-ms-python-executable-cmd python-shell-interpreter)))
-
-  (use-package! lsp-pyright
-    :when (modulep! +pyright)
-    :after lsp-mode))
+(use-package! lsp-pyright
+  :when (modulep! +lsp)
+  :when (modulep! +pyright)
+  :when (not (modulep! :tools lsp +eglot))
+  :after lsp-mode)
diff --git a/modules/lang/python/packages.el b/modules/lang/python/packages.el
index 12eaf1a8c..5fefb1d85 100644
--- a/modules/lang/python/packages.el
+++ b/modules/lang/python/packages.el
@@ -11,9 +11,8 @@
 ;; LSP
 (when (modulep! +lsp)
   (unless (modulep! :tools lsp +eglot)
-    (if (modulep! +pyright)
-        (package! lsp-pyright :pin "cc6df06aeaee3053eb800a24193483387b7b545b")
-      (package! lsp-python-ms :pin "7bda327bec7b219d140c34dab4b1e1fbd41bc516"))))
+    (when (modulep! +pyright)
+      (package! lsp-pyright :pin "cc6df06aeaee3053eb800a24193483387b7b545b"))))
 
 ;; Programming environment
 (package! anaconda-mode :pin "79fa9b4d2bda9f69857aeffb30c75276848a2810")