8ab6d7b · helix · git.iko.soy

git.iko.soy/helix

Use let else instead of variable and fix some error messages

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>

commit8ab6d7be5e1b6f36215820ef616c2a9feb2306fa authorPhilipp Mildenberger <philipp@mildenberger.me> dateMon 20 Mar 2023, 00:08 (4 years ago) parent1d5d5da

3 files changed+19−21

compare with master

unifiedsplit

helix-term/src/commands.rs+1−1 helix-term/src/commands/lsp.rs+11−9 helix-term/src/commands/typed.rs+7−11

helix-term/src/commands.rs+1−1

@@ -4093,7 +4093,7 @@ fn format_selections(cx: &mut Context) {

40934093 Some(future_offset_encoding) => future_offset_encoding,

40944094 None => {

40954095 cx.editor

4096− .set_error("No language server supports range formatting");

4096+ .set_error("No configured language server supports range formatting");

40974097 return;

40984098 }

40994099 };

helix-term/src/commands/lsp.rs+11−9

@@ -389,7 +389,7 @@ pub fn symbol_picker(cx: &mut Context) {

389389

390390 if futures.is_empty() {

391391 cx.editor

392− .set_error("No Language server does support document symbols");

392+ .set_error("No configured language server supports document symbols");

393393 return;

394394 }

395395

@@ -433,7 +433,7 @@ pub fn workspace_symbol_picker(cx: &mut Context) {

433433 .collect();

434434

435435 if futures.is_empty() {

436− editor.set_error("No Language server does support workspace symbols");

436+ editor.set_error("No configured language server supports workspace symbols");

437437 }

438438

439439 async move {

@@ -663,7 +663,7 @@ pub fn code_action(cx: &mut Context) {

663663

664664 if futures.is_empty() {

665665 cx.editor

666− .set_error("No Language server does support code actions");

666+ .set_error("No configured language server supports code actions");

667667 return;

668668 }

669669

@@ -1043,7 +1043,8 @@ where

10431043 },

10441044 );

10451045 } else {

1046− cx.editor.set_error("No language server supports {feature}");

1046+ cx.editor

1047+ .set_error("No configured language server supports {feature}");

10471048 }

10481049}

10491050

@@ -1106,7 +1107,7 @@ pub fn goto_reference(cx: &mut Context) {

11061107 );

11071108 } else {

11081109 cx.editor

1109− .set_error("No language server supports goto-reference");

1110+ .set_error("No configured language server supports goto-reference");

11101111 }

11111112}

11121113

@@ -1138,7 +1139,7 @@ pub fn signature_help_impl(cx: &mut Context, invoked: SignatureHelpInvoked) {

11381139 // automatically on backspace, trigger characters, etc.

11391140 if invoked == SignatureHelpInvoked::Manual {

11401141 cx.editor

1141− .set_error("No language server supports signature-help");

1142+ .set_error("No configured language server supports signature-help");

11421143 }

11431144 return;

11441145 }

@@ -1269,7 +1270,8 @@ pub fn hover(cx: &mut Context) {

12691270 let future = match request {

12701271 Some(future) => future,

12711272 None => {

1272− cx.editor.set_error("No language server supports hover");

1273+ cx.editor

1274+ .set_error("No configured language server supports hover");

12731275 return;

12741276 }

12751277 };

@@ -1393,7 +1395,7 @@ pub fn rename_symbol(cx: &mut Context) {

13931395 }

13941396 } else {

13951397 cx.editor

1396− .set_error("No language server supports symbol renaming");

1398+ .set_error("No configured language server supports symbol renaming");

13971399 }

13981400 },

13991401 )

@@ -1459,7 +1461,7 @@ pub fn select_references_to_symbol_under_cursor(cx: &mut Context) {

14591461 Some(future_offset_encoding) => future_offset_encoding,

14601462 None => {

14611463 cx.editor

1462− .set_error("No language server supports document-highlight");

1464+ .set_error("No configured language server supports document-highlight");

14631465 return;

14641466 }

14651467 };

helix-term/src/commands/typed.rs+7−11

@@ -1330,23 +1330,19 @@ fn lsp_workspace_command(

13301330 return Ok(());

13311331 }

13321332 let doc = doc!(cx.editor);

1333− let id_options = doc

1333+ let Some((language_server_id, options)) = doc

13341334 .language_servers_with_feature(LanguageServerFeature::WorkspaceCommand)

13351335 .find_map(|ls| {

13361336 ls.capabilities()

13371337 .execute_command_provider

13381338 .as_ref()

13391339 .map(|options| (ls.id(), options))

1340− });

1341−

1342− let (language_server_id, options) = match id_options {

1343− Some(id_options) => id_options,

1344− None => {

1345− cx.editor.set_status(

1346− "No active language servers for this document support workspace commands",

1347− );

1348− return Ok(());

1349− }

1340+ })

1341+ else {

1342+ cx.editor.set_status(

1343+ "No active language servers for this document support workspace commands",

1344+ );

1345+ return Ok(());

13501346 };

13511347

13521348 if args.is_empty() {