fix: remove obsoleted if/when-let and shadowed dynamic variable (#4612)

Author: kiennq

clients/lsp-autotools.el

@@ -41,7 +41,7 @@
      makefile-bsdmake-mode
      makefile-imake-mode)
   "List of major mode that work with Autotools."
-  :type 'list
+  :type '(list symbol)
   :group 'lsp-autotools)
 
 (defun lsp-autotools--download-server (_client callback error-callback update?)

clients/lsp-awk.el

@@ -36,7 +36,7 @@
   "Command to run the AWK language server."
   :group 'lsp-awk
   :risky t
-  :type 'list)
+  :type '(list string))
 
 (lsp-register-client
  (make-lsp-client

clients/lsp-camel.el

@@ -20,7 +20,6 @@
 ;; Directory in which the servers will be installed. Lsp Server Install Dir: ~/.emacs.d/.cache/camells
 (defcustom lsp-camel-jar-file (f-join lsp-server-install-dir "camells" lsp-camel-jar-name)
   "Camel Language server jar command."
-  :type 'string
   :group 'lsp-camel
   :type 'file
   :package-version '(lsp-mode . "9.0.0"))
@@ -36,7 +35,7 @@
  'camells
  '(:system lsp-camel-jar-file)
  `(:download :url lsp-camel-jar-download-url
-	     :store-path lsp-camel-jar-file))
+             :store-path lsp-camel-jar-file))
 
 (defcustom lsp-camel-server-command `("java" "-jar" , lsp-camel-jar-file)
   "Camel server command."
@@ -51,16 +50,16 @@
 
 (lsp-register-client
  (make-lsp-client :new-connection (lsp-camel--create-connection)
-		  :activation-fn (lsp-activate-on "xml" "java")
-		  :priority 0
-		  :server-id 'camells
-		  :add-on? t
-		  :multi-root t
-		  :initialized-fn (lambda (workspace)
-				    (with-lsp-workspace workspace
-				      (lsp--set-configuration (lsp-configuration-section "camel"))))
-		  :download-server-fn (lambda (_client callback error-callback _update?)
-					(lsp-package-ensure 'camells callback error-callback))))
+                  :activation-fn (lsp-activate-on "xml" "java")
+                  :priority 0
+                  :server-id 'camells
+                  :add-on? t
+                  :multi-root t
+                  :initialized-fn (lambda (workspace)
+                                    (with-lsp-workspace workspace
+                                      (lsp--set-configuration (lsp-configuration-section "camel"))))
+                  :download-server-fn (lambda (_client callback error-callback _update?)
+                                        (lsp-package-ensure 'camells callback error-callback))))
 
 (lsp-consistency-check lsp-camel)
 

clients/lsp-clangd.el

@@ -168,7 +168,7 @@ Information comes from the clang.llvm.org website."
   (url-retrieve (format
                  "https://clang.llvm.org/extra/clang-tidy/checks/%s.html" error-id)
                 (lambda (status)
-                  (if-let ((error-status (plist-get status :error)))
+                  (if-let* ((error-status (plist-get status :error)))
                       (lsp-cpp-flycheck-clang-tidy--explain-error
                        #'insert
                        (format
@@ -185,7 +185,7 @@ Information comes from the clang.llvm.org website."
   "Explain a clang-tidy ERROR by scraping documentation from llvm.org."
   (unless (fboundp 'libxml-parse-html-region)
     (error "This function requires Emacs to be compiled with libxml2"))
-  (if-let ((clang-tidy-error-id (flycheck-error-id error)))
+  (if-let* ((clang-tidy-error-id (flycheck-error-id error)))
       (condition-case err
           (lsp-cpp-flycheck-clang-tidy--show-documentation clang-tidy-error-id)
         (error

clients/lsp-clojure.el

@@ -94,7 +94,7 @@
                                           (expand-file-name "~/.gitlibs/libs"))
   "LSP clojure dirs that should be considered library folders."
   :group 'lsp-clojure
-  :type 'list)
+  :type '(list string))
 
 (defcustom lsp-clojure-test-tree-position-params nil
   "The optional test tree position params.
@@ -434,7 +434,7 @@ Focus on it if IGNORE-FOCUS? is nil."
 NOTIFICATION is the test tree notification data received from server.
 It updates the test tree view data."
   (when (require 'lsp-treemacs nil t)
-    (when-let (buffer (find-buffer-visiting (lsp--uri-to-path uri)))
+    (when-let* ((buffer (find-buffer-visiting (lsp--uri-to-path uri))))
       (with-current-buffer buffer
         (setq lsp-clojure--test-tree-data notification)
         (when (get-buffer-window lsp-clojure--test-tree-buffer-name)
@@ -593,16 +593,16 @@ Focus on it if IGNORE-FOCUS? is nil."
   (let ((info (lsp-clojure-server-info-raw)))
     (save-match-data
       (when (functionp 'cider-connect-clj)
-        (when-let (port (and (string-match "\"port\":\\([0-9]+\\)" info)
-                             (match-string 1 info)))
+        (when-let* ((port (and (string-match "\"port\":\\([0-9]+\\)" info)
+                              (match-string 1 info))))
           (cider-connect-clj `(:host "localhost"
                                :port ,port)))))))
 
 ;; Cider integration
 
 (defun lsp-clojure-semantic-tokens-refresh (&rest _)
   "Force refresh semantic tokens."
-  (when-let ((workspace (and lsp-semantic-tokens-enable
+  (when-let* ((workspace (and lsp-semantic-tokens-enable
                              (lsp-find-workspace 'clojure-lsp (buffer-file-name)))))
     (--each (lsp--workspace-buffers workspace)
       (when (lsp-buffer-live-p it)

clients/lsp-cobol.el

@@ -106,7 +106,7 @@ This is only for development use."
 (defun lsp-cobol-start-ls ()
   "Start the COBOL language service."
   (interactive)
-  (when-let ((exe (lsp-cobol--executable))
+  (when-let* ((exe (lsp-cobol--executable))
              ((lsp--port-available "localhost" lsp-cobol-port)))
     (lsp-async-start-process #'ignore #'ignore exe)))
 

clients/lsp-csharp.el

@@ -213,7 +213,7 @@ Returns :elements from omnisharp:CodeStructureResponse."
 
 (defun lsp-csharp--code-element-stack-on-l-c (l c elements)
   "Return omnisharp:CodeElement stack at L (line) and C (column) in ELEMENTS tree."
-  (when-let ((matching-element (seq-find (lambda (el)
+  (when-let* ((matching-element (seq-find (lambda (el)
                                            (-when-let* (((&omnisharp:CodeElement :ranges) el)
                                                         ((&omnisharp:RangeList :full?) ranges))
                                              (lsp-csharp--l-c-within-range l c full?)))
@@ -266,7 +266,7 @@ PRESENT-BUFFER will make the buffer be presented to the user."
 
 (defun lsp-csharp--test-message (message)
   "Emit a MESSAGE to lsp-csharp test run buffer."
-  (when-let ((existing-buffer (get-buffer lsp-csharp-test-run-buffer-name))
+  (when-let* ((existing-buffer (get-buffer lsp-csharp-test-run-buffer-name))
              (inhibit-read-only t))
     (with-current-buffer existing-buffer
       (save-excursion
@@ -309,7 +309,7 @@ PRESENT-BUFFER will make the buffer be presented to the user."
 (defun lsp-csharp-run-last-tests ()
   "Re-run test(s) that were run last time."
   (interactive)
-  (if-let ((last-test-method-framework (lsp-session-get-metadata "last-test-method-framework"))
+  (if-let* ((last-test-method-framework (lsp-session-get-metadata "last-test-method-framework"))
            (last-test-method-names (lsp-session-get-metadata "last-test-method-names")))
       (lsp-csharp--start-tests last-test-method-framework last-test-method-names)
     (message "lsp-csharp: No test method(s) found to be ran previously on this workspace")))
@@ -430,7 +430,7 @@ See https://github.com/OmniSharp/omnisharp-roslyn/wiki/Configuration-Options"
                         (when lsp-csharp-solution-file
                           (list "-s" (expand-file-name lsp-csharp-solution-file)))))
                    #'(lambda ()
-                       (when-let ((binary (lsp-csharp--language-server-path)))
+                       (when-let* ((binary (lsp-csharp--language-server-path)))
                          (f-exists? binary))))
                   :activation-fn (lsp-activate-on "csharp")
                   :server-id 'omnisharp

clients/lsp-cucumber.el

@@ -41,7 +41,7 @@ This is only for development use."
 (defcustom lsp-cucumber-active-modes
   '( feature-mode)
   "List of major mode that work with Cucumber language server."
-  :type 'list
+  :type '(list symbol)
   :group 'lsp-cucumber)
 
 (lsp-defcustom lsp-cucumber-features

clients/lsp-eslint.el

@@ -243,7 +243,7 @@ stored."
 
 (defun lsp--find-eslint ()
   (or
-   (when-let ((workspace-folder (lsp-find-session-folder (lsp-session) default-directory)))
+   (when-let* ((workspace-folder (lsp-find-session-folder (lsp-session) default-directory)))
      (let ((eslint-local-path (f-join workspace-folder "node_modules" ".bin"
                                       (if (eq system-type 'windows-nt) "eslint.cmd" "eslint"))))
        (when (f-exists? eslint-local-path)
@@ -374,7 +374,7 @@ to allow or deny it.")
   (setq lsp-eslint--stored-libraries (lsp--read-from-file lsp-eslint-library-choices-file)))
 
 (lsp-defun lsp-eslint--confirm-local (_workspace (&eslint:ConfirmExecutionParams :library-path) callback)
-  (if-let ((option-alist '(("Always" 4 . t)
+  (if-let* ((option-alist '(("Always" 4 . t)
                            ("Yes" 4 . nil)
                            ("No" 1 . nil)
                            ("Never" 1 . t)))

clients/lsp-glsl.el

@@ -36,7 +36,7 @@
   "Command to run the GLSL language server."
   :group 'lsp-glsl
   :risky t
-  :type 'list)
+  :type '(list string))
 
 (lsp-register-client
  (make-lsp-client