Skip to content

[Fix #828] Fix completion issues and don't forget current project directory in cider-connect #829

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
Sep 26, 2014
Merged

[Fix #828] Fix completion issues and don't forget current project directory in cider-connect #829

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions cider-util.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,15 @@ to `fill-column'."
"Join all STRINGS using SEPARATOR."
(mapconcat 'identity strings separator))

(defun cider-join-with-val-prop (candidates &optional sep)
"Each element EL in CANDIDATES join with SEP and set :val property to EL.
Useful for `completing-read' when candidates are complex objects."
(defun cider-join-into-alist (candidates &optional separator)
"Make an alist from CANDIDATES.
The keys are the elements joined with SEPARATOR and values are the original
elements. Useful for `completing-read' when candidates are complex
objects."
(mapcar (lambda (el)
(propertize (if (listp el)
(cider-string-join el (or sep ":"))
(format "%s" el))
:val el))
(if (listp el)
(cons (cider-string-join el (or separator ":")) el)
(cons el el)))
candidates))

(provide 'cider-util)
Expand Down
57 changes: 31 additions & 26 deletions cider.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ Create REPL buffer and start an nREPL client connection."
"Interactively select the host and port to connect to."
(let* ((ssh-hosts (cider--ssh-hosts))
(hosts (-distinct (append (when cider-host-history
(list (car cider-host-history )))
(list (list (car cider-host-history))))
(list (list (nrepl-current-host)))
cider-known-endpoints
ssh-hosts
Expand All @@ -159,17 +159,20 @@ Create REPL buffer and start an nREPL client connection."
(not (assoc-string host ssh-hosts))))
;; Each lein-port is a list of the form (dir port)
(lein-ports (if local-p
(let ((default-directory (if (file-remote-p default-directory)
"~/"
default-directory)))
(cider-locate-running-nrepl-ports))
(let ((vec (vector "ssh" nil host "" nil)))
;; might connect to localhost from a remote file
(let* ((change-dir-p (file-remote-p default-directory))
(default-directory (if change-dir-p "~/" default-directory)))
(cider-locate-running-nrepl-ports (unless change-dir-p default-directory)))
(let ((vec (vector "ssh" nil host "" nil))
;; might connect to a different remote
(dir (when (file-remote-p default-directory)
(with-parsed-tramp-file-name default-directory cur
(when (string= cur-host host) default-directory)))))
(tramp-maybe-open-connection vec)
(with-current-buffer (tramp-get-connection-buffer vec)
(cider-locate-running-nrepl-ports)))))
(cider-locate-running-nrepl-ports dir)))))
(ports (append (cdr sel-host) lein-ports))
(port (cider--completing-read-port host ports)))
(setq cider-host-history (cons sel-host (delete sel-host cider-host-history)))
(list host port)))

(defun cider--ssh-hosts ()
Expand All @@ -182,33 +185,35 @@ Create REPL buffer and start an nREPL client connection."
"Interactively select host from HOSTS.
Each element in HOSTS is one of: (host), (host port) or (label host port).
Return a list of the form (HOST PORT), where PORT can be nil."
(let* ((sel-host (completing-read "Host: " (cider-join-with-val-prop hosts)))
(host (or (get-text-property 1 :val sel-host) (list sel-host))))
(let* ((hosts (cider-join-into-alist hosts))
(sel-host (completing-read "Host: " hosts nil nil nil
'cider-host-history (caar hosts)))
(host (or (cdr (assoc sel-host hosts)) (list sel-host))))
;; remove the label
(if (= 3 (length host)) (cdr host) host)))

(defun cider--completing-read-port (host ports)
"Interactively select port for HOST from PORTS."
(let* ((sel-port (completing-read (format "Port for %s: " host)
(cider-join-with-val-prop ports)))
(port (or (get-text-property 1 :val sel-port) sel-port))
(let* ((ports (cider-join-into-alist ports))
(sel-port (completing-read (format "Port for %s: " host) ports
nil nil nil nil (caar ports)))
(port (or (cdr (assoc sel-port ports)) sel-port))
(port (if (listp port) (second port) port)))
(if (stringp port) (string-to-number port) port)))

(defun cider-locate-running-nrepl-ports ()
(defun cider-locate-running-nrepl-ports (&optional dir)
"Locate ports of running nREPL servers.
Return a list of list of the form (project-dir port)."
(let ((paths (cider--get-running-nrepl-paths)))
(delq nil
(mapcar (lambda (f)
(-when-let (port-file (or (cider--file-path (concat f "/.nrepl-port"))
(cider--file-path (concat f "/repl-port"))))
(with-temp-buffer
(insert-file-contents port-file)
(list (file-name-nondirectory f) (buffer-string)))))
paths))))

(defun cider--get-running-nrepl-paths ()
When DIR is non-nil also look for nREPL port files in DIR. Return a list
of list of the form (project-dir port)."
(let* ((paths (cider--running-nrepl-paths))
(proj-ports (mapcar (lambda (d)
(-when-let (port (and d (nrepl-extract-port (cider--file-path d))))
(list (file-name-nondirectory (directory-file-name d)) port)))
(cons (nrepl-project-directory-for dir)
paths))))
(-distinct (delq nil proj-ports))))

(defun cider--running-nrepl-paths ()
"Retrieve project paths of running nREPL servers.
use `cider-ps-running-nrepls-command' and `cider-ps-running-nrepl-path-regexp-list'."
(let (paths)
Expand Down
29 changes: 13 additions & 16 deletions nrepl-client.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,9 @@ Bind the value of the provided KEYS and execute BODY."

(defun nrepl-current-dir ()
"Return the directory of the current buffer."
(let ((file-name (buffer-file-name (current-buffer))))
(or (when file-name
(file-name-directory file-name))
list-buffers-directory)))
(or (-when-let (file-name (buffer-file-name (current-buffer)))
(file-name-directory file-name))
list-buffers-directory))

(defun nrepl-local-host-p (host)
"Return t if HOST is local."
Expand Down Expand Up @@ -284,21 +283,19 @@ If so ask the user for confirmation."
"An nREPL connection buffer already exists. Do you really want to create a new one? ")
t))

(defun nrepl-default-port ()
"Attempt to read port from .nrepl-port or target/repl-port.
Falls back to `nrepl-port' if not found."
(or (nrepl--port-from-file ".nrepl-port")
(nrepl--port-from-file "target/repl-port")
nrepl-port))
(defun nrepl-extract-port (&optional dir)
"Read port from .nrepl-port, nrepl-port or target/repl-port files in directory DIR."
(-when-let (dir (or dir (nrepl-project-directory-for (nrepl-current-dir))))
(or (nrepl--port-from-file (expand-file-name "repl-port" dir))
(nrepl--port-from-file (expand-file-name ".nrepl-port" dir))
(nrepl--port-from-file (expand-file-name "target/repl-port" dir)))))

(defun nrepl--port-from-file (file)
"Attempts to read port from a file named by FILE."
(let* ((dir (nrepl-project-directory-for (nrepl-current-dir)))
(f (expand-file-name file dir)))
(when (file-exists-p f)
(with-temp-buffer
(insert-file-contents f)
(buffer-string)))))
(when (file-exists-p file)
(with-temp-buffer
(insert-file-contents file)
(buffer-string))))


;;; nREPL dict
Expand Down