andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-01-19 21:47:07 +04:00
Code Issues Projects Releases Wiki Activity

Don't panic on LSP not starting

Browse Source
This commit is contained in:
Egor Karavaev 2021-06-07 21:50:20 +03:00 committed by Blaž Hrastnik
parent 08f50310bd
commit 960bc9f134
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helix-lsp/src/client.rs
View File

@ -153,7 +153,7 @@ pub fn call<R: lsp::request::Request>(
timeout(Duration::from_secs(2), rx.recv())
.await
.map_err(|_| Error::Timeout)? // return Timeout
.unwrap() // TODO: None if channel closed
.ok_or(Error::StreamClosed)?
}
}

43
helix-lsp/src/lib.rs
View File

@ -13,7 +13,10 @@
use thiserror::Error;
use std::{collections::HashMap, sync::Arc};
use std::{
collections::{hash_map::Entry, HashMap},
sync::Arc,
};
use serde::{Deserialize, Serialize};
@ -29,6 +32,10 @@ pub enum Error {
Parse(#[from] serde_json::Error),
#[error("request timed out")]
Timeout,
#[error("server closed the stream")]
StreamClosed,
#[error("LSP not defined")]
LspNotDefined,
#[error(transparent)]
Other(#[from] anyhow::Error),
}
@ -173,7 +180,7 @@ pub fn parse(method: &str, params: jsonrpc::Params) -> Option<Notification> {
use futures_util::stream::select_all::SelectAll;
pub struct Registry {
inner: HashMap<LanguageId, Option<Arc<Client>>>,
inner: HashMap<LanguageId, Arc<Client>>,
pub incoming: SelectAll<UnboundedReceiverStream<Call>>,
}
@ -192,35 +199,29 @@ pub fn new() -> Self {
}
}
pub fn get(&mut self, language_config: &LanguageConfiguration) -> Option<Arc<Client>> {
// TODO: propagate the error
pub fn get(&mut self, language_config: &LanguageConfiguration) -> Result<Arc<Client>> {
if let Some(config) = &language_config.language_server {
// avoid borrow issues
let inner = &mut self.inner;
let s_incoming = &mut self.incoming;
let language_server = inner
.entry(language_config.scope.clone()) // can't use entry with Borrow keys: https://github.com/rust-lang/rfcs/pull/1769
.or_insert_with(|| {
// TODO: lookup defaults for id (name, args)
match inner.entry(language_config.scope.clone()) {
Entry::Occupied(language_server) => Ok(language_server.get().clone()),
Entry::Vacant(entry) => {
// initialize a new client
let (mut client, incoming) =
Client::start(&config.command, &config.args).ok()?;
let (mut client, incoming) = Client::start(&config.command, &config.args)?;
// TODO: run this async without blocking
futures_executor::block_on(client.initialize()).unwrap();
futures_executor::block_on(client.initialize())?;
s_incoming.push(UnboundedReceiverStream::new(incoming));
let client = Arc::new(client);
Some(Arc::new(client))
})
.clone();
return language_server;
entry.insert(client.clone());
Ok(client)
}
}
} else {
Err(Error::LspNotDefined)
}
None
}
}

4
helix-view/src/editor.rs
View File

@ -155,7 +155,7 @@ pub fn open(&mut self, path: PathBuf, action: Action) -> Result<DocumentId, Erro
let language_server = doc
.language
.as_ref()
.and_then(|language| self.language_servers.get(language));
.and_then(|language| self.language_servers.get(language).ok());
if let Some(language_server) = language_server {
doc.set_language_server(Some(language_server.clone()));
@ -196,7 +196,7 @@ pub fn close(&mut self, id: ViewId, close_buffer: bool) {
let language_server = doc
.language
.as_ref()
.and_then(|language| language_servers.get(language));
.and_then(|language| language_servers.get(language).ok());
if let Some(language_server) = language_server {
tokio::spawn(language_server.text_document_did_close(doc.identifier()));
}