Llewellyn/zoxide
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/zoxide.git synced 2025-02-02 19:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Use elvish v0.17 lambda syntax in completions generation (#334)

Browse Source
This commit is contained in:
cherryblossom000 2022-01-12 18:03:58 +11:00 committed by Ajeet D'Souza
parent b6b024c452
commit e34b6f930a
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- Rename `_z` completion function to avoid conflicts with other shell plugins. - Rename `_z` completion function to avoid conflicts with other shell plugins.
- Elvish: upgrade to new lambda syntax.
## [0.8.0] - 2021-12-25 ## [0.8.0] - 2021-12-25

2
shell.nix
View File

@ -2,7 +2,7 @@ let
rust = import (builtins.fetchTarball rust = import (builtins.fetchTarball
"https://github.com/oxalica/rust-overlay/archive/203dc4fc3fe2a5df1aa481a3fc8a1bb27074d677.tar.gz"); "https://github.com/oxalica/rust-overlay/archive/203dc4fc3fe2a5df1aa481a3fc8a1bb27074d677.tar.gz");
pkgs = import (builtins.fetchTarball pkgs = import (builtins.fetchTarball
"https://github.com/NixOS/nixpkgs/archive/eac07edbd20ed4908b98790ba299250b5527ecdf.tar.gz") { "https://github.com/NixOS/nixpkgs/archive/fae46e66a5df220327b45e0d7c27c6961cf922ce.tar.gz") {
overlays = [ rust ]; overlays = [ rust ];
}; };
in pkgs.mkShell { in pkgs.mkShell {

18
templates/elvish.txt
View File

@ -9,7 +9,7 @@ use path
# #
# cd + custom logic based on the value of _ZO_ECHO. # cd + custom logic based on the value of _ZO_ECHO.
fn __zoxide_cd [path]{ fn __zoxide_cd {|path|
builtin:cd $path builtin:cd $path
{%- if echo %} {%- if echo %}
builtin:echo $pwd builtin:echo $pwd
@ -22,7 +22,7 @@ fn __zoxide_cd [path]{
# Initialize hook to track previous directory. # Initialize hook to track previous directory.
var oldpwd = $builtin:pwd var oldpwd = $builtin:pwd
set builtin:before-chdir = [$@builtin:before-chdir [_]{ edit:add-var oldpwd $builtin:pwd }] set builtin:before-chdir = [$@builtin:before-chdir {|_| edit:add-var oldpwd $builtin:pwd }]
# Initialize hook to add directories to zoxide. # Initialize hook to add directories to zoxide.
{%- if hook == InitHook::None %} {%- if hook == InitHook::None %}
@ -32,9 +32,9 @@ set builtin:before-chdir = [$@builtin:before-chdir [_]{ edit:add-var oldpwd $bui
if (builtin:not (builtin:eq $E:__zoxide_shlvl $E:SHLVL)) { if (builtin:not (builtin:eq $E:__zoxide_shlvl $E:SHLVL)) {
set E:__zoxide_shlvl = $E:SHLVL set E:__zoxide_shlvl = $E:SHLVL
{%- if hook == InitHook::Prompt %} {%- if hook == InitHook::Prompt %}
set edit:before-readline = [$@edit:before-readline []{ zoxide add -- $pwd }] set edit:before-readline = [$@edit:before-readline {|| zoxide add -- $pwd }]
{%- else if hook == InitHook::Pwd %} {%- else if hook == InitHook::Pwd %}
set builtin:after-chdir = [$@builtin:after-chdir [_]{ zoxide add -- $pwd }] set builtin:after-chdir = [$@builtin:after-chdir {|_| zoxide add -- $pwd }]
{%- endif %} {%- endif %}
} }
@ -46,7 +46,7 @@ if (builtin:not (builtin:eq $E:__zoxide_shlvl $E:SHLVL)) {
# #
# Jump to a directory using only keywords. # Jump to a directory using only keywords.
fn __zoxide_z [@rest]{ fn __zoxide_z {|@rest|
if (builtin:eq [] $rest) { if (builtin:eq [] $rest) {
__zoxide_cd ~ __zoxide_cd ~
} elif (builtin:eq [-] $rest) { } elif (builtin:eq [-] $rest) {
@ -66,7 +66,7 @@ fn __zoxide_z [@rest]{
edit:add-var __zoxide_z~ $__zoxide_z~ edit:add-var __zoxide_z~ $__zoxide_z~
# Jump to a directory using interactive search. # Jump to a directory using interactive search.
fn __zoxide_zi [@rest]{ fn __zoxide_zi {|@rest|
var path var path
try { try {
set path = (zoxide query -i -- $@rest) set path = (zoxide query -i -- $@rest)
@ -90,12 +90,12 @@ edit:add-var {{cmd}}i~ $__zoxide_zi~
# Load completions. # Load completions.
{# zoxide-based completions are currently not possible, because Elvish only {# zoxide-based completions are currently not possible, because Elvish only
# prints a completion if the current token is a prefix of it. -#} # prints a completion if the current token is a prefix of it. -#}
fn __zoxide_z_complete [@rest]{ fn __zoxide_z_complete {|@rest|
if (!= (builtin:count $rest) 2) { if (!= (builtin:count $rest) 2) {
builtin:return builtin:return
} }
edit:complete-filename $rest[1] | edit:complete-filename $rest[1] |
builtin:each [completion]{ builtin:each {|completion|
var dir = $completion[stem] var dir = $completion[stem]
if (path:is-dir $dir) { if (path:is-dir $dir) {
builtin:put $dir builtin:put $dir
@ -116,4 +116,4 @@ set edit:completion:arg-completer[{{cmd}}] = $__zoxide_z_complete~
# #
# eval (zoxide init elvish | slurp) # eval (zoxide init elvish | slurp)
# #
# Note: zoxide only supports elvish v0.16.0 and above. # Note: zoxide only supports elvish v0.17.0 and above.