feature/eval: rewrite module

modules/feature/eval/autoload/build.el

@@ -1,13 +1,31 @@
-;;; feature/repl/autoload/build.el
+;;; feature/eval/autoload/build.el
 
-;; TODO
+(defvar-local +eval-last-builder nil
+  "The last builder run in the current buffer.")
+
+(defun +eval--read-builder ()
+  (let ((builders (cl-remove-if-not
+                   (lambda (plist)
+                     (when-let (pred (plist-get (cdr plist) :when))
+                       (eval pred)))
+                   (cdr (assq major-mode +eval-builders)))))
+    (completing-read
+     "Build: "
+     (mapcar 'car builders)
+     nil t)))
 
 ;;;###autoload
-(defun +eval/build ())
+(defun +eval/build (&optional builder)
+  (interactive (list (+eval--read-builder)))
+  (unless builder
+    (error "No builder for this buffer"))
+  (let ((desc (assq builder (assq major-mode +eval-builders))))
+    (unless desc
+      (error "Builder not found in registered builders"))
+    (message "Running %s" builder)))
 
 ;;;###autoload
-(defun +eval/rebuild ())
-
-;;;###autoload
-(defun +eval-get-builder ())
+(defun +eval/rebuild (&optional builder)
+  (interactive (list +eval-last-builder))
+  (+eval/build +eval-last-builder))
 

modules/feature/eval/autoload/eval.el

@@ -1,15 +1,15 @@
-;;; feature/repl/autoload/eval.el
+;;; feature/eval/autoload/eval.el
 
 ;;;###autoload
-(defun +repl/eval-buffer ()
+(defun +eval/buffer ()
   "Evaluate the whole buffer."
   (interactive)
   (cond ((eq major-mode 'emacs-lisp-mode)
-         (+repl/eval-region (point-min) (point-max)))
+         (+eval/region (point-min) (point-max)))
         (t (quickrun))))
 
 ;;;###autoload
-(defun +repl/eval-region (beg end)
+(defun +eval/region (beg end)
   "Evaluate a region and, if large enough, prints its output to a popup buffer (if an
 elisp buffer). Otherwise forward the region to Quickrun."
   (interactive "r")
@@ -24,8 +24,8 @@ elisp buffer). Otherwise forward the region to Quickrun."
                  (read-only-mode -1)
                  (setq-local scroll-margin 0)
                  (erase-buffer)
+                 (set-syntax-table emacs-lisp-mode-syntax-table)
                  (prin1 result buf)
-                 (emacs-lisp-mode)
                  (pp-buffer)
                  (read-only-mode 1)
                  (setq lines (count-lines (point-min) (point-max)))
@@ -38,7 +38,7 @@ elisp buffer). Otherwise forward the region to Quickrun."
           (t (quickrun-region beg end)))))
 
 ;;;###autoload
-(defun +repl/eval-region-and-replace (beg end)
+(defun +eval/region-and-replace (beg end)
   (interactive "r")
   (cond ((eq major-mode 'emacs-lisp-mode)
          (kill-region beg end)

modules/feature/eval/autoload/evil.el

@@ -1,14 +1,14 @@
 ;;; feature/eval/autoload/evil.el
 
-;;;###autoload (autoload '+repl:eval-region "feature/eval/autoload/evil" nil t)
-(evil-define-operator +repl:eval-region (beg end)
+;;;###autoload (autoload '+eval:region "feature/eval/autoload/evil" nil t)
+(evil-define-operator +eval:region (beg end)
+  "Send region to the currently open repl, if available."
   :move-point nil
   (interactive "<r>")
-  (+repl/eval-region beg end))
+  (+eval/region beg end))
 
-;;;###autoload (autoload '+repl:eval-region-and-replace "feature/eval/autoload/evil" nil t)
-(evil-define-operator +repl:eval-region-and-replace (beg end)
+;;;###autoload (autoload '+eval:replace-region "feature/eval/autoload/evil" nil t)
+(evil-define-operator +eval:replace-region (beg end)
   :move-point nil
   (interactive "<r>")
-  (+repl/eval-region-and-replace beg end))
-
+  (+eval/region-and-replace beg end))

modules/feature/eval/autoload/repl.el

@@ -1,45 +1,30 @@
-;;; feature/repl/autoload/repl.el
+;;; feature/eval/autoload/repl.el
+
+(defvar +eval-last-repl-buffer nil
+  "The buffer of the last open repl.")
 
 ;;;###autoload
-(defun +repl/open ()
+(defun +eval/repl ()
+  "Open the REPL associated with the current major-mode. If selection is active,
+send region to repl."
   (interactive)
-  ;; TODO
-  (error "Not implemented"))
+  (when-let (command (cdr (assq major-mode +eval-repls)))
+    (let ((repl-buffer (save-window-excursion (funcall command))))
+      (unless (bufferp repl-buffer)
+        (error "REPL command didn't return a buffer"))
+      (with-current-buffer repl-buffer (+eval-repl-mode +1))
+      (setq +eval-last-repl-buffer repl-buffer)
+      (doom-popup-buffer repl-buffer))))
 
 ;;;###autoload
-(defun +repl/send ()
-  (interactive)
-  ;; TODO
-  (error "Not implemented"))
+(defun +eval/repl-send-region (beg end &optional inhibit-run-p)
+  "Send a selection to the REPL."
+  (interactive "r")
+  (when +eval-last-repl-buffer
+    (let ((selection (buffer-substring-no-properties beg end)))
+      (select-window (get-buffer-window +eval-last-repl-buffer))
+      (goto-char (point-max))
+      (insert selection)
+      (when (and (featurep 'evil) evil-mode)
+        (evil-change-state 'insert)))))
 
-;;;###autoload (autoload '+repl:open "feature/repl/autoload/repl" nil t)
-;;;###autoload (autoload '+repl:send "feature/repl/autoload/repl" nil t)
-
-(after! evil
-  (evil-define-command +repl:open (&optional bang command)
-    :repeat nil
-    (interactive "<!><a>")
-    (if (and doom-repl-buffer (buffer-live-p doom-repl-buffer))
-        (doom-popup-buffer doom-repl-buffer)
-      (rtog/toggle-repl (if (use-region-p) 4))
-      (setq doom-repl-buffer (current-buffer))
-      (when command
-        (with-current-buffer doom-repl-buffer
-          (insert command)
-          (unless bang (comint-send-input))))))
-
-  (evil-define-operator +repl:eval (&optional beg end bang)
-    :type inclusive :repeat nil
-    (interactive "<r><!>")
-    (let ((region-p (use-region-p))
-          (selection (s-trim (buffer-substring-no-properties beg end))))
-      (doom:repl bang)
-      (when (and region-p beg end)
-        (let* ((buf doom-repl-buffer)
-               (win (get-buffer-window buf)))
-          (unless (eq buf (doom-popup-p (get-buffer-window buf)))
-            (doom-popup-buffer buf))
-          (when (and doom-repl-buffer (buffer-live-p doom-repl-buffer))
-            (with-current-buffer doom-repl-buffer
-              (goto-char (point-max))
-              (insert selection))))))))