Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Fix several style lints (#17488)

Browse source 
It's not comprehensive enough to start linting on `style` group, but
hey, it's a start.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-09-06 11:58:39 +02:00 • committed by GitHub
parent 93249fc82b
commit e6c1c51b37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
361 changed files with 3530 additions and 3587 deletions
Download patch file Download diff file Expand all files Collapse all files

37
crates/terminal_view/src/terminal_element.rs
View file

@ -269,7 +269,7 @@ impl TerminalElement {
cur_rect = Some(LayoutRect::new(
AlacPoint::new(line_index as i32, cell.point.column.0 as i32),
1,
convert_color(&bg, &theme),
convert_color(&bg, theme),
));
}
}
@ -344,7 +344,7 @@ impl TerminalElement {
hyperlink: Option<(HighlightStyle, &RangeInclusive<AlacPoint>)>,
) -> TextRun {
let flags = indexed.cell.flags;
let mut fg = convert_color(&fg, &colors);
let mut fg = convert_color(&fg, colors);
// Ghostty uses (175/255) as the multiplier (~0.69), Alacritty uses 0.66, Kitty
// uses 0.75. We're using 0.7 because it's pretty well in the middle of that.
@ -439,7 +439,7 @@ impl TerminalElement {
move |e, cx| {
cx.focus(&focus);
terminal.update(cx, |terminal, cx| {
terminal.mouse_down(&e, origin, cx);
terminal.mouse_down(e, origin, cx);
cx.notify();
})
}
@ -460,18 +460,16 @@ impl TerminalElement {
if terminal.selection_started() {
terminal.mouse_drag(e, origin, hitbox.bounds);
cx.notify();
} else {
if hovered {
terminal.mouse_drag(e, origin, hitbox.bounds);
cx.notify();
}
} else if hovered {
terminal.mouse_drag(e, origin, hitbox.bounds);
cx.notify();
}
})
}
if hitbox.is_hovered(cx) {
terminal.update(cx, |terminal, cx| {
terminal.mouse_move(&e, origin);
terminal.mouse_move(e, origin);
cx.notify();
})
}
@ -485,7 +483,7 @@ impl TerminalElement {
origin,
focus.clone(),
move |terminal, origin, e, cx| {
terminal.mouse_up(&e, origin, cx);
terminal.mouse_up(e, origin, cx);
},
),
);
@ -496,7 +494,7 @@ impl TerminalElement {
origin,
focus.clone(),
move |terminal, origin, e, cx| {
terminal.mouse_down(&e, origin, cx);
terminal.mouse_down(e, origin, cx);
},
),
);
@ -522,7 +520,7 @@ impl TerminalElement {
origin,
focus.clone(),
move |terminal, origin, e, cx| {
terminal.mouse_down(&e, origin, cx);
terminal.mouse_down(e, origin, cx);
},
),
);
@ -533,7 +531,7 @@ impl TerminalElement {
origin,
focus.clone(),
move |terminal, origin, e, cx| {
terminal.mouse_up(&e, origin, cx);
terminal.mouse_up(e, origin, cx);
},
),
);
@ -544,7 +542,7 @@ impl TerminalElement {
origin,
focus,
move |terminal, origin, e, cx| {
terminal.mouse_up(&e, origin, cx);
terminal.mouse_up(e, origin, cx);
},
),
);
@ -591,9 +589,8 @@ impl Element for TerminalElement {
style.size.width = relative(1.).into();
style.size.height = relative(1.).into();
// style.overflow = point(Overflow::Hidden, Overflow::Hidden);
let layout_id = cx.request_layout(style, None);
layout_id
cx.request_layout(style, None)
});
(layout_id, ())
}
@ -625,7 +622,7 @@ impl Element for TerminalElement {
.font_fallbacks
.as_ref()
.or(settings.buffer_font.fallbacks.as_ref())
.map(|fallbacks| fallbacks.clone());
.cloned();
let font_features = terminal_settings
.font_features
@ -758,7 +755,7 @@ impl Element for TerminalElement {
let (cells, rects) = TerminalElement::layout_grid(
cells.iter().cloned(),
&text_style,
&cx.text_system(),
cx.text_system(),
last_hovered_word
.as_ref()
.map(|last_hovered_word| (link_style, &last_hovered_word.word_match)),
@ -926,7 +923,7 @@ impl Element for TerminalElement {
layout.relative_highlighted_ranges.iter()
{
if let Some((start_y, highlighted_range_lines)) =
to_highlighted_range_lines(relative_highlighted_range, &layout, origin)
to_highlighted_range_lines(relative_highlighted_range, layout, origin)
{
let hr = HighlightedRange {
start_y,
@ -1069,7 +1066,7 @@ pub fn is_blank(cell: &IndexedCell) -> bool {
return false;
}
return true;
true
}
fn to_highlighted_range_lines(