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

Jump to bottom

feat: fuzzy finding (pt. 2) #77

Merged
merged 31 commits into from
Sep 25, 2023
Merged

feat: fuzzy finding (pt. 2) #77

merged 31 commits into from
Sep 25, 2023

Conversation

willothy
Copy link
Collaborator

@willothy willothy commented Sep 2, 2023 •
edited
Loading

This PR builds on @theofabilous' great work in #65, adding mouse hover support, proper offset for borderless finder prompts, and config options for the fuzzy finder.

  • Hover events
  • Config options
  • Docs for config options
  • Docs for API
  • Properly restore cursor in menu when exiting fuzzy finding mode
  • Default mapping to open fuzzy finder from menu (needs discussion)
    • Set to i for now
  • Tests for fuzzy finder

@willothy willothy force-pushed the feat-fuzzy-finding branch 5 times, most recently from 961eb89 to aebd243 Compare September 2, 2023 03:01
@willothy willothy marked this pull request as ready for review September 2, 2023 03:10
@willothy willothy marked this pull request as draft September 2, 2023 03:15
@willothy willothy force-pushed the feat-fuzzy-finding branch 2 times, most recently from 5c5c195 to 5f01cee Compare September 2, 2023 03:39
@willothy willothy marked this pull request as ready for review September 2, 2023 03:40
@willothy
Copy link
Collaborator Author

willothy commented Sep 2, 2023

Anything need changing before I start writing tests? I've been using this and it's working quite well :)

@Bekaboo
Copy link
Owner

Bekaboo commented Sep 2, 2023

@willothy Thanks for your work, at a glance this looks polished and well-organized. I'm quite busy these days and will review and merge this in a week hopefully.

@willothy
Copy link
Collaborator Author

willothy commented Sep 2, 2023

@willothy Thanks for your work, at a glance this looks polished and well-organized. I'm quite busy these days and will review and merge this in a week hopefully.

Thanks, that sounds good! That will give me some time to keep testing and fix any issues that pop up.

@willothy
Copy link
Collaborator Author

willothy commented Sep 3, 2023 •
edited
Loading

Todo: current context is not highlighted in fzf mode

Entry now highlights properly even when its position moves due to filtering / sorting.

@willothy
Copy link
Collaborator Author

willothy commented Sep 4, 2023

This is working very smoothly for me now, no issues that I know of.

@willothy
Copy link
Collaborator Author

willothy commented Sep 4, 2023

Fixed error when fzf-native isn't installed, now attempting to enter fzf mode without fzf-native will do nothing.

@willothy willothy force-pushed the feat-fuzzy-finding branch 2 times, most recently from 2ee6c78 to 382dc01 Compare September 5, 2023 01:35
@willothy
Copy link
Collaborator Author

willothy commented Sep 5, 2023

I'll squash these small commits before merge, but figured I should leave them separate before review

@willothy willothy force-pushed the feat-fuzzy-finding branch 10 times, most recently from daeb693 to 919f380 Compare September 9, 2023 07:45
@willothy
docs: document fuzzy_find_* api functions
7378380
@willothy
fix: restore menu cursor pos on fuzzy search exit
a27ba17
@willothy
refactor: remove unused args
df50f80
@willothy
feat: set filetype for fuzzy finder
5a97e7d
@willothy
feat!: use <i> to enter fzf mode
5a45c67 
docs: document fzf mode default keybinds
feat: allow disabling default fzf keybinds by setting them to `false`
@willothy
feat: add fuzzy_find_on_click option
0c1d05d
@willothy
fix: ensure clicked entry has a submenu before attempting to open fzf
5cf14f9
@willothy
fix: remove unnecessary vim.schedule
da5eee6 
fixes flicker when opening fzf menu
@willothy
fix: keep current context highlight in fzf mode
aa25731
@willothy
fix: restore cursorcol when leaving fzf mode
e1c8f4c
@willothy
fix: nil check for cursor when restoring entries
2ea5c0b
@willothy
fix: explicitly return false if fzf not found
ea0034f 
refactor: use vim.F.ok_or_nil
@willothy
feat(fzf): select first entry on <Enter>, last on <S-Enter>
0676fe9
@willothy
fix(fzf): only apply offset if menu has no border
d25aed8
@willothy
fix(mappings): don't perform fzf check in mapping
e7d21db
@willothy
refactor(fzf): use vim.notify_once for dependency warnings
5367651
@willothy
refactor(fzf): simplify fzf context hl update
b1bb878
@willothy
feat: fuzzy finder navigation functions
a3cf66e
@willothy
fix: fzf auto-opening
5c09cc4
@willothy
test: tests for fuzzy finder
c990ead
@willothy
test: add telescope-fzf-native to test deps
7eef69d
@willothy
feat: fuzzy_find_navigate, update fzf mappings
627dd4e
@willothy
Copy link
Collaborator Author

willothy commented Sep 22, 2023 •
edited
Loading

Updated! CI failure is related to swap files, not the PR contents btw

fixed by setting vim.o.swapfile = false in the test minimal init

@Bekaboo Bekaboo merged commit 8da1555 into Bekaboo:master Sep 25, 2023
4 checks passed
@github-actions github-actions bot mentioned this pull request Sep 22, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@willothy @Bekaboo @theofabilous