[nongnu] elpa/sly 0470c02: Fix #473: Use vanilla completing-read

[ELPA Syncer]

branch: elpa/sly
commit 0470c0281498b9de072fcbf3718fc66720eeb3d0
Author: Theodor Thornhill <theo@thornhill.no>
Commit: João Távora <joaotavora@gmail.com>

    Fix #473: Use vanilla completing-read
    
    Close #475.
    
    Sly no longer wraps 'completing-read' to force ido to provide better
    UX.  This was interfering with completion frameworks that don't set
    the 'completing-read-function' such as 'vertico' and 'mct'.
    
    Co-authored-by: João Távora <joao.tavora@gmail.com>
    
    * lib/sly-messages.el (sly-completing-read): Remove wrapper function
    that only serves to force ido-completion
    
    * contrib/sly-mrepl.el (sly-mrepl-shortcut): Use vanilla completing-read
    * sly.el (sly-read-package-name): Use vanilla completing-read
    (sly--read-interactive-args): Use vanilla completing-read
    (sly-prompt-for-connection): Use vanilla completing-read
    (sly-switch-to-most-recent): Use vanilla completing-read
    (sly-info): Use vanilla completing-read
    (sly-db-invoke-restart-by-name): Use vanilla completing-read
    (sly-read-connection): Use vanilla completing-read
    (sly-read-inspector-name): Use vanilla completing-read
    (sly-contrib--read-contrib-name): Use vanilla completing-read
---
 NEWS.md              |  8 ++++++++
 contrib/sly-mrepl.el | 10 +++++-----
 lib/sly-messages.el  | 19 -------------------
 sly.el               | 32 ++++++++++++++++----------------
 4 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 1ad633f..d939e09 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,14 @@
 Upcoming version
 ----------------
 
+### Remove `sly-completing-read`
+
+SLY no longer bypasses `completing-read-function` to provide basic
+`ido` completion.  This used to make sense when fewer fancy
+well-behaved completion packages existed.  That's no longer the case
+so we shouldn't override the user's preference.
+
+
 SLY 1.0.42 (December 2020)
 ------------------------------
 
