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

refactor: use let else statement

Browse source
This commit is contained in:
Nikita Revenco 2024-12-23 13:54:12 +00:00
parent cd9512cbce
commit ca5c96b982
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1439,9 +1439,9 @@ fn compute_color_swatches_for_view(
// Don't recompute the color swatches in case nothing has changed about the view
if !doc.color_swatches_outdated
&& doc
.color_swatches(view_id)
.map_or(false, |dih| dih.id == new_doc_color_swatches_id)
&& doc.color_swatches(view_id).map_or(false, |color_swatches| {
color_swatches.id == new_doc_color_swatches_id
})
{
return None;
}
@ -1475,27 +1475,24 @@ fn compute_color_swatches_for_view(
}
};
// Most language servers will already send them sorted but ensure this is the case to
// avoid errors on our end.
// Most language servers will already send them sorted but ensure this is the case to avoid errors on our end.
swatches.sort_by_key(|inlay_hint| inlay_hint.range.start);
let mut color_swatches = Vec::with_capacity(swatches.len());
// let mut color_swatches_padding = Vec::with_capacity(swatches.len());
let mut colors = Vec::with_capacity(swatches.len());
let doc_text = doc.text();
for swatch in swatches {
let char_idx = match helix_lsp::util::lsp_pos_to_pos(
doc_text,
swatch.range.start,
offset_encoding,
) {
Some(pos) => pos,
let Some(swatch_index) =
helix_lsp::util::lsp_pos_to_pos(doc_text, swatch.range.start, offset_encoding)
else {
// Skip color swatches that have no "real" position
None => continue,
continue;
};
color_swatches.push(InlineAnnotation::new(char_idx, "■ "));
color_swatches.push(InlineAnnotation::new(swatch_index, "■ "));
colors.push(Color::Rgb(
(swatch.color.red * 255.) as u8,
(swatch.color.green * 255.) as u8,