Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: allow quitting the app with escape when there's no selection #1042

Closed
wants to merge 1 commit into from
Closed

feat: allow quitting the app with escape when there's no selection #1042

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 33 additions & 14 deletions yazi-core/src/tab/commands/escape.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,36 @@
use bitflags::bitflags;
use yazi_proxy::{AppProxy, ManagerProxy};
use yazi_shared::{event::Cmd, render, render_and};
use yazi_shared::{
event::{Cmd, Event, EventQuit},
render, render_and,
};

use crate::tab::Tab;

bitflags! {
pub struct Opt: u8 {
const FIND = 0b00001;
const VISUAL = 0b00010;
const SELECT = 0b00100;
const FILTER = 0b01000;
const SEARCH = 0b10000;
const FIND = 0b0000001;
const VISUAL = 0b0000010;
const SELECT = 0b0000100;
const FILTER = 0b0001000;
const SEARCH = 0b0010000;
const QUIT = 0b0100000;
const CASCADE = 0b1000000;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to make it possible to explicitly invoke the default behavior (what happened previously when opt was empty)

}
}

impl From<Cmd> for Opt {
fn from(c: Cmd) -> Self {
c.args.iter().fold(Opt::empty(), |acc, (k, v)| {
match (k.as_str(), v.as_bool().unwrap_or(false)) {
("all", true) => Self::all(),
("all", true) => acc | (Self::all() ^ Self::QUIT ^ Self::CASCADE),
("find", true) => acc | Self::FIND,
("visual", true) => acc | Self::VISUAL,
("select", true) => acc | Self::SELECT,
("filter", true) => acc | Self::FILTER,
("search", true) => acc | Self::SEARCH,
("quit", true) => acc | Self::QUIT,
("cascade", true) => acc | Self::CASCADE,
_ => acc,
}
})
Expand All @@ -33,29 +40,36 @@ impl From<Cmd> for Opt {
impl Tab {
pub fn escape(&mut self, opt: impl Into<Opt>) {
let opt = opt.into() as Opt;
if opt.is_empty() {
if opt.is_empty() || opt.contains(Opt::CASCADE) {
_ = self.escape_find()
|| self.escape_visual()
|| self.escape_select()
|| self.escape_filter()
|| self.escape_search();
|| self.escape_search()
|| (opt.contains(Opt::QUIT) && self.quit());
return;
}

let mut matched = false;

if opt.contains(Opt::FIND) {
self.escape_find();
matched |= self.escape_find();
}
if opt.contains(Opt::VISUAL) {
self.escape_visual();
matched |= self.escape_visual();
}
if opt.contains(Opt::SELECT) {
self.escape_select();
matched |= self.escape_select();
}
if opt.contains(Opt::FILTER) {
self.escape_filter();
matched |= self.escape_filter();
}
if opt.contains(Opt::SEARCH) {
self.escape_search();
matched |= self.escape_search();
}

if !matched && opt.contains(Opt::QUIT) {
self.quit();
}
}

Expand Down Expand Up @@ -123,4 +137,9 @@ impl Tab {

true
}

pub fn quit(&mut self) -> bool {
Event::Quit(EventQuit { no_cwd_file: false, selected: None }).emit();
true
}
}