Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions extensions/lisp-mode/lisp-mode.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
(define-key *lisp-mode-keymap* "C-c g" 'lisp-interrupt)
(define-key *lisp-mode-keymap* "C-c C-q" 'lisp-quickload)
(define-key *lisp-mode-keymap* "Return" 'newline-and-indent)
(define-key *lisp-mode-keymap* "C-c C-j" 'lisp-eval-expression-in-repl)

(defmethod convert-modeline-element ((element (eql 'lisp-mode)) window)
(format nil " ~A~A" (buffer-package (window-buffer window) "CL-USER")
Expand Down Expand Up @@ -737,6 +738,16 @@
(scan-lists end 1 0)
(lisp-compile-region start end))))

(define-command lisp-eval-expression-in-repl () ()
(check-connection)
(with-point ((point (current-point)))
(top-of-defun-with-annotation point)
(with-point ((start point)
(end point))
(scan-lists end 1 0)
(send-string-to-listener (points-to-string start end)
(buffer-package (current-buffer))))))

(defun form-string-at-point ()
(with-point ((point (current-point)))
(skip-chars-backward point #'syntax-symbol-char-p)
Expand Down
12 changes: 7 additions & 5 deletions extensions/lisp-mode/repl.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,13 @@
string
(string #\newline))))))

(defun send-string-to-listener (string)
(lisp-switch-to-repl-buffer)
(buffer-end (current-point))
(insert-string (current-point) string)
(lem/listener-mode:listener-return))
(defun send-string-to-listener (string &optional package-name)
(with-current-window (current-window)
(lisp-switch-to-repl-buffer)
(buffer-end (current-point))
(when package-name (lisp-set-package package-name))
(insert-string (current-point) string)
(lem/listener-mode:listener-return)))

(define-command start-lisp-repl (&optional (use-this-window nil)) (:universal-nil)
(check-connection)
Expand Down