Llewellyn/zoxide
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/zoxide.git synced 2025-01-23 15:18:32 +00:00
Code Issues Projects Releases Wiki Activity

Switch elvish template to new try/catch syntax (#371)

Browse Source
This commit is contained in:
skwerlman 2022-03-31 07:20:29 -04:00 committed by GitHub
parent 17365710af
commit a0242d7c9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@ -10,7 +10,8 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, macos-latest, windows-latest] # FIXME: Enable macos-latest when this is merged: https://nixpk.gs/pr-tracker.html?pr=163924
os: [ubuntu-latest, windows-latest]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

6
CHANGELOG.md
View File

@ -18,11 +18,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Bash/Zsh: rename `_z` completion function to avoid conflicts with other shell - Bash/Zsh: rename `_z` completion function to avoid conflicts with other shell
plugins. plugins.
- Elvish: upgrade to new lambda syntax. - Elvish: upgrade to new lambda syntax.
- Fzf: added `--keep-right` option by default, upgraded minimum version to - Fzf: added `--keep-right` option by default, upgrade minimum supported version
v0.21.0. to v0.21.0.
- Bash: only enable completions on 4.4+. - Bash: only enable completions on 4.4+.
- Fzf: bypass `ls` alias in preview window. - Fzf: bypass `ls` alias in preview window.
- Retain ownership of database file. - Retain ownership of database file.
- Elvish: upgrade to new try-catch syntax, upgrade minimum supported version to
v0.18.0.
## [0.8.0] - 2021-12-25 ## [0.8.0] - 2021-12-25

7
README.md
View File

@ -171,7 +171,7 @@ Add this to your configuration (usually `~/.elvish/rc.elv`):
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.18.0 and above.
</details> </details>
@ -241,8 +241,9 @@ Add this to your configuration (usually `~/.zshrc`):
eval "$(zoxide init zsh)" eval "$(zoxide init zsh)"
``` ```
For completions to work, the above line must be added _after_ `compinit` is For completions to work, the above line must be added *after* `compinit` is
called. You may have to rebuild your cache by running `rm ~/.zcompdump*; compinit`. called. You may have to rebuild your cache by running
`rm ~/.zcompdump*; compinit`.
</details> </details>

2
man/man1/zoxide-init.1
View File

@ -20,7 +20,7 @@ Add this to your configuration (usually \fB~/.elvish/rc.elv\fR):
\fBeval $(zoxide init elvish | slurp)\fR \fBeval $(zoxide init elvish | slurp)\fR
.fi .fi
.sp .sp
Note: zoxide only supports elvish v0.16.0 and above. Note: zoxide only supports elvish v0.18.0 and above.
.TP .TP
.B fish .B fish
Add this to your configuration (usually \fB~/.config/fish/config.fish\fR): Add this to your configuration (usually \fB~/.config/fish/config.fish\fR):

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/46d8d20fce510c6a25fa66f36e31f207f6ea49e4.tar.gz"); "https://github.com/oxalica/rust-overlay/archive/46d8d20fce510c6a25fa66f36e31f207f6ea49e4.tar.gz");
pkgs = import (builtins.fetchTarball pkgs = import (builtins.fetchTarball
"https://github.com/NixOS/nixpkgs/archive/fae46e66a5df220327b45e0d7c27c6961cf922ce.tar.gz") { "https://github.com/NixOS/nixpkgs/archive/d19a9162c848517cfc9437f10945b736d718b948.tar.gz") {
overlays = [ rust ]; overlays = [ rust ];
}; };
in pkgs.mkShell { in pkgs.mkShell {

6
templates/elvish.txt
View File

@ -57,7 +57,7 @@ fn __zoxide_z {|@rest|
var path var path
try { try {
set path = (zoxide query --exclude $pwd -- $@rest) set path = (zoxide query --exclude $pwd -- $@rest)
} except { } catch {
} else { } else {
__zoxide_cd $path __zoxide_cd $path
} }
@ -70,7 +70,7 @@ fn __zoxide_zi {|@rest|
var path var path
try { try {
set path = (zoxide query -i -- $@rest) set path = (zoxide query -i -- $@rest)
} except { } catch {
} else { } else {
__zoxide_cd $path __zoxide_cd $path
} }
@ -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.17.0 and above. # Note: zoxide only supports elvish v0.18.0 and above.