Skip to content

Commit 1d3b746

Browse files
authored
Merge branch 'junegunn:master' into issue-3914-enhance-ctrl-t
2 parents b907a6f + 8cb59e6 commit 1d3b746

28 files changed

+368
-169
lines changed

Diff for: .github/workflows/winget.yml

-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ jobs:
1010
- uses: vedantmgoyal2009/winget-releaser@v2
1111
with:
1212
identifier: junegunn.fzf
13-
version: ${{ github.event.release.tag_name }}
1413
installers-regex: '-windows_(armv7|arm64|amd64)\.zip$'
1514
token: ${{ secrets.WINGET_TOKEN }}

Diff for: .goreleaser.yml

+38-58
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,15 @@
11
---
2+
version: 2
23
project_name: fzf
34

45
before:
56
hooks:
67
- go mod download
78

89
builds:
9-
- id: fzf-macos
10-
binary: fzf
11-
goos:
12-
- darwin
13-
goarch:
14-
- amd64
15-
flags:
16-
- -trimpath
17-
ldflags:
18-
- "-s -w -X main.version={{ .Version }} -X main.revision={{ .ShortCommit }}"
19-
hooks:
20-
post: |
21-
sh -c '
22-
cat > /tmp/fzf-gon-amd64.hcl << EOF
23-
source = ["./dist/fzf-macos_darwin_amd64_v1/fzf"]
24-
bundle_id = "junegunn.fzf"
25-
sign {
26-
application_identity = "Developer ID Application: Junegunn Choi (Y254DRW44Z)"
27-
}
28-
zip {
29-
output_path = "./dist/fzf-{{ .Version }}-darwin_amd64.zip"
30-
}
31-
EOF
32-
gon /tmp/fzf-gon-amd64.hcl
33-
'
34-
35-
- id: fzf-macos-arm
36-
binary: fzf
37-
goos:
38-
- darwin
39-
goarch:
40-
- arm64
41-
flags:
42-
- -trimpath
43-
ldflags:
44-
- "-s -w -X main.version={{ .Version }} -X main.revision={{ .ShortCommit }}"
45-
hooks:
46-
post: |
47-
sh -c '
48-
cat > /tmp/fzf-gon-arm64.hcl << EOF
49-
source = ["./dist/fzf-macos-arm_darwin_arm64/fzf"]
50-
bundle_id = "junegunn.fzf"
51-
sign {
52-
application_identity = "Developer ID Application: Junegunn Choi (Y254DRW44Z)"
53-
}
54-
zip {
55-
output_path = "./dist/fzf-{{ .Version }}-darwin_arm64.zip"
56-
}
57-
EOF
58-
gon /tmp/fzf-gon-arm64.hcl
59-
'
60-
6110
- id: fzf
6211
goos:
12+
- darwin
6313
- linux
6414
- windows
6515
- freebsd
@@ -89,6 +39,42 @@ builds:
8939
- goos: openbsd
9040
goarch: arm64
9141

42+
# .goreleaser.yaml
43+
notarize:
44+
macos:
45+
- # Whether this configuration is enabled or not.
46+
#
47+
# Default: false.
48+
# Templates: allowed.
49+
enabled: "{{ not .IsSnapshot }}"
50+
51+
# Before notarizing, we need to sign the binary.
52+
# This blocks defines the configuration for doing so.
53+
sign:
54+
# The .p12 certificate file path or its base64'd contents.
55+
certificate: "{{.Env.MACOS_SIGN_P12}}"
56+
57+
# The password to be used to open the certificate.
58+
password: "{{.Env.MACOS_SIGN_PASSWORD}}"
59+
60+
# Then, we notarize the binaries.
61+
notarize:
62+
# The issuer ID.
63+
# Its the UUID you see when creating the App Store Connect key.
64+
issuer_id: "{{.Env.MACOS_NOTARY_ISSUER_ID}}"
65+
66+
# Key ID.
67+
# You can see it in the list of App Store Connect Keys.
68+
# It will also be in the ApiKey filename.
69+
key_id: "{{.Env.MACOS_NOTARY_KEY_ID}}"
70+
71+
# The .p8 key file path or its base64'd contents.
72+
key: "{{.Env.MACOS_NOTARY_KEY}}"
73+
74+
# Whether to wait for the notarization to finish.
75+
# Not recommended, as it could take a really long time.
76+
wait: true
77+
9278
archives:
9379
- name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
9480
builds:
@@ -100,18 +86,12 @@ archives:
10086
files:
10187
- non-existent*
10288

103-
checksum:
104-
extra_files:
105-
- glob: ./dist/fzf-*darwin*.zip
106-
10789
release:
10890
github:
10991
owner: junegunn
11092
name: fzf
11193
prerelease: auto
11294
name_template: '{{ .Version }}'
113-
extra_files:
114-
- glob: ./dist/fzf-*darwin*.zip
11595

11696
snapshot:
11797
name_template: "{{ .Version }}-devel"

Diff for: CHANGELOG.md

