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

Simplify the code

Browse source
This commit is contained in:
sxyazi 2025-10-20 14:36:34 +08:00
parent c72ea628bd
commit f7a9a1b871
No known key found for this signature in database
11 changed files with 65 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cspell.json
View file

@ -1 +1 @@
{"version":"0.2","flagWords":[],"language":"en","words":["Punct","KEYMAP","splitn","crossterm","YAZI","peekable","ratatui","syntect","pbpaste","pbcopy","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","Konsole","Überzug","pkgs","pdftoppm","poppler","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen","gethostname","fchmod","fdfind","Rustc","rustc","ffprobe","vframes","luma","obase","outln","errln","tmtheme","twox","cfgs","fstype","objc","rdev","runloop","exfat","rclone","DECRQSS","DECSCUSR","libvterm","Uninit","lockin","rposition","resvg","foldhash","tilded","futs","chdir","hashbrown","JEMALLOC","RUSTFLAGS","RDONLY","GETPATH","fcntl","casefold","inodes","Splatable"]}
{"language":"en","flagWords":[],"words":["Punct","KEYMAP","splitn","crossterm","YAZI","peekable","ratatui","syntect","pbpaste","pbcopy","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","Konsole","Überzug","pkgs","pdftoppm","poppler","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen","gethostname","fchmod","fdfind","Rustc","rustc","ffprobe","vframes","luma","obase","outln","errln","tmtheme","twox","cfgs","fstype","objc","rdev","runloop","exfat","rclone","DECRQSS","DECSCUSR","libvterm","Uninit","lockin","rposition","resvg","foldhash","tilded","futs","chdir","hashbrown","JEMALLOC","RUSTFLAGS","RDONLY","GETPATH","fcntl","casefold","inodes","Splatable","casefied"],"version":"0.2"}

8
yazi-config/preset/keymap-default.toml
View file

