Skip to content

Commit

Permalink
cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
the-mikedavis committed May 7, 2024
1 parent 9dd51e7 commit 5c11af1
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion helix-lsp/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ impl Registry {
pub fn remove_by_id(&mut self, id: LanguageServerId) {
let Some(client) = self.inner.remove(id) else {
log::error!("client was already removed");
return
return;
};
self.file_event_handler.remove_client(id);
let instances = self
Expand Down
4 changes: 3 additions & 1 deletion helix-term/src/handlers/completion/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ impl AsyncHook for ResolveTimeout {
}

fn finish_debounce(&mut self) {
let Some(request) = self.next_request.take() else { return };
let Some(request) = self.next_request.take() else {
return;
};
let (tx, rx) = helix_event::cancelation();
self.in_flight = Some((tx, request.item.clone()));
tokio::spawn(request.execute(rx));
Expand Down
13 changes: 6 additions & 7 deletions helix-term/src/handlers/signature_help.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ pub fn request_signature_help(
// Do not show the message if signature help was invoked
// automatically on backspace, trigger characters, etc.
if invoked == SignatureHelpInvoked::Manual {
editor
.set_error("No configured language server supports signature-help");
editor.set_error("No configured language server supports signature-help");
}
return;
};
Expand Down Expand Up @@ -300,11 +299,11 @@ fn signature_help_post_insert_char_hook(
let (view, doc) = current!(cx.editor);
// TODO support multiple language servers (not just the first that is found), likely by merging UI somehow
let Some(language_server) = doc
.language_servers_with_feature(LanguageServerFeature::SignatureHelp)
.next()
else {
return Ok(());
};
.language_servers_with_feature(LanguageServerFeature::SignatureHelp)
.next()
else {
return Ok(());
};

let capabilities = language_server.capabilities();

Expand Down
4 changes: 2 additions & 2 deletions helix-vcs/src/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ fn status(repo: &Repository, f: impl Fn(Result<FileChange>) -> bool) -> Result<(

for item in status_iter {
let Ok(item) = item.map_err(|err| f(Err(err.into()))) else {
continue;
};
continue;
};
let change = match item {
Item::Modification {
rela_path, status, ..
Expand Down
4 changes: 3 additions & 1 deletion helix-view/src/register.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,9 @@ fn read_from_clipboard<'a>(
// If we're pasting the same values that we just yanked, re-use
// the saved values. This allows pasting multiple selections
// even when yanked to a clipboard.
let Some(values) = saved_values else { return RegisterValues::new(iter::once(contents.into())) };
let Some(values) = saved_values else {
return RegisterValues::new(iter::once(contents.into()));
};

if contents_are_saved(values, &contents) {
RegisterValues::new(values.iter().map(Cow::from).rev())
Expand Down

0 comments on commit 5c11af1

Please sign in to comment.