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

Merge pull request #352 from chripell/fix-emacs-completion 

Fix emacs completion returning bogus candidates.
This commit is contained in:
Rudi Grinberg 2021-06-07 12:41:30 -07:00 committed by GitHub
parent 10502c50a0 ec469bb839
commit bac3946079
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/top/utop.el
View File

@ -175,6 +175,9 @@ This hook is only run if exiting actually kills the buffer."
(defvar utop-completion nil (defvar utop-completion nil
"Current completion.") "Current completion.")
(defvar utop-completion-prefixes nil
"Prefixes for current completion.")
(defvar utop-inhibit-check nil (defvar utop-inhibit-check nil
"When set to a non-nil value, always insert text, even if it is "When set to a non-nil value, always insert text, even if it is
before the end of prompt.") before the end of prompt.")
@ -645,7 +648,11 @@ it is started."
(setq utop-completion nil)) (setq utop-completion nil))
;; A new possible completion ;; A new possible completion
("completion" ("completion"
(push argument utop-completion)) (catch 'done
(dolist (prefix utop-completion-prefixes)
(when (string-prefix-p prefix argument)
(push argument utop-completion)
(throw 'done t)))))
;; End of completion ;; End of completion
("completion-stop" ("completion-stop"
(utop-set-state 'edit) (utop-set-state 'edit)
@ -757,6 +764,9 @@ If ADD-TO-HISTORY is t then the input will be added to history."
(if (utop--supports-company) (if (utop--supports-company)
"complete-company:\n" "complete-company:\n"
"complete:\n")) "complete:\n"))
;; Keep track of the prefixes, so we can avoid returning
;; completion which don't have a match.
(setq utop-completion-prefixes lines)
(dolist (line lines) (dolist (line lines)
;; Send the line ;; Send the line
(utop-send-string (concat "data:" line "\n"))) (utop-send-string (concat "data:" line "\n")))