suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use StreamExt::select_next_some to avoid infinitely spinning on empty stream.

pull/11/head
Blaž Hrastnik 2021-03-30 16:39:24 +09:00
parent e833d65b77
commit ebfd67ac6a
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
helix-term/src/application.rs
View File

@ -99,10 +99,10 @@ impl Application {
event = reader.next().fuse() => { event = reader.next().fuse() => {
self.handle_terminal_events(event) self.handle_terminal_events(event)
} }
call = self.editor.language_servers.incoming.next().fuse() => { call = futures_util::StreamExt::select_next_some(&mut self.editor.language_servers.incoming) => {
self.handle_language_server_message(call).await self.handle_language_server_message(call).await
} }
callback = self.callbacks.next().fuse() => { callback = futures_util::StreamExt::select_next_some(&mut self.callbacks) => {
self.handle_language_server_callback(callback) self.handle_language_server_callback(callback)
} }
} }
@ -110,9 +110,9 @@ impl Application {
} }
pub fn handle_language_server_callback( pub fn handle_language_server_callback(
&mut self, &mut self,
callback: Option<Result<LspCallbackWrapper, anyhow::Error>>, callback: Result<LspCallbackWrapper, anyhow::Error>,
) { ) {
if let Some(Ok(callback)) = callback { if let Ok(callback) = callback {
// TODO: handle Err() // TODO: handle Err()
callback(&mut self.editor, &mut self.compositor); callback(&mut self.editor, &mut self.compositor);
self.render(); self.render();
@ -144,12 +144,10 @@ impl Application {
} }
} }
pub async fn handle_language_server_message(&mut self, call: Option<helix_lsp::Call>) { pub async fn handle_language_server_message(&mut self, call: helix_lsp::Call) {
use helix_lsp::{Call, Notification}; use helix_lsp::{Call, Notification};
match call { match call {
Some(Call::Notification(helix_lsp::jsonrpc::Notification { Call::Notification(helix_lsp::jsonrpc::Notification { method, params, .. }) => {
method, params, ..
})) => {
let notification = Notification::parse(&method, params); let notification = Notification::parse(&method, params);
match notification { match notification {
Notification::PublishDiagnostics(params) => { Notification::PublishDiagnostics(params) => {
@ -203,7 +201,7 @@ impl Application {
_ => unreachable!(), _ => unreachable!(),
} }
} }
Some(Call::MethodCall(call)) => { Call::MethodCall(call) => {
error!("Method not found {}", call.method); error!("Method not found {}", call.method);
// self.language_server.reply( // self.language_server.reply(
@ -216,7 +214,6 @@ impl Application {
// }), // }),
// ); // );
} }
None => (),
e => unreachable!("{:?}", e), e => unreachable!("{:?}", e),
} }
} }