[#2203] Extract the find functionality in its own source file

This also allows to simply auto-load the find commands when they
are used for the first time.

cider-jump-to is moved to cider-common.el, as it has other uses,
apart from the ones in the various find commands.

1 files changed, 1 insertions, 194 deletions

diff --git a/cider-interaction.el b/cider-interaction.el
index 48f66966..8690b64e 100644
--- a/cider-interaction.el
+++ b/cider-interaction.el
@@ -180,200 +180,7 @@ When invoked with a prefix ARG the command doesn't prompt for confirmation."
   (when-let* ((error-win (get-buffer-window cider-error-buffer)))
     (quit-window nil error-win)))
 
-;;;
-(declare-function cider-mode "cider-mode")
-
-(defun cider-jump-to (buffer &optional pos other-window)
-  "Push current point onto marker ring, and jump to BUFFER and POS.
-POS can be either a number, a cons, or a symbol.
-If a number, it is the character position (the point).
-If a cons, it specifies the position as (LINE . COLUMN).  COLUMN can be nil.
-If a symbol, `cider-jump-to' searches for something that looks like the
-symbol's definition in the file.
-If OTHER-WINDOW is non-nil don't reuse current window."
-  (with-no-warnings
-    (ring-insert find-tag-marker-ring (point-marker)))
-  (if other-window
-      (pop-to-buffer buffer)
-    ;; like switch-to-buffer, but reuse existing window if BUFFER is visible
-    (pop-to-buffer buffer '((display-buffer-reuse-window display-buffer-same-window))))
-  (with-current-buffer buffer
-    (widen)
-    (goto-char (point-min))
-    (cider-mode +1)
-    (cond
-     ;; Line-column specification.
-     ((consp pos)
-      (forward-line (1- (or (car pos) 1)))
-      (if (cdr pos)
-          (move-to-column (cdr pos))
-        (back-to-indentation)))
-     ;; Point specification.
-     ((numberp pos)
-      (goto-char pos))
-     ;; Symbol or string.
-     (pos
-      ;; Try to find (def full-name ...).
-      (if (or (save-excursion
-                (search-forward-regexp (format "(def.*\\s-\\(%s\\)" (regexp-quote pos))
-                                       nil 'noerror))
-              (let ((name (replace-regexp-in-string ".*/" "" pos)))
-                ;; Try to find (def name ...).
-                (or (save-excursion
-                      (search-forward-regexp (format "(def.*\\s-\\(%s\\)" (regexp-quote name))
-                                             nil 'noerror))
-                    ;; Last resort, just find the first occurrence of `name'.
-                    (save-excursion
-                      (search-forward name nil 'noerror)))))
-          (goto-char (match-beginning 0))
-        (message "Can't find %s in %s" pos (buffer-file-name))))
-     (t nil))))
-
-(defun cider-find-dwim-other-window (symbol-file)
-  "Jump to SYMBOL-FILE at point, place results in other window."
-  (interactive (cider--find-dwim-interactive "Jump to: "))
-  (cider--find-dwim symbol-file 'cider-find-dwim-other-window t))
-
-(defun cider-find-dwim (symbol-file)
-  "Find and display the SYMBOL-FILE at point.
-SYMBOL-FILE could be a var or a resource.  If thing at point is empty then
-show dired on project.  If var is not found, try to jump to resource of the
-same name.  When called interactively, a prompt is given according to the
-variable `cider-prompt-for-symbol'.  A single or double prefix argument
-inverts the meaning.  A prefix of `-' or a double prefix argument causes
-the results to be displayed in a different window.  A default value of thing
-at point is given when prompted."
-  (interactive (cider--find-dwim-interactive "Jump to: "))
-  (cider--find-dwim symbol-file `cider-find-dwim
-                    (cider--open-other-window-p current-prefix-arg)))
-
-(defun cider--find-dwim (symbol-file callback &optional other-window)
-  "Find the SYMBOL-FILE at point.
-CALLBACK upon failure to invoke prompt if not prompted previously.
-Show results in a different window if OTHER-WINDOW is true."
-  (if-let* ((info (cider-var-info symbol-file)))
-      (cider--jump-to-loc-from-info info other-window)
-    (progn
-      (cider-ensure-op-supported "resource")
-      (if-let* ((resource (cider-sync-request:resource symbol-file))
-                (buffer (cider-find-file resource)))
-          (cider-jump-to buffer 0 other-window)
-        (if (cider--prompt-for-symbol-p current-prefix-arg)
-            (error "Resource or var %s not resolved" symbol-file)
-          (let ((current-prefix-arg (if current-prefix-arg nil '(4))))
-            (call-interactively callback)))))))
-
-(defun cider--find-dwim-interactive (prompt)
-  "Get interactive arguments for jump-to functions using PROMPT as needed."
-  (if (cider--prompt-for-symbol-p current-prefix-arg)
-      (list
-       (cider-read-from-minibuffer prompt (thing-at-point 'filename)))
-    (list (or (thing-at-point 'filename) ""))))  ; No prompt.
-
-(defun cider-find-resource (path)
-  "Find the resource at PATH.
-Prompt for input as indicated by the variable `cider-prompt-for-symbol'.
-A single or double prefix argument inverts the meaning of
-`cider-prompt-for-symbol'.  A prefix argument of `-` or a double prefix
-argument causes the results to be displayed in other window.  The default
-value is thing at point."
-  (interactive
-   (list
-    (if (cider--prompt-for-symbol-p current-prefix-arg)
-        (completing-read "Resource: "
-                         (cider-sync-request:resources-list)
-                         nil nil
-                         (thing-at-point 'filename))
-      (or (thing-at-point 'filename) ""))))
-  (cider-ensure-op-supported "resource")
-  (when (= (length path) 0)
-    (error "Cannot find resource for empty path"))
-  (if-let* ((resource (cider-sync-request:resource path))
-            (buffer (cider-find-file resource)))
-      (cider-jump-to buffer nil (cider--open-other-window-p current-prefix-arg))
-    (if (cider--prompt-for-symbol-p current-prefix-arg)
-        (error "Cannot find resource %s" path)
-      (let ((current-prefix-arg (cider--invert-prefix-arg current-prefix-arg)))
-        (call-interactively `cider-find-resource)))))
-
-(defun cider--invert-prefix-arg (arg)
-  "Invert the effect of prefix value ARG on `cider-prompt-for-symbol'.
-This function preserves the `other-window' meaning of ARG."
-  (let ((narg (prefix-numeric-value arg)))
-    (pcase narg
-      (16 -1)   ; empty empty -> -
-      (-1 16)   ; - -> empty empty
-      (4 nil)   ; empty -> no-prefix
-      (_ 4)))) ; no-prefix -> empty
-
-(defun cider--prefix-invert-prompt-p (arg)
-  "Test prefix value ARG for its effect on `cider-prompt-for-symbol`."
-  (let ((narg (prefix-numeric-value arg)))
-    (pcase narg
-      (16 t) ; empty empty
-      (4 t)  ; empty
-      (_ nil))))
-
-(defun cider--prompt-for-symbol-p (&optional prefix)
-  "Check if cider should prompt for symbol.
-Tests againsts PREFIX and the value of `cider-prompt-for-symbol'.
-Invert meaning of `cider-prompt-for-symbol' if PREFIX indicates it should be."
-  (if (cider--prefix-invert-prompt-p prefix)
-      (not cider-prompt-for-symbol) cider-prompt-for-symbol))
-
-(defun cider--find-ns (ns &optional other-window)
-  "Find the file containing NS's definition.
-Optionally open it in a different window if OTHER-WINDOW is truthy."
-  (if-let* ((path (cider-sync-request:ns-path ns)))
-      (cider-jump-to (cider-find-file path) nil other-window)
-    (user-error "Can't find namespace `%s'" ns)))
-
-(defun cider-find-ns (&optional arg ns)
-  "Find the file containing NS.
-A prefix ARG of `-` or a double prefix argument causes
-the results to be displayed in a different window."
-  (interactive "P")
-  (cider-ensure-connected)
-  (cider-ensure-op-supported "ns-path")
-  (if ns
-      (cider--find-ns ns)
-    (let* ((namespaces (cider-sync-request:ns-list))
-           (ns (completing-read "Find namespace: " namespaces)))
-      (cider--find-ns ns (cider--open-other-window-p arg)))))
-
-(defun cider-find-keyword (&optional arg)
-  "Find the namespace of the keyword at point and its first occurrence there.
-
-For instance - if the keyword at point is \":cider.demo/keyword\", this command
-would find the namespace \"cider.demo\" and afterwards find the first mention
-of \"::keyword\" there.
-
-Prompt according to prefix ARG and `cider-prompt-for-symbol'.
-A single or double prefix argument inverts the meaning of
-`cider-prompt-for-symbol'.  A prefix of `-` or a double prefix argument causes
-the results to be displayed in a different window.  The default value is
-thing at point."
-  (interactive "P")
-  (cider-ensure-connected)
-  (let* ((kw (let ((kw-at-point (cider-symbol-at-point 'look-back)))
-               (if (or cider-prompt-for-symbol arg)
-                   (read-string
-                    (format "Keyword (default %s): " kw-at-point)
-                    nil nil kw-at-point)
-                 kw-at-point)))
-         (ns-qualifier (and
-                        (string-match "^:+\\(.+\\)/.+$" kw)
-                        (match-string 1 kw)))
-         (kw-ns (if ns-qualifier
-                    (cider-resolve-alias (cider-current-ns) ns-qualifier)
-                  (cider-current-ns)))
-         (kw-to-find (concat "::" (replace-regexp-in-string "^:+\\(.+/\\)?" "" kw))))
-
-    (when (and ns-qualifier (string= kw-ns (cider-current-ns)))
-      (error "Could not resolve alias `%s' in `%s'" ns-qualifier (cider-current-ns)))
-    (cider--find-ns kw-ns arg)
-    (search-forward-regexp kw-to-find nil 'noerror)))
-
+;;; Eval
 (defun cider-insert-eval-handler (&optional buffer)
   "Make an nREPL evaluation handler for the BUFFER.
 The handler simply inserts the result value in BUFFER."