diff --git a/contrib/sly-mrepl.el b/contrib/sly-mrepl.el
index 6586b02..44d3223 100644
--- a/contrib/sly-mrepl.el
+++ b/contrib/sly-mrepl.el
@@ -1342,11 +1342,11 @@ When setting this variable outside of the Customize 
interface,
 
 (defun sly-mrepl-shortcut ()
   (interactive)
-  (let* ((string (sly-completing-read "Command: "
-                                      (mapcar #'car sly-mrepl-shortcut-alist)
-                                      nil 'require-match nil
-                                      'sly-mrepl-shortcut-history
-                                      (car sly-mrepl-shortcut-history)))
+  (let* ((string (completing-read "Command: "
+                                  (mapcar #'car sly-mrepl-shortcut-alist)
+                                  nil 'require-match nil
+                                  'sly-mrepl-shortcut-history
+                                  (car sly-mrepl-shortcut-history)))
          (command (and string
                        (cdr (assoc string sly-mrepl-shortcut-alist)))))
     (call-interactively command)))
diff --git a/lib/sly-messages.el b/lib/sly-messages.el
index 6957b86..d6b911f 100644
--- a/lib/sly-messages.el
+++ b/lib/sly-messages.el
@@ -81,25 +81,6 @@ SIT-FOR is has the semantincs of 
`minibuffer-message-timeout', which see."
                            (or (cl-position ?\n string) most-positive-fixnum)
                            (1- (window-width (minibuffer-window))))))
 
-(defun sly-completing-read (prompt choices &optional
-                                   predicate
-                                   require-match
-                                   initial-input
-                                   hist
-                                   def
-                                   inherit-input-method)
-  "Like `completing-read', but tweak `completing-read-function'.
-Specifically, if the `completion-read-function' has not been
-tweaked, and `icomplete-mode' is not being used, use
-`ido-completing-read' to provide a better UX."
-  (let ((completing-read-function
-         (if (and (eq completing-read-function 'completing-read-default)
-                  (not icomplete-mode))
-             #'ido-completing-read
-           completing-read-function)))
-    (completing-read prompt choices predicate require-match initial-input hist 
def
-                     inherit-input-method)))
-
 (defun sly-y-or-n-p (format-string &rest args)
   (let ((prompt (apply #'format (concat "[sly] "
                                         format-string)
diff --git a/sly.el b/sly.el
index a2a2ba4..76fe65d 100644
--- a/sly.el
+++ b/sly.el
@@ -843,7 +843,7 @@ move to make TARGET visible."
 If ALLOW-BLANK may return nil to signal no particular package
 selected."
   (let* ((completion-ignore-case t)
-         (res (sly-completing-read
+         (res (completing-read
                (concat "[sly] " prompt)
                (sly-eval
                 `(slynk:list-all-package-names t))
@@ -1130,7 +1130,7 @@ Helper for M-x sly"
                        (sly--guess-inferior-lisp-program t))
                     (list :program program :program-args args)))))
         ((eq current-prefix-arg '-)
-         (let ((key (sly-completing-read
+         (let ((key (completing-read
                      "Lisp name: " (mapcar (lambda (x)
                                              (list (symbol-name (car x))))
                                            sly-lisp-implementations)
@@ -2123,7 +2123,7 @@ Respect `sly-keep-buffers-on-connection-close'."
                                      connection-names)
                              connection-names))
          (connection-name (and connection-names
-                               (sly-completing-read
+                               (completing-read
                                 (or prompt "Connection: ")
                                 connection-names
                                 nil (not dont-require-match))))
@@ -2776,7 +2776,7 @@ Debugged requests are ignored."
 With prefix argument, prompt for MODE"
   (interactive
    (list (if current-prefix-arg
-             (intern (sly-completing-read
+             (intern (completing-read
                       "Switch to most recent buffer in what mode? "
                       (mapcar #'symbol-name '(lisp-mode
                                               emacs-lisp-mode))
@@ -4669,9 +4669,9 @@ TODO"
   (interactive
    (let ((file (sly-info--file)))
      (list file
-           (sly-completing-read "Manual node? (`Top' to read the whole 
manual): "
-                                (remove '("*") (sly-info--node-names file))
-                                nil t))))
+           (completing-read "Manual node? (`Top' to read the whole manual): "
+                            (remove '("*") (sly-info--node-names file))
+                            nil t))))
   (info (if node (format "(%s)%s" file node) file)))
 
 
@@ -6095,9 +6095,9 @@ Interactively get the number from a button at point."
 
 (defun sly-db-invoke-restart-by-name (restart-name)
   (interactive (list (let ((completion-ignore-case t))
-                       (sly-completing-read "Restart: " sly-db-restarts nil t
-                                            ""
-                                            'sly-db-invoke-restart-by-name))))
+                       (completing-read "Restart: " sly-db-restarts nil t
+                                        ""
+                                        'sly-db-invoke-restart-by-name))))
   (sly-db-invoke-restart (cl-position restart-name sly-db-restarts
                                       :test 'string= :key 'first)))
 
@@ -6151,8 +6151,8 @@ Return the net process, or nil."
                               (sly-connection-name p) (sly-pid p))))
          (candidates (mapcar (lambda (p) (cons (funcall to-string p) p))
                              sly-net-processes)))
-    (cdr (assoc (sly-completing-read prompt candidates
-                                     nil t (funcall to-string initial-value))
+    (cdr (assoc (completing-read prompt candidates
+                                 nil t (funcall to-string initial-value))
                 candidates))))
 
 (defun sly-db-step (frame-number)
@@ -6538,9 +6538,9 @@ was called originally."
                                      (eq major-mode 'sly-inspector-mode)))
                          when (buffer-local-value 'sly--this-inspector-name b)
                          collect it))
-         (result (sly-completing-read "Inspector name: " (cons "default"
-                                                               names)
-                                      nil nil nil nil "default")))
+         (result (completing-read "Inspector name: " (cons "default"
+                                                           names)
+                                  nil nil nil nil "default")))
     (unless (string= result "default")
       result)))
 
@@ -6996,7 +6996,7 @@ if/when you fix the error" (cl-third n))))
 (defun sly-contrib--read-contrib-name ()
   (let ((names (cl-loop for c in (sly-contrib--all-contribs) collect
                         (symbol-name (sly-contrib--name c)))))
-    (intern (sly-completing-read "Contrib: " names nil t))))
+    (intern (completing-read "Contrib: " names nil t))))
 
 (defun sly-enable-contrib (name)
   "Attempt to enable contrib NAME."