Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Limit top context identifiers and diagnostics (#58870)

Miguel Raz Guzmán Macedodd3521df2b49
diff --git a/crates/edit_prediction_context/src/edit_prediction_context.rs b/crates/edit_prediction_context/src/edit_prediction_context.rs
index 2b9bb380156..0bcd63cdcf0 100644
--- a/crates/edit_prediction_context/src/edit_prediction_context.rs
+++ b/crates/edit_prediction_context/src/edit_prediction_context.rs
@@ -260,8 +260,13 @@ impl RelatedExcerptStore {
(id, distance)
})
.collect();
- identifiers_with_distance.sort_by_key(|(_, distance)| *distance);
- identifiers_with_distance.truncate(MAX_CONTEXT_IDENTIFIER_COUNT);
+ // Only the closest `MAX_CONTEXT_IDENTIFIER_COUNT` identifiers are
+ // used below, so select that prefix instead of fully sorting.
+ util::truncate_to_bottom_n_sorted_by(
+ &mut identifiers_with_distance,
+ MAX_CONTEXT_IDENTIFIER_COUNT,
+ &|(_, a), (_, b)| a.cmp(b),
+ );
let mut cursor_distances: HashMap<Identifier, usize> = HashMap::default();
let mut current_rank = 0;
diff --git a/crates/zeta_prompt/src/zeta_prompt.rs b/crates/zeta_prompt/src/zeta_prompt.rs
index 335eb85f292..f66ee67f463 100644
--- a/crates/zeta_prompt/src/zeta_prompt.rs
+++ b/crates/zeta_prompt/src/zeta_prompt.rs
@@ -920,13 +920,22 @@ pub fn format_active_buffer_diagnostics_with_budget(
return String::new();
}
+ const MAX_DIAGNOSTICS: usize = 10;
+
let mut diagnostic_indices = (0..diagnostics.len()).collect::<Vec<_>>();
if let Some(cursor_buffer_row) = cursor_buffer_row {
- diagnostic_indices.sort_by_key(|index| {
+ let distance = |index: &usize| {
let range = &diagnostics[*index].snippet_buffer_row_range;
u32::abs_diff(cursor_buffer_row, range.start)
+ u32::abs_diff(cursor_buffer_row, range.end)
- });
+ };
+ // Only the closest `MAX_DIAGNOSTICS` are rendered below, so select that
+ // prefix instead of fully sorting every diagnostic.
+ if diagnostic_indices.len() > MAX_DIAGNOSTICS {
+ diagnostic_indices.select_nth_unstable_by_key(MAX_DIAGNOSTICS, &distance);
+ diagnostic_indices.truncate(MAX_DIAGNOSTICS);
+ }
+ diagnostic_indices.sort_unstable_by_key(&distance);
}
let mut output = format!("{}diagnostics\n", seed_coder::FILE_MARKER);
@@ -937,7 +946,7 @@ pub fn format_active_buffer_diagnostics_with_budget(
let mut used_tokens = header_tokens;
let mut included_diagnostics = 0;
- for diagnostic_index in diagnostic_indices.into_iter().take(10) {
+ for diagnostic_index in diagnostic_indices.into_iter().take(MAX_DIAGNOSTICS) {
let diagnostic = &diagnostics[diagnostic_index];
let snippet = clamp_text_to_token_count(&diagnostic.snippet, 256);