[complete] Prioritize flex style if flex style is requested

clojure-emacs · Jun 2, 2024 · 1f16f75 · 1f16f75
1 parent 6646778
commit 1f16f75
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/cider-completion.el b/cider-completion.el
@@ -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))))
     (add-to-list 'completion-category-overrides (apply #'list 'cider found-styles (when found-cycle
                                                                                     (list found-cycle))))))
 

diff --git a/test/cider-completion-tests.el b/test/cider-completion-tests.el
@@ -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)