8a28f30 · helix · git.iko.soy

git.iko.soy/helix

Reformat with nightly rustfmt for better let-else formatting (#7721)

commit8a28f3059398eec7b5496bb1088b4d9870e6eb7e authorPhilipp Mildenberger <philipp@mildenberger.me> dateThu 27 Jul 2023, 04:57 (3 years ago) parent262a595

8 files changed+53−22

compare with master

unifiedsplit

helix-core/src/match_brackets.rs+6−2 helix-core/src/transaction.rs+4−1 helix-loader/build.rs+6−2 helix-lsp/src/lib.rs+1−1 helix-term/src/commands/lsp.rs+14−6 helix-term/src/commands/typed.rs+2−3 helix-term/src/ui/completion.rs+13−3 helix-term/src/ui/picker.rs+7−4

helix-core/src/match_brackets.rs+6−2

@@ -106,12 +106,16 @@ fn find_pair(

106106 for close in

107107 iter::successors(node.next_sibling(), |node| node.next_sibling()).take(MATCH_LIMIT)

108108 {

109− let Some(open) = as_close_pair(doc, &close) else { continue; };

109+ let Some(open) = as_close_pair(doc, &close) else {

110+ continue;

111+ };

110112 if find_pair_end(doc, Some(node), open, Backward).is_some() {

111113 return doc.try_byte_to_char(close.start_byte()).ok();

112114 }

113115 }

114− let Some(parent) = node.parent() else { break; };

116+ let Some(parent) = node.parent() else {

117+ break;

118+ };

115119 node = parent;

116120 }

117121 let node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;

helix-core/src/transaction.rs+4−1

@@ -389,7 +389,10 @@ impl ChangeSet {

389389 }

390390

391391 let Some((i, change)) = iter.next() else {

392− map!(|pos, _| (old_pos == pos).then_some(new_pos), self.changes.len());

392+ map!(

393+ |pos, _| (old_pos == pos).then_some(new_pos),

394+ self.changes.len()

395+ );

393396 break;

394397 };

395398

helix-loader/build.rs+6−2

@@ -40,7 +40,9 @@ fn main() {

4040 .ok()

4141 .filter(|output| output.status.success())

4242 .and_then(|x| String::from_utf8(x.stdout).ok())

43− else{ return; };

43+ else {

44+ return;

45+ };

4446 // If heads starts pointing at something else (different branch)

4547 // we need to return

4648 let head = Path::new(&git_dir).join("HEAD");

@@ -55,7 +57,9 @@ fn main() {

5557 .ok()

5658 .filter(|output| output.status.success())

5759 .and_then(|x| String::from_utf8(x.stdout).ok())

58− else{ return; };

60+ else {

61+ return;

62+ };

5963 let head_ref = Path::new(&git_dir).join(head_ref);

6064 if head_ref.exists() {

6165 println!("cargo:rerun-if-changed={}", head_ref.display());

helix-lsp/src/lib.rs+1−1

@@ -435,7 +435,7 @@ pub mod util {

435435 }

436436

437437 let tabstops = tabstops.first().filter(|tabstops| !tabstops.is_empty());

438− let Some(tabstops) = tabstops else{

438+ let Some(tabstops) = tabstops else {

439439 // no tabstop normal mapping

440440 mapped_selection.push(range);

441441 continue;

helix-term/src/commands/lsp.rs+14−6

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

730730

731731 // always present here

732732 let action = action.unwrap();

733− let Some(language_server) = editor.language_server_by_id(action.language_server_id) else {

733+ let Some(language_server) = editor.language_server_by_id(action.language_server_id)

734+ else {

734735 editor.set_error("Language Server disappeared");

735736 return;

736737 };

@@ -746,15 +747,20 @@ pub fn code_action(cx: &mut Context) {

746747 // we support lsp "codeAction/resolve" for `edit` and `command` fields

747748 let mut resolved_code_action = None;

748749 if code_action.edit.is_none() || code_action.command.is_none() {

749− if let Some(future) = language_server.resolve_code_action(code_action.clone()) {

750+ if let Some(future) =

751+ language_server.resolve_code_action(code_action.clone())

752+ {

750753 if let Ok(response) = helix_lsp::block_on(future) {

751− if let Ok(code_action) = serde_json::from_value::<CodeAction>(response) {

754+ if let Ok(code_action) =

755+ serde_json::from_value::<CodeAction>(response)

756+ {

752757 resolved_code_action = Some(code_action);

753758 }

754759 }

755760 }

756761 }

757− let resolved_code_action = resolved_code_action.as_ref().unwrap_or(code_action);

762+ let resolved_code_action =

763+ resolved_code_action.as_ref().unwrap_or(code_action);

758764

759765 if let Some(ref workspace_edit) = resolved_code_action.edit {

760766 log::debug!("edit: {:?}", workspace_edit);

@@ -1186,7 +1192,8 @@ pub fn signature_help_impl(cx: &mut Context, invoked: SignatureHelpInvoked) {

11861192 // Do not show the message if signature help was invoked

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

11881194 if invoked == SignatureHelpInvoked::Manual {

1189− cx.editor.set_error("No configured language server supports signature-help");

1195+ cx.editor

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

11901197 }

11911198 return;

11921199 };

@@ -1411,7 +1418,8 @@ pub fn rename_symbol(cx: &mut Context) {

14111418 .language_servers_with_feature(LanguageServerFeature::RenameSymbol)

14121419 .find(|ls| language_server_id.map_or(true, |id| id == ls.id()))

14131420 else {

1414− cx.editor.set_error("No configured language server supports symbol renaming");

1421+ cx.editor

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

14151423 return;

14161424 };

14171425

helix-term/src/commands/typed.rs+2−3

@@ -1385,9 +1385,8 @@ fn lsp_workspace_command(

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

13861386 })

13871387 else {

1388− cx.editor.set_status(

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

1390− );

1388+ cx.editor

1389+ .set_status("No active language servers for this document support workspace commands");

13911390 return Ok(());

13921391 };

13931392

helix-term/src/ui/completion.rs+13−3

@@ -144,7 +144,9 @@ impl Completion {

144144 }

145145 };

146146

147− let Some(range) = util::lsp_range_to_range(doc.text(), edit.range, offset_encoding) else{

147+ let Some(range) =

148+ util::lsp_range_to_range(doc.text(), edit.range, offset_encoding)

149+ else {

148150 return Transaction::new(doc.text());

149151 };

150152

@@ -413,10 +415,18 @@ impl Completion {

413415 _ => return false,

414416 };

415417

416− let Some(language_server) = cx.editor.language_server_by_id(current_item.language_server_id) else { return false; };

418+ let Some(language_server) = cx

419+ .editor

420+ .language_server_by_id(current_item.language_server_id)

421+ else {

422+ return false;

423+ };

417424

418425 // This method should not block the compositor so we handle the response asynchronously.

419− let Some(future) = language_server.resolve_completion_item(current_item.item.clone()) else { return false; };

426+ let Some(future) = language_server.resolve_completion_item(current_item.item.clone())

427+ else {

428+ return false;

429+ };

420430

421431 cx.callback(

422432 future,

helix-term/src/ui/picker.rs+7−4

@@ -432,7 +432,7 @@ impl<T: Item + 'static> Picker<T> {

432432

433433 fn handle_idle_timeout(&mut self, cx: &mut Context) -> EventResult {

434434 let Some((current_file, _)) = self.current_file(cx.editor) else {

435− return EventResult::Consumed(None)

435+ return EventResult::Consumed(None);

436436 };

437437

438438 // Try to find a document in the cache

@@ -459,11 +459,14 @@ impl<T: Item + 'static> Picker<T> {

459459 let callback = move |editor: &mut Editor, compositor: &mut Compositor| {

460460 let Some(syntax) = syntax else {

461461 log::info!("highlighting picker item failed");

462− return

462+ return;

463463 };

464− let Some(Overlay { content: picker, .. }) = compositor.find::<Overlay<Self>>() else {

464+ let Some(Overlay {

465+ content: picker, ..

466+ }) = compositor.find::<Overlay<Self>>()

467+ else {

465468 log::info!("picker closed before syntax highlighting finished");

466− return

469+ return;

467470 };

468471 // Try to find a document in the cache

469472 let doc = match current_file {