Skip to content

[complete] Prioritize flex style if flex style is requested #3696

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

Merged
merged 1 commit into from
Jun 2, 2024
Merged

[complete] Prioritize flex style if flex style is requested #3696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Bugs fixed

- [#3696](https://github.com/clojure-emacs/cider/pull/3696): Don't eagerly complete a candidate if there are other candidates matching `flex` style.

## 1.14.0 (2024-05-30)

### New features
Expand Down
2 changes: 1 addition & 1 deletion cider-completion.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ Only affects the `cider' completion category.`"
(unless found-styles
(setq found-styles '(styles basic)))
(unless (member 'flex found-styles)
(setq found-styles (append found-styles '(flex))))
(setq found-styles (apply #'list 'styles 'flex (cdr found-styles))))
Copy link
Member

Choose a reason for hiding this comment

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

Maybe you can add here a comment similar to the description of the ticket, so people would understand better the need for this bit of code. Feel free do directly commit the comment if you agree with me it'd be useful.
(add-to-list 'completion-category-overrides (apply #'list 'cider found-styles (when found-cycle
(list found-cycle))))))

Expand Down
2 changes: 1 addition & 1 deletion test/cider-completion-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
(unwind-protect
(progn
(it "adds `flex' and `basic' as a fallback"
(let ((expected-category-overrides '((cider (styles basic flex)))))
(let ((expected-category-overrides '((cider (styles flex basic)))))
(cider-enable-flex-completion)
(expect (member 'flex (assq 'styles (assq 'cider completion-category-overrides)))
:to-be-truthy)
Expand Down