Skip to content

feat: support fzf extra options #1026

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.

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

ValJed
Copy link

@ValJed ValJed commented Mar 24, 2025

Description

Add support for a new env variable _ZO_FZF_EXTRA_OPTS to allow adding flags to the default ones, instead of erasing them.

This has been asked in this issue.

Usage

Simply set _ZO_FZF_EXTRA_OPTS instead of _ZO_FZF_OPTS to append flags to the default ones.

Looks like the CI failed, but it does also on last PRs.

src/cmd/query.rs Outdated
])
.enable_preview()
let default_args = config::fzf_default_args();
let args = if let Some(fzf_extra_opts) = config::fzf_extra_opts() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Since this returns values for both branches, it should probably be a match expression. if let expressions are generally used when there's some code that ought to be conditionally executed, rather than being assigned to a variable in the parent scope.

Copy link
Author

Choose a reason for hiding this comment

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

Indeed, udpated too!

src/cmd/query.rs Outdated
@@ -91,29 +91,29 @@ impl Query {

fn get_fzf() -> Result<FzfChild> {
let mut fzf = Fzf::new()?;
if let Some(fzf_opts) = config::fzf_opts() {
if let Some(mut fzf_opts) = config::fzf_opts() {
Copy link
Contributor

Choose a reason for hiding this comment

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

This could be a match expression

Copy link
Author

Choose a reason for hiding this comment

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

That's right, updated.

src/cmd/query.rs Outdated
@@ -91,29 +91,29 @@ impl Query {

fn get_fzf() -> Result<FzfChild> {
let mut fzf = Fzf::new()?;
if let Some(fzf_opts) = config::fzf_opts() {
if let Some(mut fzf_opts) = config::fzf_opts() {
if let Some(fzf_extra_opts) = config::fzf_extra_opts() {
Copy link
Contributor

Choose a reason for hiding this comment

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

This is the right way to use an if let, since there's no other execution path.

@azaleacolburn
Copy link
Contributor

diff --git a/src/cmd/query.rs b/src/cmd/query.rs
index adaeff7..652e624 100644
--- a/src/cmd/query.rs
+++ b/src/cmd/query.rs
@@ -3,7 +3,7 @@ use std::io::{self, Write};
 use anyhow::{Context, Result};
 
 use crate::cmd::{Query, Run};
-use crate::config;
+use crate::config::{self};
 use crate::db::{Database, Epoch, Stream, StreamOptions};
 use crate::error::BrokenPipeHandler;
 use crate::util::{self, Fzf, FzfChild};
@@ -91,29 +91,33 @@ impl Query {
 
     fn get_fzf() -> Result<FzfChild> {
         let mut fzf = Fzf::new()?;
-        if let Some(mut fzf_opts) = config::fzf_opts() {
-            if let Some(fzf_extra_opts) = config::fzf_extra_opts() {
-                fzf_opts.push(" ");
-                fzf_opts.push(fzf_extra_opts);
+        match config::fzf_opts() {
+            Some(mut fzf_opts) => {
+                if let Some(fzf_extra_opts) = config::fzf_extra_opts() {
+                    fzf_opts.push(" ");
+                    fzf_opts.push(fzf_extra_opts);
+                }
+
+                fzf.env("FZF_DEFAULT_OPTS", fzf_opts)
             }
+            None => {
+                let default_args = config::fzf_default_args();
+                let args = match config::fzf_extra_opts() {
+                    Some(fzf_extra_opts) => {
+                        let extra_fzf_args_list: Vec<String> = fzf_extra_opts
+                            .to_str()
+                            .unwrap_or_default()
+                            .split_whitespace()
+                            .map(|arg| String::from(arg))
+                            .collect();
+
+                        vec![default_args, extra_fzf_args_list].concat()
+                    }
+                    None => default_args,
+                };
 
-            fzf.env("FZF_DEFAULT_OPTS", fzf_opts)
-        } else {
-            let default_args = config::fzf_default_args();
-            let args = if let Some(fzf_extra_opts) = config::fzf_extra_opts() {
-                let extra_fzf_args_list: Vec<String> = fzf_extra_opts
-                    .to_str()
-                    .unwrap_or_default()
-                    .split_whitespace()
-                    .map(|arg| String::from(arg))
-                    .collect();
-
-                vec![default_args, extra_fzf_args_list].concat()
-            } else {
-                default_args
-            };
-
-            fzf.args(args).enable_preview()
+                fzf.args(args).enable_preview()
+            }
         }
         .spawn()
     }

@ValJed
Copy link
Author

ValJed commented May 19, 2025

Thanks for the review @azaleacolburn.
I updated the code following your suggestions.

@ValJed ValJed requested a review from azaleacolburn May 19, 2025 14:33
@ValJed ValJed requested a review from azaleacolburn May 23, 2025 08:21
@ValJed
Copy link
Author

ValJed commented Jun 4, 2025

@ajeetdsouza Would love to see this merged 🙏🏼
Thanks in advance!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants