Do not use lsp-find-workspace in lsp-rust.el (#2604)

Fixes #2603

Author: yyoncho

clients/lsp-rust.el

@@ -555,49 +555,43 @@ them with `crate` or the crate name they refer to."
 (defun lsp-rust-analyzer-syntax-tree ()
   "Display syntax tree for current buffer."
   (interactive)
-  (-if-let* ((workspace (lsp-find-workspace 'rust-analyzer))
-             (root (lsp-workspace-root default-directory))
-             (params (lsp-make-rust-analyzer-syntax-tree-params
-                      :text-document (lsp--text-document-identifier)
-                      :range? (if (use-region-p)
-                                  (lsp--region-to-range (region-beginning) (region-end))
-                                (lsp--region-to-range (point-min) (point-max)))))
-             (results (with-lsp-workspace workspace
-                        (lsp-send-request (lsp-make-request
-                                           "rust-analyzer/syntaxTree"
-                                           params)))))
-      (let ((buf (get-buffer-create (format "*rust-analyzer syntax tree %s*" root)))
-            (inhibit-read-only t))
-        (with-current-buffer buf
-          (lsp-rust-analyzer-syntax-tree-mode)
-          (erase-buffer)
-          (insert results)
-          (goto-char (point-min)))
-        (pop-to-buffer buf))
-    (message "rust-analyzer not running.")))
+  (-let* ((root (lsp-workspace-root default-directory))
+          (params (lsp-make-rust-analyzer-syntax-tree-params
+                   :text-document (lsp--text-document-identifier)
+                   :range? (if (use-region-p)
+                               (lsp--region-to-range (region-beginning) (region-end))
+                             (lsp--region-to-range (point-min) (point-max)))))
+          (results (lsp-send-request (lsp-make-request
+                                      "rust-analyzer/syntaxTree"
+                                      params))))
+    (let ((buf (get-buffer-create (format "*rust-analyzer syntax tree %s*" root)))
+          (inhibit-read-only t))
+      (with-current-buffer buf
+        (lsp-rust-analyzer-syntax-tree-mode)
+        (erase-buffer)
+        (insert results)
+        (goto-char (point-min)))
+      (pop-to-buffer buf))))
 
 (define-derived-mode lsp-rust-analyzer-status-mode special-mode "Rust-Analyzer-Status"
   "Mode for the rust-analyzer status buffer.")
 
 (defun lsp-rust-analyzer-status ()
   "Displays status information for rust-analyzer."
   (interactive)
-  (-if-let* ((workspace (lsp-find-workspace 'rust-analyzer))
-             (root (lsp-workspace-root default-directory))
-             (params (lsp-make-rust-analyzer-analyzer-status-params
-                      :text-document (lsp--text-document-identifier)))
-             (results (with-lsp-workspace workspace
-                        (lsp-send-request (lsp-make-request
-                                           "rust-analyzer/analyzerStatus"
-                                           params)))))
-      (let ((buf (get-buffer-create (format "*rust-analyzer status %s*" root)))
-            (inhibit-read-only t))
-        (with-current-buffer buf
-          (lsp-rust-analyzer-status-mode)
-          (erase-buffer)
-          (insert results)
-          (pop-to-buffer buf)))
-    (message "rust-analyzer not running.")))
+  (-let* ((root (lsp-workspace-root default-directory))
+          (params (lsp-make-rust-analyzer-analyzer-status-params
+                   :text-document (lsp--text-document-identifier)))
+          (results (lsp-send-request (lsp-make-request
+                                      "rust-analyzer/analyzerStatus"
+                                      params))))
+    (let ((buf (get-buffer-create (format "*rust-analyzer status %s*" root)))
+          (inhibit-read-only t))
+      (with-current-buffer buf
+        (lsp-rust-analyzer-status-mode)
+        (erase-buffer)
+        (insert results)
+        (pop-to-buffer buf)))))
 
 (defun lsp-rust-analyzer-join-lines ()
   "Join selected lines into one, smartly fixing up whitespace and trailing commas."
@@ -780,7 +774,7 @@ them with `crate` or the crate name they refer to."
  nil)
 
 (defun lsp-rust-analyzer-initialized? ()
-  (when-let ((workspace (lsp-find-workspace 'rust-analyzer)))
+  (when-let ((workspace (lsp-find-workspace 'rust-analyzer (buffer-file-name))))
     (eq 'initialized (lsp--workspace-status workspace))))
 
 (defun lsp-rust-analyzer-inlay-hints-change-handler (&rest _rest)
@@ -803,18 +797,15 @@ them with `crate` or the crate name they refer to."
 (defun lsp-rust-analyzer-expand-macro ()
   "Expands the macro call at point recursively."
   (interactive)
-  (-if-let (workspace (lsp-find-workspace 'rust-analyzer))
-      (-if-let* ((params (lsp-make-rust-analyzer-expand-macro-params
-                          :text-document (lsp--text-document-identifier)
-                          :position (lsp--cur-position)))
-                 (response (with-lsp-workspace workspace
-                             (lsp-send-request (lsp-make-request
-                                                "rust-analyzer/expandMacro"
-                                                params))))
-                 ((&rust-analyzer:ExpandedMacro :expansion) response))
-          (funcall lsp-rust-analyzer-macro-expansion-method expansion)
-        (message "No macro found at point, or it could not be expanded."))
-    (message "rust-analyzer not running.")))
+  (-if-let* ((params (lsp-make-rust-analyzer-expand-macro-params
+                      :text-document (lsp--text-document-identifier)
+                      :position (lsp--cur-position)))
+             (response (lsp-send-request (lsp-make-request
+                                          "rust-analyzer/expandMacro"
+                                          params)))
+             ((&rust-analyzer:ExpandedMacro :expansion) response))
+      (funcall lsp-rust-analyzer-macro-expansion-method expansion)
+    (message "No macro found at point, or it could not be expanded.")))
 
 (defun lsp-rust-analyzer-macro-expansion-default (result)
   "Default method for displaying macro expansion."