leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ingore clippy warnings about too many arguments

Browse source
This commit is contained in:
Chris Glass 2026-04-10 18:40:26 +02:00
parent eca9421e87
commit b654808734
2 changed files with 33 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/terminal.rs
View file

@ -264,6 +264,7 @@ pub struct Terminal {
impl Terminal { impl Terminal {
//TODO: error handling //TODO: error handling
#[allow(clippy::too_many_arguments)]
pub fn new( pub fn new(
pane: pane_grid::Pane, pane: pane_grid::Pane,
entity: segmented_button::Entity, entity: segmented_button::Entity,
@ -860,10 +861,11 @@ impl Terminal {
// Change color if selected // Change color if selected
if let Some(selection) = &term.selection if let Some(selection) = &term.selection
&& let Some(range) = selection.to_range(&term) && let Some(range) = selection.to_range(&term)
&& range.contains(indexed.point) { && range.contains(indexed.point)
//TODO: better handling of selection {
mem::swap(&mut fg, &mut bg); //TODO: better handling of selection
} mem::swap(&mut fg, &mut bg);
}
// Convert foreground to linear // Convert foreground to linear
attrs = attrs.color(fg); attrs = attrs.color(fg);
@ -877,9 +879,10 @@ impl Terminal {
let mut flags = indexed.cell.flags; let mut flags = indexed.cell.flags;
if let Some(active_match) = &self.active_regex_match if let Some(active_match) = &self.active_regex_match
&& active_match.contains(&indexed.point) { && active_match.contains(&indexed.point)
flags |= Flags::UNDERLINE; {
} flags |= Flags::UNDERLINE;
}
if let Some(active_id) = &self.active_hyperlink_id { if let Some(active_id) = &self.active_hyperlink_id {
let mut matches_active = indexed let mut matches_active = indexed
.cell .cell
@ -1191,9 +1194,9 @@ impl<'a, T> Iterator for HintPostProcessor<'a, T> {
&& let Some(rm) = self && let Some(rm) = self
.term .term
.regex_search_right(self.regex, self.start, self.end) .regex_search_right(self.regex, self.start, self.end)
{ {
self.next_processed_match(rm); self.next_processed_match(rm);
} }
Some(next_match) Some(next_match)
} }

36
src/terminal_box.rs
View file

@ -871,9 +871,10 @@ where
layout.bounds(), layout.bounds(),
self.padding, self.padding,
multiplier, multiplier,
) { )
shell.capture_event(); {
} shell.capture_event();
}
if state.autoscroll.is_active() { if state.autoscroll.is_active() {
shell.request_redraw(); shell.request_redraw();
} }
@ -1323,15 +1324,15 @@ where
last_side, last_side,
.. ..
} = dragging } = dragging
{
{ {
{ let mut term = terminal.term.lock();
let mut term = terminal.term.lock(); if let Some(selection) = &mut term.selection {
if let Some(selection) = &mut term.selection { selection.update(last_point, last_side);
selection.update(last_point, last_side);
}
} }
terminal.needs_update = true;
} }
terminal.needs_update = true;
}
if let Some(p) = cursor_position.position_in(layout.bounds()) { if let Some(p) = cursor_position.position_in(layout.bounds()) {
let x = p.x - self.padding.left; let x = p.x - self.padding.left;
let y = p.y - self.padding.top; let y = p.y - self.padding.top;
@ -1343,10 +1344,11 @@ where
.viewport_to_point(TermPoint::new(row as usize, TermColumn(col as usize))); .viewport_to_point(TermPoint::new(row as usize, TermColumn(col as usize)));
if state.modifiers.control() if state.modifiers.control()
&& let Some(on_open_hyperlink) = &self.on_open_hyperlink && let Some(on_open_hyperlink) = &self.on_open_hyperlink
&& let Some(hyperlink) = get_hyperlink(&terminal, location) { && let Some(hyperlink) = get_hyperlink(&terminal, location)
shell.publish(on_open_hyperlink(hyperlink)); {
shell.capture_event(); shell.publish(on_open_hyperlink(hyperlink));
} shell.capture_event();
}
if is_mouse_mode { if is_mouse_mode {
terminal.report_mouse( terminal.report_mouse(
@ -1651,9 +1653,10 @@ fn update_active_regex_match(
{ {
'update: { 'update: {
if let Some(active_match) = &terminal.active_regex_match if let Some(active_match) = &terminal.active_regex_match
&& active_match == match_ { && active_match == match_
break 'update; {
} break 'update;
}
terminal.active_regex_match = Some(match_.clone()); terminal.active_regex_match = Some(match_.clone());
terminal.needs_update = true; terminal.needs_update = true;
} }
@ -1713,6 +1716,7 @@ enum EdgeScrollDirection {
Bottom, Bottom,
} }
#[allow(clippy::too_many_arguments)]
fn edge_scroll_adjustment( fn edge_scroll_adjustment(
y: f32, y: f32,
buffer_height: f32, buffer_height: f32,