Auto-fix clippy::collapsible_if violations (#36428)
Release Notes: - N/A
This commit is contained in:
parent
9e8ec72bd5
commit
8f567383e4
281 changed files with 6628 additions and 7089 deletions
|
@ -1043,18 +1043,18 @@ impl ToolbarItemView for AgentDiffToolbar {
|
|||
return self.location(cx);
|
||||
}
|
||||
|
||||
if let Some(editor) = item.act_as::<Editor>(cx) {
|
||||
if editor.read(cx).mode().is_full() {
|
||||
let agent_diff = AgentDiff::global(cx);
|
||||
if let Some(editor) = item.act_as::<Editor>(cx)
|
||||
&& editor.read(cx).mode().is_full()
|
||||
{
|
||||
let agent_diff = AgentDiff::global(cx);
|
||||
|
||||
self.active_item = Some(AgentDiffToolbarItem::Editor {
|
||||
editor: editor.downgrade(),
|
||||
state: agent_diff.read(cx).editor_state(&editor.downgrade()),
|
||||
_diff_subscription: cx.observe(&agent_diff, Self::handle_diff_notify),
|
||||
});
|
||||
self.active_item = Some(AgentDiffToolbarItem::Editor {
|
||||
editor: editor.downgrade(),
|
||||
state: agent_diff.read(cx).editor_state(&editor.downgrade()),
|
||||
_diff_subscription: cx.observe(&agent_diff, Self::handle_diff_notify),
|
||||
});
|
||||
|
||||
return self.location(cx);
|
||||
}
|
||||
return self.location(cx);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1538,16 +1538,10 @@ impl AgentDiff {
|
|||
) {
|
||||
match event {
|
||||
workspace::Event::ItemAdded { item } => {
|
||||
if let Some(editor) = item.downcast::<Editor>() {
|
||||
if let Some(buffer) = Self::full_editor_buffer(editor.read(cx), cx) {
|
||||
self.register_editor(
|
||||
workspace.downgrade(),
|
||||
buffer.clone(),
|
||||
editor,
|
||||
window,
|
||||
cx,
|
||||
);
|
||||
}
|
||||
if let Some(editor) = item.downcast::<Editor>()
|
||||
&& let Some(buffer) = Self::full_editor_buffer(editor.read(cx), cx)
|
||||
{
|
||||
self.register_editor(workspace.downgrade(), buffer.clone(), editor, window, cx);
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
|
@ -1850,22 +1844,22 @@ impl AgentDiff {
|
|||
|
||||
let thread = thread.upgrade()?;
|
||||
|
||||
if let PostReviewState::AllReviewed = review(&editor, &thread, window, cx) {
|
||||
if let Some(curr_buffer) = editor.read(cx).buffer().read(cx).as_singleton() {
|
||||
let changed_buffers = thread.action_log(cx).read(cx).changed_buffers(cx);
|
||||
if let PostReviewState::AllReviewed = review(&editor, &thread, window, cx)
|
||||
&& let Some(curr_buffer) = editor.read(cx).buffer().read(cx).as_singleton()
|
||||
{
|
||||
let changed_buffers = thread.action_log(cx).read(cx).changed_buffers(cx);
|
||||
|
||||
let mut keys = changed_buffers.keys().cycle();
|
||||
keys.find(|k| *k == &curr_buffer);
|
||||
let next_project_path = keys
|
||||
.next()
|
||||
.filter(|k| *k != &curr_buffer)
|
||||
.and_then(|after| after.read(cx).project_path(cx));
|
||||
let mut keys = changed_buffers.keys().cycle();
|
||||
keys.find(|k| *k == &curr_buffer);
|
||||
let next_project_path = keys
|
||||
.next()
|
||||
.filter(|k| *k != &curr_buffer)
|
||||
.and_then(|after| after.read(cx).project_path(cx));
|
||||
|
||||
if let Some(path) = next_project_path {
|
||||
let task = workspace.open_path(path, None, true, window, cx);
|
||||
let task = cx.spawn(async move |_, _cx| task.await.map(|_| ()));
|
||||
return Some(task);
|
||||
}
|
||||
if let Some(path) = next_project_path {
|
||||
let task = workspace.open_path(path, None, true, window, cx);
|
||||
let task = cx.spawn(async move |_, _cx| task.await.map(|_| ()));
|
||||
return Some(task);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue