Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/editor/src/element.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion crates/multi_buffer/src/multi_buffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion crates/text/src/operation_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions crates/text/src/text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down Expand Up @@ -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)
}
}

Expand Down
7 changes: 3 additions & 4 deletions crates/worktree/src/worktree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading