kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Some minor clarity/cosmetic improvements

Browse source 
Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
This commit is contained in:
Philipp Mildenberger 2023-04-05 18:56:19 +02:00
parent 39b9a4bba2
commit 2b746ea6fa
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
helix-term/src/commands/lsp.rs
View file

@ -1395,7 +1395,7 @@ pub fn rename_symbol(cx: &mut Context) {
let Some(language_server) = doc
.language_servers_with_feature(LanguageServerFeature::RenameSymbol)
.find(|ls| language_server_id.is_none() || Some(ls.id()) == language_server_id)
.find(|ls| language_server_id.map_or(true, |id| id == ls.id()))
else {
cx.editor.set_error("No configured language server supports symbol renaming");
return;

10
helix-view/src/editor.rs
View file

@ -1136,8 +1136,9 @@ impl Editor {
let doc_language_servers_not_in_registry =
doc.language_servers.iter().filter(|(name, doc_ls)| {
!language_servers.contains_key(*name)
|| language_servers[*name].id() != doc_ls.id()
language_servers
.get(*name)
.map_or(true, |ls| ls.id() != doc_ls.id())
});
for (_, language_server) in doc_language_servers_not_in_registry {
@ -1145,8 +1146,9 @@ impl Editor {
}
let language_servers_not_in_doc = language_servers.iter().filter(|(name, ls)| {
!doc.language_servers.contains_key(*name)
|| doc.language_servers[*name].id() != ls.id()
doc.language_servers
.get(*name)
.map_or(true, |doc_ls| ls.id() != doc_ls.id())
});
for (_, language_server) in language_servers_not_in_doc {