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

[Search directory] expand variables in current token #133

Merged
merged 23 commits into from
Mar 23, 2021
Merged

[Search directory] expand variables in current token #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
262a39b
[Search files] expand entire token
kidonng Mar 9, 2021
05dffd1
That thing
kidonng Mar 9, 2021
2e29c3e
Use expaned token in the preview
kidonng Mar 9, 2021
b6b60bd
Fix escaping
kidonng Mar 9, 2021
e24052f
eval is evil
kidonng Mar 9, 2021
ecbe926
Try to fix test
kidonng Mar 9, 2021
231ec29
🤷‍♀️
kidonng Mar 9, 2021
b87a24b
fix typo
kidonng Mar 9, 2021
5fa321b
Save a escape
kidonng Mar 9, 2021
eeedadb
Update __fzf_search_current_dir.fish
kidonng Mar 9, 2021
ed6f2c7
Merge branch 'main' into expand-token
PatrickF1 Mar 13, 2021
b4b4186
Escape properly
kidonng Mar 14, 2021
f81af52
Quote the new eval as well
kidonng Mar 14, 2021
1617780
Merge branch 'main' into expand-token
kidonng Mar 23, 2021
43d131f
Merge
kidonng Mar 23, 2021
931c052
Fix space
kidonng Mar 23, 2021
78c43a7
Update __fzf_search_current_dir.fish
kidonng Mar 23, 2021
5f30c49
Update __fzf_search_current_dir.fish
kidonng Mar 23, 2021
0b8975b
start test
PatrickF1 Mar 23, 2021
6957773
Merge branch 'main' into expand-token
PatrickF1 Mar 23, 2021
62b26e1
work on new test
PatrickF1 Mar 23, 2021
62d97cd
finish test
PatrickF1 Mar 23, 2021
d8d3f1e
add timeout to tests
PatrickF1 Mar 23, 2021
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
2 changes: 2 additions & 0 deletions .github/workflows/continuous_integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
- name: Run full test suite
run: fishtape tests/*/*.fish
shell: fish {0}
# timeout in case tests get stuck on fzf
timeout-minutes: 3

syntax-check:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions functions/__fzf_search_current_dir.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ function __fzf_search_current_dir --description "Search the current directory. R
set fd_opts --color=always $fzf_fd_opts
set fzf_arguments --multi --ansi $fzf_dir_opts
set token (commandline --current-token)
# expand ~ in the directory name since fd can't expand it
set expanded_token (string replace --regex -- "^~/" $HOME/ $token)
​# expand the token (which may include tilde, variables, etc.) into full path
set expanded_token (eval echo -- \"$token\")
Copy link
Owner

Choose a reason for hiding this comment

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

What's an example where removing the quotes would break this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm just quoting it like in __fzf_preview_file.

Copy link
Owner

Choose a reason for hiding this comment

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

I just can't think of when token when ever be separated by an unescaped space. Whatever, I suppose it's safer this way.

Copy link
Contributor Author

@kidonng kidonng Mar 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

users should know better than to quote ~

You are totally right... I was too careful to do it right.

Copy link
Owner

Choose a reason for hiding this comment

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

Oh shoot, this is actually a bug. Quoting it broke this for tilde. Just tested.

Copy link
Owner

Choose a reason for hiding this comment

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

Fixed in 83cb78f

# unescape token because it's already quoted so backslashes will mess up the path
set unescaped_exp_token (string unescape -- $expanded_token)

Expand Down
10 changes: 10 additions & 0 deletions tests/search_current_dir/expands_var_in_query.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
set target "file 1.txt"

set --global fzf_dir_opts --select-1
mock commandline --current-token "echo \$target"
mock commandline "--current-token --replace --" "echo \$argv"
mock commandline \* ""
# string unescape because the args passed into commandline --current-token --replace are escaped
set actual (string unescape (__fzf_search_current_dir))

@test "expands variables in current token" (basename $actual) = $target