refactor: derive the Into<Opt> trait with procedural macros to avoi…

…d bloat (#1742)
sxyazi · Oct 7, 2024 · 0645176 · 0645176
1 parent dcbe787
commit 0645176
Show file tree

Hide file tree

Showing 61 changed files with 360 additions and 266 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/yazi-core/Cargo.toml b/yazi-core/Cargo.toml
@@ -14,6 +14,7 @@ yazi-boot = { path = "../yazi-boot", version = "0.3.3" }
 yazi-config = { path = "../yazi-config", version = "0.3.3" }
 yazi-dds = { path = "../yazi-dds", version = "0.3.3" }
 yazi-fs = { path = "../yazi-fs", version = "0.3.3" }
+yazi-macro = { path = "../yazi-macro", version = "0.3.3" }
 yazi-plugin = { path = "../yazi-plugin", version = "0.3.3" }
 yazi-proxy = { path = "../yazi-proxy", version = "0.3.3" }
 yazi-scheduler = { path = "../yazi-scheduler", version = "0.3.3" }

diff --git a/yazi-core/src/completion/commands/arrow.rs b/yazi-core/src/completion/commands/arrow.rs
@@ -11,6 +11,15 @@ impl From<Cmd> for Opt {
 }
 
 impl Completion {
+ #[yazi_macro::command]
+ pub fn arrow(&mut self, opt: Opt) {
+ if opt.step > 0 {
+ self.next(opt.step as usize);
+ } else {
+ self.prev(opt.step.unsigned_abs());
+ }
+ }
+
  fn next(&mut self, step: usize) {
  let len = self.cands.len();
  if len == 0 {
@@ -38,13 +47,4 @@ impl Completion {
 
  render!(old != self.cursor);
  }
-
- pub fn arrow(&mut self, opt: impl Into<Opt>) {
- let opt = opt.into() as Opt;
- if opt.step > 0 {
- self.next(opt.step as usize);
- } else {
- self.prev(opt.step.unsigned_abs());
- }
- }
 }
diff --git a/yazi-core/src/completion/commands/close.rs b/yazi-core/src/completion/commands/close.rs
@@ -15,9 +15,8 @@ impl From<bool> for Opt {
 }
 
 impl Completion {
- pub fn close(&mut self, opt: impl Into<Opt>) {
- let opt = opt.into() as Opt;
-
+ #[yazi_macro::command]
+ pub fn close(&mut self, opt: Opt) {
  if let Some(s) = self.selected().filter(|_| opt.submit) {
  InputProxy::complete(s, self.ticket);
  }

diff --git a/yazi-core/src/completion/commands/show.rs b/yazi-core/src/completion/commands/show.rs
@@ -25,6 +25,31 @@ impl From<Cmd> for Opt {
 }
 
 impl Completion {
+ #[yazi_macro::command]
+ pub fn show(&mut self, opt: Opt) {
+ if self.ticket != opt.ticket {
+ return;
+ }
+
+ if !opt.cache.is_empty() {
+ self.caches.insert(opt.cache_name.to_owned(), opt.cache);
+ }
+ let Some(cache) = self.caches.get(&opt.cache_name) else {
+ return;
+ };
+
+ self.ticket = opt.ticket;
+ self.cands = Self::match_candidates(&opt.word, cache);
+ if self.cands.is_empty() {
+ return render!(mem::replace(&mut self.visible, false));
+ }
+
+ self.offset = 0;
+ self.cursor = 0;
+ self.visible = true;
+ render!();
+ }
+
  fn match_candidates(word: &str, cache: &[String]) -> Vec<String> {
  let smart = !word.bytes().any(|c| c.is_ascii_uppercase());
 
@@ -55,29 +80,4 @@ impl Completion {
  }
  prefixed.into_iter().map(ToOwned::to_owned).collect()
  }
-
- pub fn show(&mut self, opt: impl Into<Opt>) {
- let opt = opt.into() as Opt;
- if self.ticket != opt.ticket {
- return;
- }
-
- if !opt.cache.is_empty() {
- self.caches.insert(opt.cache_name.to_owned(), opt.cache);
- }
- let Some(cache) = self.caches.get(&opt.cache_name) else {
- return;
- };
-
- self.ticket = opt.ticket;
- self.cands = Self::match_candidates(&opt.word, cache);
- if self.cands.is_empty() {
- return render!(mem::replace(&mut self.visible, false));
- }
-
- self.offset = 0;
- self.cursor = 0;
- self.visible = true;
- render!();
- }
 }
diff --git a/yazi-core/src/completion/commands/trigger.rs b/yazi-core/src/completion/commands/trigger.rs
@@ -26,8 +26,8 @@ impl From<Cmd> for Opt {
 }
 
 impl Completion {
- pub fn trigger(&mut self, opt: impl Into<Opt>) {
-  let opt = opt.into() as Opt;
+ #[yazi_macro::command]
+ pub fn trigger(&mut self, opt: Opt) {
  if opt.ticket < self.ticket {
  return;
  }

diff --git a/yazi-core/src/confirm/commands/arrow.rs b/yazi-core/src/confirm/commands/arrow.rs
@@ -11,6 +11,15 @@ impl From<Cmd> for Opt {
 }
 
 impl Confirm {
+ #[yazi_macro::command]
+ pub fn arrow(&mut self, opt: Opt, manager: &Manager) {
+ if opt.step > 0 {
+ self.next(opt.step as usize, manager.area(self.position).width)
+ } else {
+ self.prev(opt.step.unsigned_abs())
+ }
+ }
+
  fn next(&mut self, step: usize, width: u16) {
  let height = self.list.line_count(width);
  if height == 0 {
@@ -29,13 +38,4 @@ impl Confirm {
 
  render!(old != self.offset);
  }
-
- pub fn arrow(&mut self, opt: impl Into<Opt>, manager: &Manager) {
- let opt = opt.into() as Opt;
- if opt.step > 0 {
- self.next(opt.step as usize, manager.area(self.position).width)
- } else {
- self.prev(opt.step.unsigned_abs())
- }
- }
 }
diff --git a/yazi-core/src/confirm/commands/close.rs b/yazi-core/src/confirm/commands/close.rs
@@ -14,8 +14,8 @@ impl From<bool> for Opt {
 }
 
 impl Confirm {
- pub fn close(&mut self, opt: impl Into<Opt>) {
-  let opt = opt.into() as Opt;
+ #[yazi_macro::command]
+ pub fn close(&mut self, opt: Opt) {
  if let Some(cb) = self.callback.take() {
  _ = cb.send(opt.submit);
  }

diff --git a/yazi-core/src/help/commands/arrow.rs b/yazi-core/src/help/commands/arrow.rs
@@ -14,13 +14,12 @@ impl From<isize> for Opt {
 }
 
 impl Help {
- #[inline]
- pub fn arrow(&mut self, opt: impl Into<Opt>) {
+ #[yazi_macro::command]
+ pub fn arrow(&mut self, opt: Opt) {
  let max = self.bindings.len().saturating_sub(1);
  self.offset = self.offset.min(max);
  self.cursor = self.cursor.min(max);
 
- let opt = opt.into() as Opt;
  if opt.step > 0 {
  self.next(opt.step as usize);
  } else {

diff --git a/yazi-core/src/input/commands/backspace.rs b/yazi-core/src/input/commands/backspace.rs
@@ -14,9 +14,9 @@ impl From<bool> for Opt {
 }
 
 impl Input {
- pub fn backspace(&mut self, opt: impl Into<Opt>) {
+ #[yazi_macro::command]
+ pub fn backspace(&mut self, opt: Opt) {
  let snap = self.snaps.current_mut();
- let opt = opt.into() as Opt;
  if !opt.under && snap.cursor < 1 {
  return;
  } else if opt.under && snap.cursor >= snap.value.len() {

diff --git a/yazi-core/src/input/commands/close.rs b/yazi-core/src/input/commands/close.rs
@@ -15,9 +15,8 @@ impl From<bool> for Opt {
 }
 
 impl Input {
- pub fn close(&mut self, opt: impl Into<Opt>) {
- let opt = opt.into() as Opt;
-
+ #[yazi_macro::command]
+ pub fn close(&mut self, opt: Opt) {
  if self.completion {
  CompletionProxy::close();
  }

diff --git a/yazi-core/src/input/commands/complete.rs b/yazi-core/src/input/commands/complete.rs
@@ -25,8 +25,8 @@ impl From<Cmd> for Opt {
 }
 
 impl Input {
- pub fn complete(&mut self, opt: impl Into<Opt>) {
-  let opt = opt.into() as Opt;
+ #[yazi_macro::command]
+ pub fn complete(&mut self, opt: Opt) {
  if self.ticket != opt.ticket {
  return;
  }

diff --git a/yazi-core/src/input/commands/delete.rs b/yazi-core/src/input/commands/delete.rs
@@ -12,8 +12,8 @@ impl From<Cmd> for Opt {
 }
 
 impl Input {
- pub fn delete(&mut self, opt: impl Into<Opt>) {
-  let opt = opt.into() as Opt;
+ #[yazi_macro::command]
+ pub fn delete(&mut self, opt: Opt) {
  match self.snap().op {
  InputOp::None => {
  self.snap_mut().op = InputOp::Delete(opt.cut, opt.insert, self.snap().cursor);

diff --git a/yazi-core/src/input/commands/escape.rs b/yazi-core/src/input/commands/escape.rs
@@ -13,7 +13,8 @@ impl From<()> for Opt {
 }
 
 impl Input {
- pub fn escape(&mut self, _: impl Into<Opt>) {
+ #[yazi_macro::command]
+ pub fn escape(&mut self, _: Opt) {
  let snap = self.snap_mut();
  match snap.mode {
  InputMode::Normal if snap.op == InputOp::None => {

diff --git a/yazi-core/src/input/commands/forward.rs b/yazi-core/src/input/commands/forward.rs
@@ -11,8 +11,8 @@ impl From<Cmd> for Opt {
 }
 
 impl Input {
- pub fn forward(&mut self, opt: impl Into<Opt>) {
-  let opt = opt.into() as Opt;
+ #[yazi_macro::command]
+ pub fn forward(&mut self, opt: Opt) {
  let snap = self.snap();
 
  let mut it = snap.value.chars().skip(snap.cursor).enumerate();

diff --git a/yazi-core/src/input/commands/insert.rs b/yazi-core/src/input/commands/insert.rs
@@ -14,7 +14,8 @@ impl From<bool> for Opt {
 }
 
 impl Input {
- pub fn insert(&mut self, opt: impl Into<Opt>) {
+ #[yazi_macro::command]
+ pub fn insert(&mut self, opt: Opt) {
  let snap = self.snap_mut();
  if snap.mode == InputMode::Normal {
  snap.op = InputOp::None;
@@ -23,7 +24,6 @@ impl Input {
  return;
  }
 
- let opt = opt.into() as Opt;
  if opt.append {
  self.move_(1);
  }

diff --git a/yazi-core/src/input/commands/kill.rs b/yazi-core/src/input/commands/kill.rs
@@ -13,6 +13,33 @@ impl From<Cmd> for Opt {
 }
 
 impl Input {
+ #[yazi_macro::command]
+ pub fn kill(&mut self, opt: Opt) {
+ let snap = self.snap_mut();
+ match opt.kind.as_str() {
+ "all" => self.kill_range(..),
+ "bol" => {
+ let end = snap.idx(snap.cursor).unwrap_or(snap.len());
+ self.kill_range(..end)
+ }
+ "eol" => {
+ let start = snap.idx(snap.cursor).unwrap_or(snap.len());
+ self.kill_range(start..)
+ }
+ "backward" => {
+ let end = snap.idx(snap.cursor).unwrap_or(snap.len());
+ let start = end - Self::find_word_boundary(snap.value[..end].chars().rev());
+ self.kill_range(start..end)
+ }
+ "forward" => {
+ let start = snap.idx(snap.cursor).unwrap_or(snap.len());
+ let end = start + Self::find_word_boundary(snap.value[start..].chars());
+ self.kill_range(start..end)
+ }
+ _ => {}
+ }
+ }
+
  fn kill_range(&mut self, range: impl RangeBounds<usize>) {
  let snap = self.snap_mut();
  snap.cursor = match range.start_bound() {
@@ -64,32 +91,4 @@ impl Input {
  let n = n + count_characters(input.clone().skip(n));
  input.take(n).fold(0, |acc, c| acc + c.len_utf8())
  }
-
- pub fn kill(&mut self, opt: impl Into<Opt>) {
- let opt = opt.into() as Opt;
- let snap = self.snap_mut();
-
- match opt.kind.as_str() {
- "all" => self.kill_range(..),
- "bol" => {
- let end = snap.idx(snap.cursor).unwrap_or(snap.len());
- self.kill_range(..end)
- }
- "eol" => {
- let start = snap.idx(snap.cursor).unwrap_or(snap.len());
- self.kill_range(start..)
- }
- "backward" => {
- let end = snap.idx(snap.cursor).unwrap_or(snap.len());
- let start = end - Self::find_word_boundary(snap.value[..end].chars().rev());
- self.kill_range(start..end)
- }
- "forward" => {
- let start = snap.idx(snap.cursor).unwrap_or(snap.len());
- let end = start + Self::find_word_boundary(snap.value[start..].chars());
- self.kill_range(start..end)
- }
- _ => {}
- }
- }
 }
diff --git a/yazi-core/src/input/commands/move_.rs b/yazi-core/src/input/commands/move_.rs
@@ -21,9 +21,8 @@ impl From<isize> for Opt {
 }
 
 impl Input {
- pub fn move_(&mut self, opt: impl Into<Opt>) {
- let opt = opt.into() as Opt;
-
+ #[yazi_macro::command]
+ pub fn move_(&mut self, opt: Opt) {
  let snap = self.snap();
  if opt.in_operating && snap.op == InputOp::None {
  return;

diff --git a/yazi-core/src/input/commands/paste.rs b/yazi-core/src/input/commands/paste.rs
@@ -12,7 +12,8 @@ impl From<Cmd> for Opt {
 }
 
 impl Input {
- pub fn paste(&mut self, opt: impl Into<Opt>) {
+ #[yazi_macro::command]
+ pub fn paste(&mut self, opt: Opt) {
  if let Some(start) = self.snap().op.start() {
  self.snap_mut().op = InputOp::Delete(false, false, start);
  self.handle_op(self.snap().cursor, true);
@@ -23,7 +24,6 @@ impl Input {
  return;
  }
 
- let opt = opt.into() as Opt;
  self.insert(!opt.before);
  self.type_str(&s.to_string_lossy());
  self.escape(());