haskal
/
utop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for Reason 

Include the necessary hooks for phrase detection in Reason.
This commit is contained in:
Andrea Richiardi 2017-04-24 10:21:53 -07:00 committed by Jérémie Dimino
parent fa27469e60
commit ea49d8e947
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/top/utop.el
View File

@ -242,6 +242,7 @@ list of 3 function symbols: (tuareg-symbol typerex-symbol caml-symbol)."
((eq major-mode 'tuareg-mode ) (nth 0 choices)) ((eq major-mode 'tuareg-mode ) (nth 0 choices))
((eq major-mode 'typerex-mode ) (nth 1 choices)) ((eq major-mode 'typerex-mode ) (nth 1 choices))
((eq major-mode 'caml-mode ) (nth 2 choices)) ((eq major-mode 'caml-mode ) (nth 2 choices))
((eq major-mode 'reason-mode ) (nth 3 choices))
(t (error (format "utop doesn't support the major mode \"%s\". It (t (error (format "utop doesn't support the major mode \"%s\". It
supports caml, tuareg and typerex modes by default. For other supports caml, tuareg and typerex modes by default. For other
modes you need to set these variables: modes you need to set these variables:
@ -255,13 +256,15 @@ modes you need to set these variables:
(funcall (funcall
(utop-compat-resolve '(tuareg-next-phrase (utop-compat-resolve '(tuareg-next-phrase
typerex-skip-to-end-of-phrase typerex-skip-to-end-of-phrase
caml-skip-to-end-of-phrase)))) caml-skip-to-end-of-phrase
reason-next-phrase))))
(defun utop-compat-discover-phrase () (defun utop-compat-discover-phrase ()
(funcall (funcall
(utop-compat-resolve '(tuareg-discover-phrase (utop-compat-resolve '(tuareg-discover-phrase
typerex-discover-phrase typerex-discover-phrase
caml-discover-phrase)))) caml-find-phrase
reason-discover-phrase))))
;; +-----------------------------------------------------------------+ ;; +-----------------------------------------------------------------+
;; | Compability with previous emacs version | ;; | Compability with previous emacs version |
@ -850,9 +853,9 @@ If ADD-TO-HISTORY is t then the input will be added to history."
(utop-prepare-for-eval) (utop-prepare-for-eval)
(let ((end)) (let ((end))
(save-excursion (save-excursion
(let ((pair (funcall utop-discover-phrase))) (let ((triple (funcall utop-discover-phrase)))
(setq end (nth 2 pair)) (setq end (nth 2 triple))
(utop-eval (nth 0 pair) (nth 1 pair)))) (utop-eval (nth 0 triple) (nth 1 triple))))
(when utop-skip-after-eval-phrase (when utop-skip-after-eval-phrase
(goto-char end) (goto-char end)
(funcall utop-next-phrase-beginning)))) (funcall utop-next-phrase-beginning))))