@ -301,10 +301,10 @@ keymap = [
{ on = "p", run = "paste", desc = "Paste copied characters after the cursor" },
{ on = "P", run = "paste --before", desc = "Paste copied characters before the cursor" },
# Undo/Redo/Change case
{ on = "u", run = [ "undo", "lowercase"], desc = "Undo the last operation or Lowercase selected characters" },
{ on = "<C-r>", run = "redo", desc = "Redo the last operation" },
{ on = "U", run = "uppercase", desc = "Uppercase selected characters" },
# Undo/Redo/Casefy
{ on = "u", run = [ "undo", "casefy lower" ], desc = "Undo, or lowercase if in visual mode" },
{ on = "U", run = "casefy upper", desc = "Uppercase" },
{ on = "<C-r>", run = "redo", desc = "Redo the last operation" },
# Help
{ on = "~", run = "help", desc = "Open help" },

25
yazi-parser/src/input/casefy.rs Normal file
View file

@ -0,0 +1,25 @@
use mlua::{ExternalError, FromLua, IntoLua, Lua, Value};
use yazi_shared::event::CmdCow;
#[derive(Debug)]
pub struct CasefyOpt {
pub upper: bool,
}
impl From<CmdCow> for CasefyOpt {
fn from(c: CmdCow) -> Self { Self { upper: c.str(0) == "upper" } }
}
impl FromLua for CasefyOpt {
fn from_lua(_: Value, _: &Lua) -> mlua::Result<Self> { Err("unsupported".into_lua_err()) }
}
impl IntoLua for CasefyOpt {
fn into_lua(self, _: &Lua) -> mlua::Result<Value> { Err("unsupported".into_lua_err()) }
}
impl CasefyOpt {
pub fn transform(&self, s: &str) -> String {
if self.upper { s.to_ascii_uppercase() } else { s.to_ascii_lowercase() }
}
}

2
yazi-parser/src/input/mod.rs
View file

@ -1 +1 @@
yazi_macro::mod_flat!(backspace backward close complete delete forward insert kill paste r#move show);
yazi_macro::mod_flat!(backspace backward casefy close complete delete forward insert kill paste r#move show);

24
yazi-widgets/src/input/commands/case.rs
View file

@ -1,24 +0,0 @@
use anyhow::Result;
use yazi_macro::{act, render, succ};
use yazi_parser::VoidOpt;
use yazi_shared::data::Data;
use crate::input::{Input, op::InputOp};
impl Input {
pub fn uppercase(&mut self, _: VoidOpt) -> Result<Data> { self.apply_case(true) }
pub fn lowercase(&mut self, _: VoidOpt) -> Result<Data> { self.apply_case(false) }
fn apply_case(&mut self, uppercase: bool) -> Result<Data> {
match self.snap().op {
InputOp::Select(start) => {
self.snap_mut().op = InputOp::Case(uppercase, start);
render!(self.handle_op(self.snap().cursor, true));
act!(r#move, self)?;
}
_ => {}
}
succ!();
}
}

31
yazi-widgets/src/input/commands/casefy.rs Normal file
View file

@ -0,0 +1,31 @@
use std::ops::Range;
use anyhow::Result;
use yazi_macro::{act, render, succ};
use yazi_parser::input::CasefyOpt;
use yazi_shared::data::Data;
use crate::input::{Input, op::InputOp};
impl Input {
pub fn casefy(&mut self, opt: CasefyOpt) -> Result<Data> {
let snap = self.snap_mut();
if !matches!(snap.op, InputOp::Select(_)) {
succ!();
}
let range = snap.op.range(snap.cursor, true).unwrap();
let Range { start, end } = snap.idx(range.start)..snap.idx(range.end);
let (start, end) = (start.unwrap(), end.unwrap());
let casefied = opt.transform(&snap.value[start..end]);
snap.value.replace_range(start..end, &casefied);
snap.op = InputOp::None;
snap.cursor = range.start;
self.snaps.tag(self.limit).then(|| self.flush_value());
act!(r#move, self)?;
succ!(render!());
}
}

3
yazi-widgets/src/input/commands/commands.rs
View file

@ -36,8 +36,7 @@ impl Input {
on!(undo);
on!(redo);
on!(uppercase);
on!(lowercase);
on!(casefy);
}
InputMode::Insert => {
on!(visual);

2
yazi-widgets/src/input/commands/mod.rs
View file

@ -1 +1 @@
yazi_macro::mod_flat!(backspace backward commands complete delete escape forward insert kill paste r#move r#type redo replace undo visual yank case);
yazi_macro::mod_flat!(backspace backward casefy commands complete delete escape forward insert kill paste r#move r#type redo replace undo visual yank);

2
yazi-widgets/src/input/commands/undo.rs
View file

@ -7,7 +7,7 @@ use crate::input::{Input, InputMode, InputOp};
impl Input {
pub fn undo(&mut self, _: VoidOpt) -> Result<Data> {
if let InputOp::Select(_) = self.snap().op {
if self.snap().op != InputOp::None {
succ!();
}

14
yazi-widgets/src/input/input.rs
View file

@ -50,20 +50,6 @@ impl Input {
snap.op = InputOp::None;
futures::executor::block_on(CLIPBOARD.set(yanked));
}
InputOp::Case(upper, _) => {
let range = snap.op.range(cursor, include).unwrap();
let Range { start, end } = snap.idx(range.start)..snap.idx(range.end);
if let (Some(start), Some(end)) = (start, end) {
let selected = &snap.value[start..end];
let replaced = if upper { selected.to_uppercase() } else { selected.to_lowercase() };
snap.value.replace_range(start..end, &replaced);
}
snap.op = InputOp::None;
snap.mode = InputMode::Normal;
snap.cursor = range.start;
}
};
snap.cursor = snap.count().saturating_sub(snap.mode.delta()).min(snap.cursor);

2
yazi-widgets/src/input/op.rs
View file

@ -7,7 +7,6 @@ pub enum InputOp {
Select(usize),
Delete(bool, bool, usize), // cut, insert, start
Yank(usize),
Case(bool, usize), // upper, start
}
impl InputOp {
@ -18,7 +17,6 @@ impl InputOp {
Self::Select(s) => Some(*s),
Self::Delete(.., s) => Some(*s),
Self::Yank(s) => Some(*s),
Self::Case(.., s) => Some(*s),
}
}