Skip to content

Better interactive backward-kill-word #1680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Better interactive backward-kill-word #1680

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
575f504
add haskell-interactive-mode-backward-kill-word
Oct 26, 2019
2ff8709
add brief docstring
Oct 26, 2019
b262b2c
remap backward-kill-word instead of providing explicit keys
Oct 26, 2019
0c4fa9b
kill line instead of just moving to bol
Oct 26, 2019
4d7ac23
fix unused variable issue
Oct 26, 2019
c47a3c2
check if on prompt line, and don't erase content ahead of point
Oct 26, 2019
e706529
add universal argument support
Oct 26, 2019
9438379
add back docstring
Oct 26, 2019
480da36
fix CI issue
Oct 26, 2019
7008870
refactor and handle non-whitespace between prompt and point
Oct 27, 2019
035e06e
get rid of unnecessary progn
Oct 27, 2019
ede42af
fix unnecessary beginning of line code
Oct 27, 2019
7697905
remove unused local variable
Oct 27, 2019
90129f1
fix unbound variable, add newline to regexp
Oct 29, 2019
fdc174a
simplify regex
Oct 29, 2019
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
31 changes: 31 additions & 0 deletions haskell-interactive-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ interference with prompts that look like haskell expressions."
(define-key map (kbd "C-j") 'haskell-interactive-mode-newline-indent)
(define-key map [remap move-beginning-of-line] 'haskell-interactive-mode-bol)
(define-key map (kbd "<home>") 'haskell-interactive-mode-beginning)
(define-key map [remap backward-kill-word] 'haskell-interactive-mode-backward-kill-word)
(define-key map (kbd "C-c C-k") 'haskell-interactive-mode-clear)
(define-key map (kbd "C-c C-c") 'haskell-process-interrupt)
(define-key map (kbd "C-c C-f") 'next-error-follow-minor-mode)
Expand Down Expand Up @@ -175,6 +176,36 @@ be nil.")
(kill-region haskell-interactive-mode-prompt-start
(line-end-position)))

(defun haskell-interactive-mode-backward-kill-word (n)
"Kill word behind point, stopping at the REPL prompt."
(interactive "p")
(let ((backward-word-point))
(cl-loop
repeat (or n 1) do
;; if point is not after prompt, fall back on backward-kill-word
(cond ((not (haskell-interactive-at-prompt))
(backward-kill-word 1))
;; if there's any non-whitespace between the prompt and point,
;; fall back on backward-kill-word
((string-match
"[^[:space:^M]]"
(buffer-substring-no-properties
haskell-interactive-mode-prompt-start
(point)))
(backward-kill-word 1))
;; else, compare point at beginning of line with prompt-start
(t
(save-excursion
(backward-word)
(setq backward-word-point (point)))
;; if backward-kill-word would take point behind prompt, kill to
;; prompt-start, else fall back on backward-kill-word
(cond ((< backward-word-point haskell-interactive-mode-prompt-start)
(delete-char
(- haskell-interactive-mode-prompt-start (point))))
((>= backward-word-point haskell-interactive-mode-prompt-start)
(backward-kill-word 1))))))))

(defun haskell-interactive-switch-back ()
"Switch back to the buffer from which this interactive buffer was reached."
(interactive)
Expand Down