Merge pull request #1082 from clojure-emacs/remove-cider-load-fn-into-repl-buffer

[Fix #1078] Remove cider-load-fn-into-repl-buffer

Author: bbatsov

CHANGELOG.md

@@ -40,12 +40,13 @@
 * [#1032](https://github.com/clojure-emacs/cider/issues/1032) New functions, `cider-find-dwim` and
   `cider-find-dwim-other-window`. These functions combine the functionality of `cider-jump-to-var` and
   `cider-jump-to-resource`. Which are now renamed to `cider-find-var` and `cider-find-resource` respectively.
-* [#1014](https://github.com/clojure-emacs/cider/issues/1014) A prefix of <kbd>-</kbd> causes `cider-find-var` and 
+* [#1014](https://github.com/clojure-emacs/cider/issues/1014) A prefix of <kbd>-</kbd> causes `cider-find-var` and
   `cider-find-resource` to show results in other window. Additionally, a double prefix argument <kbd>C-u C-u</kbd>
   inverts the meaning of `cider-prompt-for-symbol` and shows the results in other window.
 
 ### Changes
 
+* [#1078] Removed `cider-load-fn-into-repl-buffer`, bound to `C-c M-f` in the repl.
 * [#1019](https://github.com/clojure-emacs/cider/pull/1019):
   <kbd>C-u C-M-x</kbd> no longer does `eval-defun`+print-result. Instead it debugs the form at point.
 * [#854](https://github.com/clojure-emacs/cider/pull/854) Error navigation now

README.md

@@ -792,7 +792,6 @@ Keyboard shortcut                    | Description
 <kbd>C-c C-d a</kbd> | Apropos search for functions/vars.
 <kbd>C-c C-d A</kbd> | Apropos search for documentation.
 <kbd>C-c C-z</kbd> | Switch to the previous Clojure buffer. This complements <kbd>C-c C-z</kbd> used in cider-mode.
-<kbd>C-c M-f</kbd> | Select a function from the current namespace and insert into the REPL buffer.
 <kbd>C-c M-i</kbd> | Inspect expression. Will act on expression at point if present.
 <kbd>C-c M-n</kbd> | Select a namespace and switch to it.
 <kbd>C-c M-t v</kbd> | Toggle var tracing.

cider-interaction.el

@@ -1848,71 +1848,6 @@ For example \"foo.bar.tar\" -> \"foo.bar\"."
 
 ;;; Completion
 
-(defun cider-completing-read-var-select (prompt callback ns selected targets)
-  "Peform completing read using SELECTED and TARGETS.
-If SELECTED is \"..\" then another selection is made for vars in the parent namespace of
-NS using PROMPT.
-If SELECTED is a namespace then another selection is made against that namespace
-using PROMPT.
-Once a selecton is made CALLBACK is called with SELECTED."
-  ;; TODO: immediate RET gives "" as selected for some reason
-  ;; this is an OK workaround though
-  (cond ((equal "" selected)
-         (cider-completing-read-var-select prompt callback ns (car targets) targets))
-        ((equal "/" (substring selected -1)) ; selected a namespace
-         (cider-completing-read-var prompt (substring selected 0 -1) callback))
-        ((equal ".." selected)
-         (cider-completing-read-var prompt (cider-parent-ns ns) callback))
-        ;; non ido variable selection techniques don't return qualified symbols, so this shouldn't either
-        (t (funcall callback selected))))
-
-(defun cider-completing-read-sym-handler (label completing-read-callback buffer)
-  "Create an nrepl response handler for BUFFER.
-The handler will parse the response from nrepl to create targets for a completing read.
-The result of the completing read will be passed to COMPLETING-READ-CALLBACK."
-  (nrepl-make-response-handler buffer
-                               (lambda (buffer value)
-                                 ;; make sure to eval the callback in the buffer that the symbol was requested from so we get the right namespace
-                                 (with-current-buffer buffer
-                                   (let* ((targets (car (read-from-string value)))
-                                          (selected (completing-read label targets nil t)))
-                                     (funcall completing-read-callback selected targets))))
-                               nil nil nil))
-
-(defun cider-completing-read-sym-form (label form callback)
-  "Eval the FORM and pass the result to the response handler."
-  (cider-tooling-eval form (cider-completing-read-sym-handler label callback (current-buffer))))
-
-(defun cider-completing-read-var (prompt ns callback)
-  "Perform completing read var in NS using CALLBACK."
-  (cider-completing-read-sym-form prompt (prin1-to-string (cider-fetch-vars-form ns))
-                                  (lambda (selected targets)
-                                    (cider-completing-read-var-select prompt callback ns selected targets))))
-
-(defun cider-fetch-fns-form (ns)
-  "Construct a Clojure form for reading fns using supplied NS."
-  (format "(let [fn-pred (fn [[k v]] (and (fn? (.get v))
-                                     (not (re-find #\"clojure.\" (str v)))))]
-              (sort
-                (map (comp name key)
-                     (filter fn-pred
-                         (concat
-                           (ns-interns '%s)
-                           (ns-refers '%s))))))" ns ns))
-
-(defun cider-load-fn-into-repl-buffer ()
-  "Browse functions available in current repl buffer.
-Once selected, the name of the fn will appear in the repl buffer in parens
-ready to call."
-  (interactive)
-  (let ((ns (cider-current-ns)))
-    (cider-completing-read-sym-form (format "Fn: %s/" ns)
-                                    (cider-fetch-fns-form ns)
-                                    (lambda (f _targets)
-                                      (with-current-buffer (cider-current-repl-buffer)
-                                        (cider-repl--replace-input (format "(%s)" f))
-                                        (goto-char (- (point-max) 1)))))))
-
 (defun cider-read-symbol-name (prompt callback)
   "Read a symbol name using PROMPT with a default of the one at point.
 Use CALLBACK as the completing read var callback."

cider-repl.el

@@ -1029,7 +1029,6 @@ constructs."
     (define-key map (kbd "C-c M-m") 'cider-macroexpand-all)
     (define-key map (kbd "C-c C-z") 'cider-switch-to-last-clojure-buffer)
     (define-key map (kbd "C-c M-s") 'cider-selector)
-    (define-key map (kbd "C-c M-f") 'cider-load-fn-into-repl-buffer)
     (define-key map (kbd "C-c C-q") 'cider-quit)
     (define-key map (kbd "C-c M-i") 'cider-inspect)
     (define-key map (kbd "C-c M-t v") 'cider-toggle-trace-var)