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.

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

Development branch for next release (0.53) #3807

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
Open

Development branch for next release (0.53) #3807

wants to merge 62 commits into from

Conversation

junegunn
Copy link
Owner

@junegunn junegunn commented May 19, 2024

Because this release will have some documentation changes, I'll be working on a non-master branch. Tests are welcome.

Native --tmux integration

# --tmux [center|top|bottom|left|right][,SIZE[%]][,SIZE[%]]

# Center, 50% width 50% height
fzf --tmux center

# Center, 80% width and height
fzf --tmux 80%

# Center ,100% width and 50% height
fzf --tmux 100%,50%

# Left, 40% width
fzf --tmux left,40%

# Left, 40% width, 90% height
fzf --tmux left,40%,90%

# Top, 40% height
fzf --tmux top,40%

# Top, 90% height, 40% height
fzf --tmux top,90%,40%

New defaults for pointer and marker

fzf --tmux 30% --multi
image
fzf --tmux 30% --multi --color gutter:-1
image
fzf --tmux 30% --multi --no-color
image
  • The previous defaults (>) wouldn't look nice with multi-line display
  • These Unicode bars look nice with or without the gutter and feel kind of modern

Multi-line display of multi-line items

rg -p bash | perl -0777 -pe 's/\n\n/\n\0/gm' | fzf --read0 --ansi --multi --highlight-line --reverse --tmux 70%
image

Following NO_COLOR protocol

If $NO_COLOR environment variable is set to a non-empty value, fzf will default to --no-color mode.

Git bash (mintty) support

fzf now works on Git bash out of the box via winpty. However, --height option doesn't work.

Embedded man page

You can run fzf --man to see the man page. This simplifies the distribution.

* Tidy up
* Mention `--tmux`
fzf --tmux center --bind 'enter:become:vim {}'
* Pointer: '▌'
* Marker: '▏'

They will still be set to '>' if `--no-unicode` is given.

Reasons:
* They look okay
* They work better with multi-line items (WIP)
@junegunn junegunn self-assigned this May 19, 2024
@junegunn junegunn marked this pull request as draft May 20, 2024 00:05
@junegunn junegunn changed the title Development Development branch for next release May 20, 2024
@junegunn junegunn changed the title Development branch for next release Development branch for next release (0.53) May 20, 2024
Close #3806

Known limitation:
* --height cannot be used
@junegunn
Copy link
Owner Author

junegunn commented May 20, 2024

image

Windows terminals don't seem to render correctly. Going to use for marker instead.

@junegunn junegunn force-pushed the devel branch 4 times, most recently from 58a95c7 to 2c7c6e8 Compare May 20, 2024 16:05
Copy link
Contributor

@LangLangBart LangLangBart left a comment

Choose a reason for hiding this comment

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

apply -n2..,.. only when there are numbers

shell/key-bindings.fish Outdated Show resolved Hide resolved
shell/key-bindings.fish Outdated Show resolved Hide resolved
@LangLangBart
Copy link
Contributor

Do you think my earlier comment about the marker is an issue, or should it be left to the user to change the marker in their FZF_DEFAULT_OPTS?

#3807 (comment)

@junegunn
Copy link
Owner Author

The problem is only reproducible when using the font you mentioned, which has to be installed manually, right? If that's the case, I think it's fine, and we should probably report the problem to the font maintainers.

I'm just guessing here, but most people who care enough about their terminal experience to even install a custom font are probably using different terminal emulators.

junegunn and others added 6 commits May 31, 2024 16:57
@LangLangBart
Copy link
Contributor

The problem is only reproducible when using the font you mentioned, which has to be installed manually, right?

Right, but I did not test all of them, just a random sample. The one mentioned remains the only one.

Increasing the line spacing also fixed it for me.

fzf

This is to make shell integration work out of the box on Git bash.

  eval "$(fzf --bash)"
  vim <CTRL-T>
    # would print '--height option is currently not supported on this platform'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants