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

refactor: compute_lines function

Browse source
This commit is contained in:
Nikita Revenco 2024-12-20 14:32:32 +00:00
parent cc71969884
commit 0b71472406
1 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1270,6 +1270,24 @@ pub fn compute_color_swatches_for_all_views(editor: &mut Editor, jobs: &mut crat
} }
} }
fn compute_lines(view: &View, doc: &Document) -> (usize, usize) {
// Compute ~3 times the current view height of color swatches, that way some scrolling
// will not show half the view with hints and half without while still being faster
// than computing all the hints for the full file (which could be dozens of time
// longer than the view is).
let doc_text = doc.text();
let len_lines = doc_text.len_lines();
let view_height = view.inner_height();
let first_visible_line =
doc_text.char_to_line(doc.view_offset(view.id).anchor.min(doc_text.len_chars()));
let first_line = first_visible_line.saturating_sub(view_height);
let last_line = first_visible_line
.saturating_add(view_height.saturating_mul(2))
.min(len_lines);
(first_line, last_line)
}
fn compute_color_swatches_for_view( fn compute_color_swatches_for_view(
view: &View, view: &View,
doc: &Document, doc: &Document,
@ -1281,20 +1299,7 @@ fn compute_color_swatches_for_view(
.language_servers_with_feature(LanguageServerFeature::ColorProvider) .language_servers_with_feature(LanguageServerFeature::ColorProvider)
.next()?; .next()?;
let doc_text = doc.text(); let (first_line, last_line) = compute_lines(view, doc);
let len_lines = doc_text.len_lines();
// Compute ~3 times the current view height of color swatches, that way some scrolling
// will not show half the view with hints and half without while still being faster
// than computing all the hints for the full file (which could be dozens of time
// longer than the view is).
let view_height = view.inner_height();
let first_visible_line =
doc_text.char_to_line(doc.view_offset(view_id).anchor.min(doc_text.len_chars()));
let first_line = first_visible_line.saturating_sub(view_height);
let last_line = first_visible_line
.saturating_add(view_height.saturating_mul(2))
.min(len_lines);
let new_doc_color_swatches_id = ColorSwatchesId { let new_doc_color_swatches_id = ColorSwatchesId {
first_line, first_line,
@ -1344,10 +1349,8 @@ fn compute_color_swatches_for_view(
// avoid errors on our end. // avoid errors on our end.
swatches.sort_by_key(|inlay_hint| inlay_hint.range.start); swatches.sort_by_key(|inlay_hint| inlay_hint.range.start);
// let mut padding_before_color_swatches = Vec::new();
let mut color_swatches = Vec::new(); let mut color_swatches = Vec::new();
let mut colors = Vec::new(); let mut colors = Vec::new();
// let mut padding_after_color_swatches = Vec::new();
let doc_text = doc.text(); let doc_text = doc.text();
@ -1362,9 +1365,7 @@ fn compute_color_swatches_for_view(
None => continue, None => continue,
}; };
let label = String::from("■ "); color_swatches.push(InlineAnnotation::new(char_idx, "■"));
color_swatches.push(InlineAnnotation::new(char_idx, label));
colors.push(Color::Rgb( colors.push(Color::Rgb(
(swatch.color.red * 255.) as u8, (swatch.color.red * 255.) as u8,
(swatch.color.green * 255.) as u8, (swatch.color.green * 255.) as u8,
@ -1398,20 +1399,7 @@ fn compute_inlay_hints_for_view(
.language_servers_with_feature(LanguageServerFeature::InlayHints) .language_servers_with_feature(LanguageServerFeature::InlayHints)
.next()?; .next()?;
let doc_text = doc.text(); let (first_line, last_line) = compute_lines(view, doc);
let len_lines = doc_text.len_lines();
// Compute ~3 times the current view height of inlay hints, that way some scrolling
// will not show half the view with hints and half without while still being faster
// than computing all the hints for the full file (which could be dozens of time
// longer than the view is).
let view_height = view.inner_height();
let first_visible_line =
doc_text.char_to_line(doc.view_offset(view_id).anchor.min(doc_text.len_chars()));
let first_line = first_visible_line.saturating_sub(view_height);
let last_line = first_visible_line
.saturating_add(view_height.saturating_mul(2))
.min(len_lines);
let new_doc_inlay_hints_id = DocumentInlayHintsId { let new_doc_inlay_hints_id = DocumentInlayHintsId {
first_line, first_line,
@ -1426,6 +1414,7 @@ fn compute_inlay_hints_for_view(
return None; return None;
} }
let doc_text = doc.text();
let doc_slice = doc_text.slice(..); let doc_slice = doc_text.slice(..);
let first_char_in_range = doc_slice.line_to_char(first_line); let first_char_in_range = doc_slice.line_to_char(first_line);
let last_char_in_range = doc_slice.line_to_char(last_line); let last_char_in_range = doc_slice.line_to_char(last_line);