2b746ea · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Some minor clarity/cosmetic improvements

2b746eaPhilipp Mildenberger4 years ago

helix-term/src/commands/lsp.rs+1−1

compare with master

unifiedsplit

@@ -1395,7 +1395,7 @@ pub fn rename_symbol(cx: &mut Context) {

1395

1396 let Some(language_server) = doc

1397 .language_servers_with_feature(LanguageServerFeature::RenameSymbol)

1398− .find(|ls| language_server_id.is_none() || Some(ls.id()) == language_server_id)

1398+ .find(|ls| language_server_id.map_or(true, |id| id == ls.id()))

1399 else {

1400 cx.editor.set_error("No configured language server supports symbol renaming");

1401 return;

helix-view/src/editor.rs+6−4

@@ -1136,8 +1136,9 @@ impl Editor {

1136

1137 let doc_language_servers_not_in_registry =

1138 doc.language_servers.iter().filter(|(name, doc_ls)| {

1139− !language_servers.contains_key(*name)

1139+ language_servers

1140− || language_servers[*name].id() != doc_ls.id()

1140+ .get(*name)

1141+ .map_or(true, |ls| ls.id() != doc_ls.id())

1141 });

1142 });

1142

1143

1143 for (_, language_server) in doc_language_servers_not_in_registry {

1144 for (_, language_server) in doc_language_servers_not_in_registry {

@@ -1145,8 +1146,9 @@ impl Editor {

1145 }

1146 }

1146

1147

1147 let language_servers_not_in_doc = language_servers.iter().filter(|(name, ls)| {

1148 let language_servers_not_in_doc = language_servers.iter().filter(|(name, ls)| {

1148− !doc.language_servers.contains_key(*name)

1149+ doc.language_servers

1149− || doc.language_servers[*name].id() != ls.id()

1150+ .get(*name)

1151+ .map_or(true, |doc_ls| ls.id() != doc_ls.id())

1150 });

1152 });

1151

1153

1152 for (_, language_server) in language_servers_not_in_doc {

1154 for (_, language_server) in language_servers_not_in_doc {