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

utop.el: always insert phrase terminator at the end-ish of input (#402) 

* utop.el: always insert phrase terminator at the end-ish of input

When point is at the letter "n" in

utop[1]> let thi[n]g = 42

or in

utop[2]> let thi[n]g = 8734;

and the user presses C-j, it is always because they want to terminate
the expression at the end-ish of the input.

The unpatched behavior did not move point, and inserted two semicolons
in the middle of the expression.
This commit is contained in:
Brian Leung 2022-11-02 17:27:07 -07:00 committed by GitHub
parent bbd9a6ed45
commit 0cb4ffe584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/uTop.mli
View File

@ -102,8 +102,7 @@ val set_margin_function : (LTerm_geom.size -> int option) -> unit
*) *)
val phrase_terminator : string signal val phrase_terminator : string signal
(** The phrase terminator. It is ";;" by default and ";" when you (** The phrase terminator, ";;". *)
use revised syntax. *)
val get_phrase_terminator : unit -> string val get_phrase_terminator : unit -> string
(** Returns the value of {!phrase_terminator}. *) (** Returns the value of {!phrase_terminator}. *)

18
src/top/utop.el
View File

@ -486,14 +486,10 @@ it is started."
(defun utop-insert-phrase-terminator () (defun utop-insert-phrase-terminator ()
"Insert the phrase terminator at the end of buffer." "Insert the phrase terminator at the end of buffer."
;; Search the longest suffix of the input which is a prefix of the (re-search-forward ";*[ \t\n\r]*\\'")
;; phrase terminator (goto-char (match-beginning 0))
(let* ((end (point-max)) (unless (looking-at-p ";;")
(pos (max utop-prompt-max (- end (length utop-phrase-terminator))))) (insert ";;")))
(while (not (string-prefix-p (buffer-substring-no-properties pos end) utop-phrase-terminator))
(setq pos (1+ pos)))
;; Insert only the missing part
(insert (substring utop-phrase-terminator (- end pos)))))
(defun utop-process-line (line) (defun utop-process-line (line)
"Process one line from the utop sub-process." "Process one line from the utop sub-process."
@ -653,8 +649,8 @@ If ALLOW-INCOMPLETE is non-nil and the phrase is not terminated,
then a newline character will be inserted and edition will then a newline character will be inserted and edition will
continue. continue.
If AUTO-END is non-nill then ALLOW-INCOMPLETE is ignored and a If AUTO-END is non-nil then ALLOW-INCOMPLETE is ignored and the
phrase terminator (;; or ; if using revised syntax) will be phrase terminator (;;) will be
automatically inserted by utop. automatically inserted by utop.
If ADD-TO-HISTORY is t then the input will be added to history." If ADD-TO-HISTORY is t then the input will be added to history."
@ -842,7 +838,7 @@ If ADD-TO-HISTORY is t then the input will be added to history."
"Go to the beginning of line or to the end of the prompt." "Go to the beginning of line or to the end of the prompt."
(interactive) (interactive)
(with-current-buffer utop-buffer-name (with-current-buffer utop-buffer-name
(if (= (point-at-bol) utop-prompt-min) (if (= (line-beginning-position) utop-prompt-min)
(goto-char utop-prompt-max) (goto-char utop-prompt-max)
(move-beginning-of-line 1)))) (move-beginning-of-line 1))))