mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Reformat

Browse source
This commit is contained in:
Carlos de Paula 2026-01-05 15:58:03 -03:00
parent 367f124855
commit 87225ffa37
No known key found for this signature in database
4 changed files with 98 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
yazi-config/src/theme/theme.rs
View file

@ -253,19 +253,11 @@ impl Theme {
}
impl App {
pub fn bg_color(&self) -> String {
self.overall.bg.map(|c| c.to_string()).unwrap_or_default()
}
pub fn bg_color(&self) -> String { self.overall.bg.map(|c| c.to_string()).unwrap_or_default() }
pub fn parent_bg(&self) -> String {
self.parent.bg.map(|c| c.to_string()).unwrap_or_default()
}
pub fn parent_bg(&self) -> String { self.parent.bg.map(|c| c.to_string()).unwrap_or_default() }
pub fn current_bg(&self) -> String {
self.current.bg.map(|c| c.to_string()).unwrap_or_default()
}
pub fn current_bg(&self) -> String { self.current.bg.map(|c| c.to_string()).unwrap_or_default() }
pub fn preview_bg(&self) -> String {
self.preview.bg.map(|c| c.to_string()).unwrap_or_default()
}
pub fn preview_bg(&self) -> String { self.preview.bg.map(|c| c.to_string()).unwrap_or_default() }
}

10
yazi-fm/src/root.rs
View file

@ -1,9 +1,5 @@
use mlua::{ObjectLike, Table};
use ratatui::{
buffer::Buffer,
layout::{Constraint, Direction, Layout, Rect},
widgets::Widget,
};
use ratatui::{buffer::Buffer, layout::{Constraint, Direction, Layout, Rect}, widgets::Widget};
use tracing::error;
use yazi_binding::elements::render_once;
use yazi_config::{THEME, YAZI};
@ -17,9 +13,7 @@ pub(super) struct Root<'a> {
}
impl<'a> Root<'a> {
pub(super) fn new(core: &'a Core) -> Self {
Self { core }
}
pub(super) fn new(core: &'a Core) -> Self { Self { core } }
pub(super) fn reflow(area: Rect) -> mlua::Result<Table> {
let area = yazi_binding::elements::Rect::from(area);

34
yazi-fm/src/term.rs
View file

@ -1,24 +1,8 @@
use std::{
io,
ops::{Deref, DerefMut},
sync::atomic::{AtomicBool, Ordering},
};
use std::{io, ops::{Deref, DerefMut}, sync::atomic::{AtomicBool, Ordering}};
use anyhow::Result;
use crossterm::{
event::{
DisableBracketedPaste, DisableMouseCapture, EnableBracketedPaste, EnableMouseCapture,
KeyboardEnhancementFlags, PopKeyboardEnhancementFlags, PushKeyboardEnhancementFlags,
},
execute, queue,
style::Print,
terminal::{
EnterAlternateScreen, LeaveAlternateScreen, SetTitle, disable_raw_mode, enable_raw_mode,
},
};
use ratatui::{
CompletedFrame, Frame, Terminal, backend::CrosstermBackend, buffer::Buffer, layout::Rect,
};
use crossterm::{event::{DisableBracketedPaste, DisableMouseCapture, EnableBracketedPaste, EnableMouseCapture, KeyboardEnhancementFlags, PopKeyboardEnhancementFlags, PushKeyboardEnhancementFlags}, execute, queue, style::Print, terminal::{EnterAlternateScreen, LeaveAlternateScreen, SetTitle, disable_raw_mode, enable_raw_mode}};
use ratatui::{CompletedFrame, Frame, Terminal, backend::CrosstermBackend, buffer::Buffer, layout::Rect};
use yazi_adapter::{Emulator, Mux, TMUX};
use yazi_config::{THEME, YAZI};
use yazi_shared::SyncCell;
@ -165,21 +149,15 @@ impl Term {
}
impl Drop for Term {
fn drop(&mut self) {
self.stop().ok();
}
fn drop(&mut self) { self.stop().ok(); }
}
impl Deref for Term {
type Target = Terminal<CrosstermBackend<TtyWriter<'static>>>;
fn deref(&self) -> &Self::Target {
&self.inner
}
fn deref(&self) -> &Self::Target { &self.inner }
}
impl DerefMut for Term {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.inner
}
fn deref_mut(&mut self) -> &mut Self::Target { &mut self.inner }
}

64
yazi-plugin/src/theme/theme.rs
View file

@ -25,9 +25,7 @@ pub fn compose() -> Composer<ComposerGet, ComposerSet> {
.into_lua(lua)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -44,9 +42,7 @@ fn app() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -94,9 +90,7 @@ fn mgr() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -125,9 +119,7 @@ fn tabs() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -149,9 +141,7 @@ fn mode() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -174,9 +164,7 @@ fn indicator() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -213,9 +201,7 @@ fn status() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -237,9 +223,7 @@ fn which() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -266,9 +250,7 @@ fn confirm() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -287,9 +269,7 @@ fn spot() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -310,9 +290,7 @@ fn notify() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -329,9 +307,7 @@ fn pick() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -349,9 +325,7 @@ fn input() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -372,9 +346,7 @@ fn cmp() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -391,9 +363,7 @@ fn tasks() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}
@ -413,9 +383,7 @@ fn help() -> Composer<ComposerGet, ComposerSet> {
}
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> {
Ok(value)
}
fn set(_: &Lua, _: &[u8], value: Value) -> mlua::Result<Value> { Ok(value) }
Composer::new(get, set)
}