Skip to content
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

Fix toggle connections #1920

Closed
wants to merge 5 commits into from
Closed

Fix toggle connections #1920

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3713ebb
Derive clojure interaction mode from clojurec mode
Jan 12, 2017
eaf16d8
For connection type of cljc, return the first connection
Jan 12, 2017
9412064
Rotate connection order per buffer to toggle connection
Jan 12, 2017
bbdbf91
Add to bugs fixed
Jan 12, 2017
6788bac
Use cdr instead of rest
Jan 13, 2017
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
16 changes: 11 additions & 5 deletions cider-client.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,9 @@ such a link cannot be established automatically."
"Toggles the current buffer's connection between Clojure and ClojureScript."
(interactive)
(cider-ensure-connected)
(let ((other-conn (cider-other-connection)))
(if other-conn
(setq-local cider-connections (list other-conn))
(user-error "No other connection available"))))
(when-let ((conns (cider-connections)))
(setq-local cider-connections (append (rest conns) (list (car conns))))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd simply use cons here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's an odd change, btw - you need to make the other connection the default for this buffer (that's why the command is named toogle-connection. Your change simply rotates the connection...

(message "Repl type default set to: %s" (cider--connection-type (car (cider-connections))))))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Repl -> Connection

cider-connections -> conns


(defun cider-clear-buffer-local-connection ()
"Remove association between the current buffer and a connection."
Expand All @@ -224,6 +223,8 @@ such a link cannot be established automatically."
(defun cider-connection-type-for-buffer ()
"Return the matching connection type (clj or cljs) for the current buffer."
(cond
;; cljc mode must be first as it derives from clj mode
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same applies for clojurescript-mode. :-)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clj mode -> clojure-mode

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cljc mode -> clojurec-mode

((derived-mode-p 'clojurec-mode) "cljc")
((derived-mode-p 'clojurescript-mode) "cljs")
((derived-mode-p 'clojure-mode) "clj")
(cider-repl-type)
Expand Down Expand Up @@ -272,7 +273,12 @@ at all."
(guessed-type (or type (cider-connection-type-for-buffer))))
;; So we have multiple connections. Look for the connection type we
;; want, prioritizing the current project.
(or (seq-find (lambda (conn)

;; when cljc buffer, use the first connection (you can rotate this
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot a closing paren here.

;; to set priority
(or (when (string= "cljc" guessed-type)
(car connections))
(seq-find (lambda (conn)
(equal (cider--connection-type conn) guessed-type))
project-connections)
(seq-find (lambda (conn)
Expand Down
2 changes: 1 addition & 1 deletion cider-scratch.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
(or (get-buffer cider-scratch-buffer-name)
(cider-create-scratch-buffer)))

(define-derived-mode cider-clojure-interaction-mode clojure-mode "Clojure Interaction"
(define-derived-mode cider-clojure-interaction-mode clojurec-mode "Clojure Interaction"
"Major mode for typing and evaluating Clojure forms.
Like clojure-mode except that \\[cider-eval-print-last-sexp] evals the Lisp expression
before point, and prints its value into the buffer, advancing point.
Expand Down