Skip to content

improve prompt-window completion keys #2121

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

improve prompt-window completion keys #2121

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
35 changes: 30 additions & 5 deletions src/ext/completion-mode.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
:run-completion
:completion-end
:completion-mode
:completion-refresh)
:completion-refresh
:*completion-select-hook*)
#+sbcl
(:lock t))
(in-package :lem/completion-mode)
Expand All @@ -17,6 +18,7 @@

(defvar *completion-context* nil)
(defvar *completion-reverse* nil)

@code-contractor-app code-contractor-app Bot Mar 20, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Contractor: functional_style_rule

Contract: contract

AI check failed: "functional_style_rule"

Reason:
Added a new global special variable via defvar to pass selection behavior between components; this introduces dynamic state instead of using explicit function arguments.

(defvar *completion-select-hook* nil)

(defclass completion-context ()
((spec
Expand Down Expand Up @@ -105,11 +107,11 @@
:keymap *completion-mode-keymap*))

(define-key *completion-mode-keymap* 'next-line 'completion-next-line)
(define-key *completion-mode-keymap* "M-n" 'completion-next-line)
(define-key *completion-mode-keymap* "Tab" 'completion-narrowing-down-or-next-line)
(define-key *completion-mode-keymap* "M-n" 'completion-maybe-next)
(define-key *completion-mode-keymap* "M-p" 'completion-maybe-previous)
(define-key *completion-mode-keymap* "Tab" 'completion-complete-focused)
(define-key *completion-mode-keymap* "Shift-Tab" 'completion-previous-line)
(define-key *completion-mode-keymap* 'previous-line 'completion-previous-line)
(define-key *completion-mode-keymap* "M-p" 'completion-previous-line)
(define-key *completion-mode-keymap* 'move-to-end-of-buffer 'completion-end-of-buffer)
(define-key *completion-mode-keymap* 'move-to-beginning-of-buffer 'completion-beginning-of-buffer)
(define-key *completion-mode-keymap* "Return" 'completion-select)
Expand Down Expand Up @@ -216,6 +218,18 @@
(popup-menu-up (context-popup-menu *completion-context*))
(call-focus-action))

(define-command completion-maybe-previous () ()
"navigate history if in prompt, otherwise navigate candidates."
(if (frame-floating-prompt-window (current-frame))
(call-command (find-command "prompt-previous-history") 1)
(completion-previous-line)))

(define-command completion-maybe-next () ()
"navigate history if in prompt, otherwise navigate candidates."
(if (frame-floating-prompt-window (current-frame))
(call-command (find-command "prompt-next-history") 1)
(completion-next-line)))

(define-command completion-end-of-buffer () ()
(popup-menu-last (context-popup-menu *completion-context*))
(call-focus-action))
Expand All @@ -225,7 +239,11 @@
(call-focus-action))

(define-command completion-select () ()
(popup-menu-select (context-popup-menu *completion-context*)))
(alexandria:when-let* ((menu (context-popup-menu *completion-context*))
(item (lem/popup-menu:get-focus-item menu)))
(completion-insert (current-point) item)
(completion-end)
(run-hooks *completion-select-hook*)))

(define-command completion-insert-space-and-cancel () ()
(insert-character (current-point) #\space)
Expand Down Expand Up @@ -284,6 +302,13 @@
(completion-previous-line)
(completion-next-line))))

(define-command completion-complete-focused () ()
"complete fully to the currently focused candidate"
(alexandria:when-let* ((menu (context-popup-menu *completion-context*))
(item (lem/popup-menu:get-focus-item menu)))
(completion-insert (current-point) item)
(continue-completion *completion-context*)))

(defun limitation-items (items)
(let ((result (if (and *limit-number-of-items*
(< *limit-number-of-items* (length items)))
Expand Down
31 changes: 16 additions & 15 deletions src/ext/prompt-window.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,22 +342,23 @@
(handler-case
(with-unwind-setf (((frame-floating-prompt-window (current-frame))
prompt-window))
(let ((lem/completion-mode:*completion-select-hook*
(list (cons #'prompt-execute 0)))
(*post-command-hook* *post-command-hook*))
(when edit-callback
(add-hook *post-command-hook*
(lambda ()
(when (typep (this-command) 'lem:editable-advice)
(funcall edit-callback (get-input-string))))))
(run-hooks *prompt-after-activate-hook*)
(when *automatic-tab-completion*
(open-prompt-completion))
(with-special-keymap (special-keymap)
(if syntax-table
(with-current-syntax syntax-table
(funcall body-function))
(funcall body-function))))

(let ((*post-command-hook* *post-command-hook*))
(when edit-callback
(add-hook *post-command-hook*
(lambda ()
(when (typep (this-command) 'lem:editable-advice)
(funcall edit-callback (get-input-string))))))
(run-hooks *prompt-after-activate-hook*)
(when *automatic-tab-completion*
(open-prompt-completion))
(with-special-keymap (special-keymap)
(if syntax-table
(with-current-syntax syntax-table
(funcall body-function))
(funcall body-function))))

(lem/completion-mode:completion-end)
(remove-hook (window-leave-hook prompt-window) #'exit-prompt)
(delete-prompt prompt-window)
Expand Down
Loading