Fix a bunch of other low-hanging style lints (#36498)
- **Fix a bunch of low hanging style lints like unnecessary-return** - **Fix single worktree violation** - **And the rest** Release Notes: - N/A
This commit is contained in:
Piotr Osiewicz
GitHub
parent
df9c2aefb1
commit
05fc0c432c
239 changed files with 854 additions and 1015 deletions
|
|
@ -1146,13 +1146,13 @@ impl MultiBuffer {
|
|||
|
||||
pub fn last_transaction_id(&self, cx: &App) -> Option<TransactionId> {
|
||||
if let Some(buffer) = self.as_singleton() {
|
||||
return buffer
|
||||
buffer
|
||||
.read(cx)
|
||||
.peek_undo_stack()
|
||||
.map(|history_entry| history_entry.transaction_id());
|
||||
.map(|history_entry| history_entry.transaction_id())
|
||||
} else {
|
||||
let last_transaction = self.history.undo_stack.last()?;
|
||||
return Some(last_transaction.id);
|
||||
Some(last_transaction.id)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1725,7 +1725,7 @@ impl MultiBuffer {
|
|||
merged_ranges.push(range.clone());
|
||||
counts.push(1);
|
||||
}
|
||||
return (merged_ranges, counts);
|
||||
(merged_ranges, counts)
|
||||
}
|
||||
|
||||
fn update_path_excerpts(
|
||||
|
|
@ -2482,7 +2482,7 @@ impl MultiBuffer {
|
|||
let base_text_changed = snapshot
|
||||
.diffs
|
||||
.get(&buffer_id)
|
||||
.map_or(true, |old_diff| !new_diff.base_texts_eq(old_diff));
|
||||
.is_none_or(|old_diff| !new_diff.base_texts_eq(old_diff));
|
||||
|
||||
snapshot.diffs.insert(buffer_id, new_diff);
|
||||
|
||||
|
|
@ -2776,7 +2776,7 @@ impl MultiBuffer {
|
|||
if diff_hunk.excerpt_id.cmp(&end_excerpt_id, &snapshot).is_gt() {
|
||||
continue;
|
||||
}
|
||||
if last_hunk_row.map_or(false, |row| row >= diff_hunk.row_range.start) {
|
||||
if last_hunk_row.is_some_and(|row| row >= diff_hunk.row_range.start) {
|
||||
continue;
|
||||
}
|
||||
let start = Anchor::in_buffer(
|
||||
|
|
@ -3040,7 +3040,7 @@ impl MultiBuffer {
|
|||
is_dirty |= buffer.is_dirty();
|
||||
has_deleted_file |= buffer
|
||||
.file()
|
||||
.map_or(false, |file| file.disk_state() == DiskState::Deleted);
|
||||
.is_some_and(|file| file.disk_state() == DiskState::Deleted);
|
||||
has_conflict |= buffer.has_conflict();
|
||||
}
|
||||
if edited {
|
||||
|
|
@ -3198,9 +3198,10 @@ impl MultiBuffer {
|
|||
// If this is the last edit that intersects the current diff transform,
|
||||
// then recreate the content up to the end of this transform, to prepare
|
||||
// for reusing additional slices of the old transforms.
|
||||
if excerpt_edits.peek().map_or(true, |next_edit| {
|
||||
next_edit.old.start >= old_diff_transforms.end().0
|
||||
}) {
|
||||
if excerpt_edits
|
||||
.peek()
|
||||
.is_none_or(|next_edit| next_edit.old.start >= old_diff_transforms.end().0)
|
||||
{
|
||||
let keep_next_old_transform = (old_diff_transforms.start().0 >= edit.old.end)
|
||||
&& match old_diff_transforms.item() {
|
||||
Some(DiffTransform::BufferContent {
|
||||
|
|
@ -3595,7 +3596,7 @@ impl MultiBuffer {
|
|||
let mut edits: Vec<(Range<usize>, Arc<str>)> = Vec::new();
|
||||
let mut last_end = None;
|
||||
for _ in 0..edit_count {
|
||||
if last_end.map_or(false, |last_end| last_end >= snapshot.len()) {
|
||||
if last_end.is_some_and(|last_end| last_end >= snapshot.len()) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -4649,7 +4650,7 @@ impl MultiBufferSnapshot {
|
|||
return true;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
true
|
||||
}
|
||||
|
||||
pub fn prev_non_blank_row(&self, mut row: MultiBufferRow) -> Option<MultiBufferRow> {
|
||||
|
|
@ -4954,7 +4955,7 @@ impl MultiBufferSnapshot {
|
|||
while let Some(replacement) = self.replaced_excerpts.get(&excerpt_id) {
|
||||
excerpt_id = *replacement;
|
||||
}
|
||||
return excerpt_id;
|
||||
excerpt_id
|
||||
}
|
||||
|
||||
pub fn summaries_for_anchors<'a, D, I>(&'a self, anchors: I) -> Vec<D>
|
||||
|
|
@ -5072,9 +5073,9 @@ impl MultiBufferSnapshot {
|
|||
if point == region.range.end.key && region.has_trailing_newline {
|
||||
position.add_assign(&D::from_text_summary(&TextSummary::newline()));
|
||||
}
|
||||
return Some(position);
|
||||
Some(position)
|
||||
} else {
|
||||
return Some(D::from_text_summary(&self.text_summary()));
|
||||
Some(D::from_text_summary(&self.text_summary()))
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -5114,7 +5115,7 @@ impl MultiBufferSnapshot {
|
|||
// Leave min and max anchors unchanged if invalid or
|
||||
// if the old excerpt still exists at this location
|
||||
let mut kept_position = next_excerpt
|
||||
.map_or(false, |e| e.id == old_excerpt_id && e.contains(&anchor))
|
||||
.is_some_and(|e| e.id == old_excerpt_id && e.contains(&anchor))
|
||||
|| old_excerpt_id == ExcerptId::max()
|
||||
|| old_excerpt_id == ExcerptId::min();
|
||||
|
||||
|
|
@ -5482,7 +5483,7 @@ impl MultiBufferSnapshot {
|
|||
let range_filter = |open: Range<usize>, close: Range<usize>| -> bool {
|
||||
excerpt_buffer_range.contains(&open.start)
|
||||
&& excerpt_buffer_range.contains(&close.end)
|
||||
&& range_filter.map_or(true, |filter| filter(buffer, open, close))
|
||||
&& range_filter.is_none_or(|filter| filter(buffer, open, close))
|
||||
};
|
||||
|
||||
let (open, close) = excerpt.buffer().innermost_enclosing_bracket_ranges(
|
||||
|
|
@ -5642,10 +5643,10 @@ impl MultiBufferSnapshot {
|
|||
.buffer
|
||||
.line_indents_in_row_range(buffer_start_row..buffer_end_row);
|
||||
cursor.next();
|
||||
return Some(line_indents.map(move |(buffer_row, indent)| {
|
||||
Some(line_indents.map(move |(buffer_row, indent)| {
|
||||
let row = region.range.start.row + (buffer_row - region.buffer_range.start.row);
|
||||
(MultiBufferRow(row), indent, ®ion.excerpt.buffer)
|
||||
}));
|
||||
}))
|
||||
})
|
||||
.flatten()
|
||||
}
|
||||
|
|
@ -5682,10 +5683,10 @@ impl MultiBufferSnapshot {
|
|||
.buffer
|
||||
.reversed_line_indents_in_row_range(buffer_start_row..buffer_end_row);
|
||||
cursor.prev();
|
||||
return Some(line_indents.map(move |(buffer_row, indent)| {
|
||||
Some(line_indents.map(move |(buffer_row, indent)| {
|
||||
let row = region.range.start.row + (buffer_row - region.buffer_range.start.row);
|
||||
(MultiBufferRow(row), indent, ®ion.excerpt.buffer)
|
||||
}));
|
||||
}))
|
||||
})
|
||||
.flatten()
|
||||
}
|
||||
|
|
@ -6545,7 +6546,7 @@ where
|
|||
&& self
|
||||
.excerpts
|
||||
.item()
|
||||
.map_or(false, |excerpt| excerpt.id != hunk_info.excerpt_id)
|
||||
.is_some_and(|excerpt| excerpt.id != hunk_info.excerpt_id)
|
||||
{
|
||||
self.excerpts.next();
|
||||
}
|
||||
|
|
@ -6592,7 +6593,7 @@ where
|
|||
let prev_transform = self.diff_transforms.item();
|
||||
self.diff_transforms.next();
|
||||
|
||||
prev_transform.map_or(true, |next_transform| {
|
||||
prev_transform.is_none_or(|next_transform| {
|
||||
matches!(next_transform, DiffTransform::BufferContent { .. })
|
||||
})
|
||||
}
|
||||
|
|
@ -6607,12 +6608,12 @@ where
|
|||
}
|
||||
|
||||
let next_transform = self.diff_transforms.next_item();
|
||||
next_transform.map_or(true, |next_transform| match next_transform {
|
||||
next_transform.is_none_or(|next_transform| match next_transform {
|
||||
DiffTransform::BufferContent { .. } => true,
|
||||
DiffTransform::DeletedHunk { hunk_info, .. } => self
|
||||
.excerpts
|
||||
.item()
|
||||
.map_or(false, |excerpt| excerpt.id != hunk_info.excerpt_id),
|
||||
.is_some_and(|excerpt| excerpt.id != hunk_info.excerpt_id),
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -6645,7 +6646,7 @@ where
|
|||
buffer_end.add_assign(&buffer_range_len);
|
||||
let start = self.diff_transforms.start().output_dimension.0;
|
||||
let end = self.diff_transforms.end().output_dimension.0;
|
||||
return Some(MultiBufferRegion {
|
||||
Some(MultiBufferRegion {
|
||||
buffer,
|
||||
excerpt,
|
||||
has_trailing_newline: *has_trailing_newline,
|
||||
|
|
@ -6655,7 +6656,7 @@ where
|
|||
)),
|
||||
buffer_range: buffer_start..buffer_end,
|
||||
range: start..end,
|
||||
});
|
||||
})
|
||||
}
|
||||
DiffTransform::BufferContent {
|
||||
inserted_hunk_info, ..
|
||||
|
|
@ -7493,61 +7494,59 @@ impl Iterator for MultiBufferRows<'_> {
|
|||
self.cursor.next();
|
||||
if let Some(next_region) = self.cursor.region() {
|
||||
region = next_region;
|
||||
} else {
|
||||
if self.point == self.cursor.diff_transforms.end().output_dimension.0 {
|
||||
let multibuffer_row = MultiBufferRow(self.point.row);
|
||||
let last_excerpt = self
|
||||
.cursor
|
||||
.excerpts
|
||||
.item()
|
||||
.or(self.cursor.excerpts.prev_item())?;
|
||||
let last_row = last_excerpt
|
||||
.range
|
||||
.context
|
||||
.end
|
||||
.to_point(&last_excerpt.buffer)
|
||||
.row;
|
||||
} else if self.point == self.cursor.diff_transforms.end().output_dimension.0 {
|
||||
let multibuffer_row = MultiBufferRow(self.point.row);
|
||||
let last_excerpt = self
|
||||
.cursor
|
||||
.excerpts
|
||||
.item()
|
||||
.or(self.cursor.excerpts.prev_item())?;
|
||||
let last_row = last_excerpt
|
||||
.range
|
||||
.context
|
||||
.end
|
||||
.to_point(&last_excerpt.buffer)
|
||||
.row;
|
||||
|
||||
let first_row = last_excerpt
|
||||
.range
|
||||
.context
|
||||
.start
|
||||
.to_point(&last_excerpt.buffer)
|
||||
.row;
|
||||
let first_row = last_excerpt
|
||||
.range
|
||||
.context
|
||||
.start
|
||||
.to_point(&last_excerpt.buffer)
|
||||
.row;
|
||||
|
||||
let expand_info = if self.is_singleton {
|
||||
None
|
||||
} else {
|
||||
let needs_expand_up = first_row == last_row
|
||||
&& last_row > 0
|
||||
&& !region.diff_hunk_status.is_some_and(|d| d.is_deleted());
|
||||
let needs_expand_down = last_row < last_excerpt.buffer.max_point().row;
|
||||
|
||||
if needs_expand_up && needs_expand_down {
|
||||
Some(ExpandExcerptDirection::UpAndDown)
|
||||
} else if needs_expand_up {
|
||||
Some(ExpandExcerptDirection::Up)
|
||||
} else if needs_expand_down {
|
||||
Some(ExpandExcerptDirection::Down)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
.map(|direction| ExpandInfo {
|
||||
direction,
|
||||
excerpt_id: last_excerpt.id,
|
||||
})
|
||||
};
|
||||
self.point += Point::new(1, 0);
|
||||
return Some(RowInfo {
|
||||
buffer_id: Some(last_excerpt.buffer_id),
|
||||
buffer_row: Some(last_row),
|
||||
multibuffer_row: Some(multibuffer_row),
|
||||
diff_status: None,
|
||||
expand_info,
|
||||
});
|
||||
let expand_info = if self.is_singleton {
|
||||
None
|
||||
} else {
|
||||
return None;
|
||||
}
|
||||
let needs_expand_up = first_row == last_row
|
||||
&& last_row > 0
|
||||
&& !region.diff_hunk_status.is_some_and(|d| d.is_deleted());
|
||||
let needs_expand_down = last_row < last_excerpt.buffer.max_point().row;
|
||||
|
||||
if needs_expand_up && needs_expand_down {
|
||||
Some(ExpandExcerptDirection::UpAndDown)
|
||||
} else if needs_expand_up {
|
||||
Some(ExpandExcerptDirection::Up)
|
||||
} else if needs_expand_down {
|
||||
Some(ExpandExcerptDirection::Down)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
.map(|direction| ExpandInfo {
|
||||
direction,
|
||||
excerpt_id: last_excerpt.id,
|
||||
})
|
||||
};
|
||||
self.point += Point::new(1, 0);
|
||||
return Some(RowInfo {
|
||||
buffer_id: Some(last_excerpt.buffer_id),
|
||||
buffer_row: Some(last_row),
|
||||
multibuffer_row: Some(multibuffer_row),
|
||||
diff_status: None,
|
||||
expand_info,
|
||||
});
|
||||
} else {
|
||||
return None;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue