git.iko.soy/helix
on master help sign in
Fix lsp_restart across multiple different document scopes (language servers weren't restarted, if not of the same scope id), and fix some smaller rebase issues
commit3e4bac1d964cc29939b396a7e1e9ebd7feda5e0a authorPhilipp Mildenberger <philipp@mildenberger.me> dateSun 2 Apr 2023, 20:05 (4 years ago) parent2a21b93
2 files changed+13−9
compare with master
unifiedsplit
helix-lsp/src/lib.rs+3−7 helix-term/src/commands/typed.rs+10−2
helix-lsp/src/lib.rs+3−7
@@ -691,7 +691,6 @@ impl Registry {
691691 .language_servers
692692 .iter()
693693 .filter_map(|LanguageServerFeatures { name, .. }| {
694− // #[allow(clippy::map_entry)]
695694 if self.inner.contains_key(name) {
696695 let client = match self.start_client(
697696 name.clone(),
@@ -708,7 +707,7 @@ impl Registry {
708707 .insert(name.clone(), vec![client.clone()])
709708 .unwrap();
710709
711− // TODO what if there are different language servers for different workspaces,
710+ // TODO what if there are multiple instances for different workspaces?
712711 // I think the language servers will be stopped without being restarted, which is not intended
713712 for old_client in old_clients {
714713 tokio::spawn(async move {
@@ -745,15 +744,12 @@ impl Registry {
745744 .language_servers
746745 .iter()
747746 .map(|LanguageServerFeatures { name, .. }| {
748− if let Some(clients) = self.inner.get_mut(name) {
749− // clients.find(
750−
751− if let Some((_, client)) = clients.iter_mut().enumerate().find(|(i, client)| {
747+ if let Some(clients) = self.inner.get(name) {
748+ if let Some((_, client)) = clients.iter().enumerate().find(|(i, client)| {
752749 client.try_add_doc(&language_config.roots, root_dirs, doc_path, *i == 0)
753750 }) {
754751 return Ok((name.to_owned(), client.clone()));
755752 }
756− // return Ok((name.clone(), clients.clone()));
757753 }
758754 let client = self.start_client(
759755 name.clone(),
helix-term/src/commands/typed.rs+10−2
@@ -1404,7 +1404,6 @@ fn lsp_restart(
14041404 .language_config()
14051405 .context("LSP not defined for the current document")?;
14061406
1407− let scope = config.scope.clone();
14081407 cx.editor.language_servers.restart(
14091408 config,
14101409 doc.path(),
@@ -1417,7 +1416,16 @@ fn lsp_restart(
14171416 .editor
14181417 .documents()
14191418 .filter_map(|doc| match doc.language_config() {
1420− Some(config) if config.scope.eq(&scope) => Some(doc.id()),
1419+ Some(config)
1420+ if config.language_servers.iter().any(|ls| {
1421+ config
1422+ .language_servers
1423+ .iter()
1424+ .any(|restarted_ls| restarted_ls.name == ls.name)
1425+ }) =>
1426+ {
1427+ Some(doc.id())
1428+ }
14211429 _ => None,
14221430 })
14231431 .collect();