2b746ea · helix · git.iko.soy

git.iko.soy/helix

Some minor clarity/cosmetic improvements

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>

commit2b746ea6fa6f7040e3ea51e1386bb914333594f4 authorPhilipp Mildenberger <philipp@mildenberger.me> dateWed 5 Apr 2023, 18:56 (4 years ago) parent39b9a4b

2 files changed+7−5

compare with master

unifiedsplit

helix-term/src/commands/lsp.rs+1−1 helix-view/src/editor.rs+6−4

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

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

13951395

13961396 let Some(language_server) = doc

13971397 .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()))

13991399 else {

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

14011401 return;

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

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

11361136

11371137 let doc_language_servers_not_in_registry =

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

1139− !language_servers.contains_key(*name)

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

1139+ language_servers

1140+ .get(*name)

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

11411142 });

11421143

11431144 for (_, language_server) in doc_language_servers_not_in_registry {

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

11451146 }

11461147

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

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

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

1149+ doc.language_servers

1150+ .get(*name)

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

11501152 });

11511153

11521154 for (_, language_server) in language_servers_not_in_doc {