From 8ab6d7be5e1b6f36215820ef616c2a9feb2306fa Mon Sep 17 00:00:00 2001
From: Philipp Mildenberger <philipp@mildenberger.me>
Date: Mon, 20 Mar 2023 00:08:24 +0100
Subject: [PATCH] Use let else instead of variable and fix some error messages

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
---
 helix-term/src/commands.rs       |  2 +-
 helix-term/src/commands/lsp.rs   | 20 +++++++++++---------
 helix-term/src/commands/typed.rs | 18 +++++++-----------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 772db6f85..e2a5975b4 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4093,7 +4093,7 @@ fn format_selections(cx: &mut Context) {
         Some(future_offset_encoding) => future_offset_encoding,
         None => {
             cx.editor
-                .set_error("No language server supports range formatting");
+                .set_error("No configured language server supports range formatting");
             return;
         }
     };
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 9e9639bf5..a1bd291cf 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -389,7 +389,7 @@ pub fn symbol_picker(cx: &mut Context) {
 
     if futures.is_empty() {
         cx.editor
-            .set_error("No Language server does support document symbols");
+            .set_error("No configured language server supports document symbols");
         return;
     }
 
@@ -433,7 +433,7 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
             .collect();
 
         if futures.is_empty() {
-            editor.set_error("No Language server does support workspace symbols");
+            editor.set_error("No configured language server supports workspace symbols");
         }
 
         async move {
@@ -663,7 +663,7 @@ pub fn code_action(cx: &mut Context) {
 
     if futures.is_empty() {
         cx.editor
-            .set_error("No Language server does support code actions");
+            .set_error("No configured language server supports code actions");
         return;
     }
 
@@ -1043,7 +1043,8 @@ where
             },
         );
     } else {
-        cx.editor.set_error("No language server supports {feature}");
+        cx.editor
+            .set_error("No configured language server supports {feature}");
     }
 }
 
@@ -1106,7 +1107,7 @@ pub fn goto_reference(cx: &mut Context) {
         );
     } else {
         cx.editor
-            .set_error("No language server supports goto-reference");
+            .set_error("No configured language server supports goto-reference");
     }
 }
 
@@ -1138,7 +1139,7 @@ pub fn signature_help_impl(cx: &mut Context, invoked: SignatureHelpInvoked) {
             // automatically on backspace, trigger characters, etc.
             if invoked == SignatureHelpInvoked::Manual {
                 cx.editor
-                    .set_error("No language server supports signature-help");
+                    .set_error("No configured language server supports signature-help");
             }
             return;
         }
@@ -1269,7 +1270,8 @@ pub fn hover(cx: &mut Context) {
     let future = match request {
         Some(future) => future,
         None => {
-            cx.editor.set_error("No language server supports hover");
+            cx.editor
+                .set_error("No configured language server supports hover");
             return;
         }
     };
@@ -1393,7 +1395,7 @@ pub fn rename_symbol(cx: &mut Context) {
                     }
                 } else {
                     cx.editor
-                        .set_error("No language server supports symbol renaming");
+                        .set_error("No configured language server supports symbol renaming");
                 }
             },
         )
@@ -1459,7 +1461,7 @@ pub fn select_references_to_symbol_under_cursor(cx: &mut Context) {
         Some(future_offset_encoding) => future_offset_encoding,
         None => {
             cx.editor
-                .set_error("No language server supports document-highlight");
+                .set_error("No configured language server supports document-highlight");
             return;
         }
     };
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 8cfc9fd22..9ab2aa4fa 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1330,23 +1330,19 @@ fn lsp_workspace_command(
         return Ok(());
     }
     let doc = doc!(cx.editor);
-    let id_options = doc
+    let Some((language_server_id, options)) = doc
         .language_servers_with_feature(LanguageServerFeature::WorkspaceCommand)
         .find_map(|ls| {
             ls.capabilities()
                 .execute_command_provider
                 .as_ref()
                 .map(|options| (ls.id(), options))
-        });
-
-    let (language_server_id, options) = match id_options {
-        Some(id_options) => id_options,
-        None => {
-            cx.editor.set_status(
-                "No active language servers for this document support workspace commands",
-            );
-            return Ok(());
-        }
+        })
+    else {
+        cx.editor.set_status(
+             "No active language servers for this document support workspace commands",
+        );
+        return Ok(());
     };
 
     if args.is_empty() {