Skip to content

Restore point when no prompt is found #43

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
OSadovy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Restore point when no prompt is found #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions shell-maker.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,14 +571,21 @@ Error if invoked from non-shell buffer."
"Search forward for a real prompt matching PROMPT-REGEXP before BOUND.

Skips matches in response content by verifying that the matched
text has `comint-highlight-prompt' face."
(let (found)
text has `comint-highlight-prompt' face.

Like `re-search-forward', leave point unchanged when no prompt is
found. Without this, skipped lookalikes strand point on the last
one searched."
(let ((start (point))
found)
(while (and (not found)
(re-search-forward prompt-regexp bound t))
(when (memq 'comint-highlight-prompt
(ensure-list
(get-text-property (match-beginning 0) 'font-lock-face)))
(setq found t)))
(unless found
(goto-char start))
found))

(defun shell-maker-narrow-to-prompt ()
Expand Down
14 changes: 14 additions & 0 deletions tests/shell-maker-history-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,20 @@
(should (equal (cdr (car result))
"Here is the code:\n<shell-maker-end-of-prompt>\nMore text after")))))

(ert-deftest shell-maker-history-test-search-prompt-leaves-point-when-not-found ()
"Searching past prompt lookalikes should not move point when none is real."
(with-temp-buffer
(insert (shell-maker-history-test--prompt "Agent> ") "explain\n"
(shell-maker-history-test--marker "<shell-maker-end-of-prompt>")
"Here is a transcript excerpt:\n"
"Agent> hello\n"
"and the rest of the answer\n")
(goto-char (point-min))
(should (shell-maker--re-search-forward-prompt "^Agent> "))
(let ((pos (point)))
(should-not (shell-maker--re-search-forward-prompt "^Agent> "))
(should (= (point) pos)))))

(provide 'shell-maker-history-tests)

;;; shell-maker-history-tests.el ends here