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.

Fix several small performance inefficiencies in hot paths (#61275)

Miguel Raz Guzmán Macedoac5538b72391
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index d5ca045a5df..71e9a50087a 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -7099,7 +7099,7 @@ impl LineWithInvisibles {
&Self::split_runs_by_bg_segments(&styles, segments, min_contrast, len)
};
let shaped_line = window.text_system().shape_line(
- line.clone().into(),
+ line.as_str().into(),
font_size,
text_runs,
None,
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index e233f393b29..9ac5396db77 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -2553,7 +2553,7 @@ impl MultiBuffer {
*non_text_state_update_count += 1;
}
- paths_to_edit.sort_unstable_by_key(|(path, _, _, _)| path.clone());
+ paths_to_edit.sort_unstable_by(|a, b| a.0.cmp(&b.0));
let mut edits = Vec::new();
let mut new_excerpts = SumTree::default();
diff --git a/crates/text/src/operation_queue.rs b/crates/text/src/operation_queue.rs
index f87af381ff3..21239456a38 100644
--- a/crates/text/src/operation_queue.rs
+++ b/crates/text/src/operation_queue.rs
@@ -47,7 +47,7 @@ impl<T: Operation> OperationQueue<T> {
}
pub fn insert(&mut self, mut ops: Vec<T>) {
- ops.sort_by_key(|op| op.lamport_timestamp());
+ ops.sort_unstable_by_key(|op| op.lamport_timestamp());
ops.dedup_by_key(|op| op.lamport_timestamp());
self.0.edit(
ops.into_iter()
diff --git a/crates/text/src/text.rs b/crates/text/src/text.rs
index b83875dbdb1..e15512f3e2d 100644
--- a/crates/text/src/text.rs
+++ b/crates/text/src/text.rs
@@ -3428,7 +3428,7 @@ impl ToOffset for usize {
impl ToOffset for Anchor {
#[inline]
fn to_offset(&self, snapshot: &BufferSnapshot) -> usize {
- snapshot.summary_for_anchor(self)
+ snapshot.offset_for_anchor(self)
}
}
@@ -3570,7 +3570,7 @@ impl FromAnchor for PointUtf16 {
impl FromAnchor for usize {
#[inline]
fn from_anchor(anchor: &Anchor, snapshot: &BufferSnapshot) -> Self {
- snapshot.summary_for_anchor(anchor)
+ snapshot.offset_for_anchor(anchor)
}
}
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index ed06ceba7d1..9ca1fa52abc 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -5402,13 +5402,12 @@ impl BackgroundScanner {
for entry in &mut new_entries {
state.reuse_entry_id(entry);
if entry.is_dir() {
- if self.should_scan_directory(&state, entry) {
- job_ix += 1;
- } else {
+ if !self.should_scan_directory(&state, entry) {
log::debug!("defer scanning directory {:?}", entry.path);
entry.kind = EntryKind::UnloadedDir;
- new_jobs.remove(job_ix);
+ new_jobs[job_ix] = None;
}
+ job_ix += 1;
}
if entry.is_always_included {
state