+61
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,67 @@
11
CHANGELOG
22
=========
33

4+
0.55.0
5+
------
6+
- [bash] Fuzzy path completion is enabled for all commands
7+
- 1. If the default completion is not already set
8+
- 2. And if the current bash supports `complete -D` option
9+
- However, fuzzy completion for some commands can be "dynamically" disabled by the dynamic completion loader
10+
- See the comment in `__fzf_default_completion` function for more information
11+
- Comments are now allowed in `$FZF_DEFAULT_OPTS` and `$FZF_DEFAULT_OPTS_FILE`
12+
```sh
13+
export FZF_DEFAULT_OPTS='
14+
# Layout options
15+
--layout=reverse
16+
--info=inline-right # Show info on the right side of the prompt line
17+
# ...
18+
'
19+
```
20+
- Hyperlinks (OSC 8) are now supported in the preview window and in the main window
21+
```sh
22+
printf '<< \e]8;;http://github.com/junegunn/fzf\e\\Link to \e[32mfz\e[0mf\e]8;;\e\\ >>' | fzf --ansi
23+
24+
fzf --preview "printf '<< \e]8;;http://github.com/junegunn/fzf\e\\Link to \e[32mfz\e[0mf\e]8;;\e\\ >>'"
25+
```
26+
- [vim] A spec can have `exit` callback that is called with the exit status of fzf
27+
- This can be used to clean up temporary resources or restore the original state when fzf is closed without a selection
28+
- Fixed `--tmux bottom` when the status line is not at the bottom
29+
- Fixed extra scroll offset in multi-line mode (`--read0` or `--wrap`)
30+
- Added fallback `ps` command for `kill` completion on Cygwin
31+
32+
0.54.3
33+
------
34+
- Fixed incompatibility of adaptive height specification and 'start:reload'
35+
```sh
36+
# A regression in 0.54.0 would cause this to fail
37+
fzf --height '~100%' --bind 'start:reload:seq 10'
38+
```
39+
- Environment variables are now available to `$FZF_DEFAULT_COMMAND`
40+
```sh
41+
FZF_DEFAULT_COMMAND='echo $FZF_QUERY' fzf --query foo
42+
```
43+
44+
0.54.2
45+
------
46+
- Fixed incorrect syntax highlighting of truncated multi-line entries
47+
- Updated GoReleaser to 2.1.0 to simplify notarization of macOS binaries
48+
- macOS archives will be in `tar.gz` format instead of `zip` format since we no longer notarize the zip files but binaries
49+
- (Windows) Reverted a mintty fix in 0.54.0
50+
- As a result, mouse may not work on mintty in fullscreen mode. However, fzf will correctly read non-ASCII input in fullscreen mode (`--no-height`).
51+
- fzf unfortunately cannot read non-ASCII input when not in fullscreen mode on Windows. So if you need to input non-ASCII characters, add `--no-height` to your `$FZF_DEFAULT_OPTS`.
52+
- Any help in fixing this issue will be appreciated (#3799, #3847).
53+
54+
0.54.1
55+
------
56+
- Updated [fastwalk](https://github.com/charlievieth/fastwalk) dependency for built-in directory walker
57+
- [fastwalk: add optional sorting and improve documentation](https://github.com/charlievieth/fastwalk/pull/27)
58+
- [fastwalk: only check if MSYSTEM is set during MSYS/MSYS2](https://github.com/charlievieth/fastwalk/pull/28)
59+
- Thanks to @charlievieth
60+
- Reverted ALT-C binding of fish to use `cd` instead of `builtin cd`
61+
- `builtin cd` was introduced to work around a bug of `cd` coming from `zoxide init --cmd cd fish` where it cannot handle `--` argument.
62+
- However, the default `cd` of fish is actually a wrapper function for supporting `cd -`, so we want to use it instead.
63+
- See [#3928](https://github.com/junegunn/fzf/pull/3928) for more information and consider helping zoxide fix the bug.
64+
465
0.54.0
566
------
667
_Release highlights: https://junegunn.github.io/fzf/releases/0.54.0/_

Diff for: README-VIM.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,9 @@ The following table summarizes the available options.
289289
| `source` | string | External command to generate input to fzf (e.g. `find .`) |
290290
| `source` | list | Vim list as input to fzf |
291291
| `sink` | string | Vim command to handle the selected item (e.g. `e`, `tabe`) |
292-
| `sink` | funcref | Reference to function to process each selected item |
292+
| `sink` | funcref | Function to be called with each selected item |
293293
| `sinklist` (or `sink*`) | funcref | Similar to `sink`, but takes the list of output lines at once |
294+
| `exit` | funcref | Function to be called with the exit status of fzf (e.g. 0, 1, 2, 130) |
294295
| `options` | string/list | Options to fzf |
295296
| `dir` | string | Working directory |
296297
| `up`/`down`/`left`/`right` | number/string | (Layout) Window position and size (e.g. `20`, `50%`) |

0 commit comments

Comments
 (0)