* bug#58441: 29.0.50; Python completion fails when point in shell buffer is before the last prompt
@ 2022-10-11 15:00 kobarity
2022-10-12 11:14 ` Lars Ingebrigtsen
0 siblings, 1 reply; 2+ messages in thread
From: kobarity @ 2022-10-11 15:00 UTC (permalink / raw)
To: 58441
[-- Attachment #1: Type: text/plain, Size: 3908 bytes --]
Hi,
Completion in Python mode buffer fails when the point in Python shell
buffer is before the last prompt:
1. emacs -Q
2. Open the following Python file.
#+begin_src python
import sys
#+end_src
3. C-u -1 M-x eldoc-mode (Disable ElDoc mode. This step can be skipped
if the fix for #58389 is applied.)
4. C-c C-p (M-x run-python)
5. M-< (M-x beginning-of-buffer)
6. C-x o (Back to the Python mode buffer)
7. C-c C-c (M-x python-shell-send-buffer)
8. C-n (M-x next-line)
9. Type "sys."
10. C-M-i (M-x completion-at-point)
11. "No match" is shown in the minibuffer.
In `python-shell-completion-at-point', current point in the shell
buffer is checked if it is after the last prompt. However, I think
there is no reason to do this check when
`python-shell-completion-at-point' is used to complete in Python mode
buffer (not Inferior Python Shell buffer).
Attached is a patch to fix this issue.
Best Regards,
--
In GNU Emacs 29.0.50 (build 5, x86_64-pc-linux-gnu, X toolkit, cairo
version 1.16.0, Xaw scroll bars) of 2022-10-09 built on ubuntu
Repository revision: 9d47364634f96b2f2651a7f3942f8f87b920f02d
Repository branch: master
System Description: Ubuntu 22.04.1 LTS
Configured using:
'configure --without-libgmp'
Configured features:
ACL CAIRO FREETYPE GIF GLIB GNUTLS GSETTINGS HARFBUZZ JPEG LIBSELINUX
LIBXML2 MODULES NOTIFY INOTIFY PDUMPER PNG SECCOMP SOUND SQLITE3 THREADS
TIFF TOOLKIT_SCROLL_BARS X11 XDBE XIM XPM LUCID ZLIB
Important settings:
value of $LANG: en_US.UTF-8
locale-coding-system: utf-8-unix
Major mode: Python
Minor modes in effect:
tooltip-mode: t
global-eldoc-mode: t
eldoc-mode: t
show-paren-mode: t
electric-indent-mode: t
mouse-wheel-mode: t
tool-bar-mode: t
menu-bar-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
font-lock-mode: t
blink-cursor-mode: t
line-number-mode: t
transient-mark-mode: t
auto-composition-mode: t
auto-encryption-mode: t
auto-compression-mode: t
Load-path shadows:
None found.
Features:
(shadow sort mail-extr emacsbug message mailcap yank-media puny dired
dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068
epg-config gnus-util text-property-search time-date mm-decode mm-bodies
mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail
rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils vc-hg vc-git
diff-mode vc-bzr vc-src vc-sccs vc-svn vc-cvs vc-rcs log-view easy-mmode
pcvs-util vc vc-dispatcher python json subr-x map project comint
ansi-osc ring cl-loaddefs cl-lib ansi-color term/screen term/xterm xterm
byte-opt gv bytecomp byte-compile cconv rmc iso-transl tooltip eldoc
paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode
mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image
regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode
prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu
timer select scroll-bar mouse jit-lock font-lock syntax font-core
term/tty-colors frame minibuffer nadvice seq simple cl-generic
indonesian philippine cham georgian utf-8-lang misc-lang vietnamese
tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek
romanian slovak czech european ethiopic indian cyrillic chinese
composite emoji-zwj charscript charprop case-table epa-hook
jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs
faces cus-face macroexp files window text-properties overlay sha1 md5
base64 format env code-pages mule custom widget keymap
hashtable-print-readable backquote threads inotify dynamic-setting
system-font-setting font-render-setting cairo x-toolkit x multi-tty
make-network-process emacs)
Memory information:
((conses 16 66777 6812)
(symbols 48 8205 0)
(strings 32 23919 1966)
(string-bytes 1 693986)
(vectors 16 13443)
(vector-slots 8 155457 9079)
(floats 8 30 347)
(intervals 56 208 0)
(buffers 1000 11))
[-- Attachment #2: 0001-Fix-Python-completion-when-point-in-shell-buffer-is-.patch --]
[-- Type: application/octet-stream, Size: 3771 bytes --]
From d0dc88913d3b6feda2f098cc5aa2bb99993c03a8 Mon Sep 17 00:00:00 2001
From: kobarity <kobarity@gmail.com>
Date: Tue, 11 Oct 2022 23:51:02 +0900
Subject: [PATCH] Fix Python completion when point in shell buffer is before
the last prompt
* lisp/progmodes/python.el (python-shell-completion-at-point): Limit
prompt boundaries check to shell buffer.
* test/lisp/progmodes/python-tests.el (python-shell-completion-2):
(python-shell-completion-native-2): New tests.
---
lisp/progmodes/python.el | 6 ++++--
test/lisp/progmodes/python-tests.el | 33 +++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 680b57fc3e..0de76b0bde 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -4069,7 +4069,8 @@ python-shell-completion-at-point
Optional argument PROCESS forces completions to be retrieved
using that one instead of current buffer's process."
(setq process (or process (get-buffer-process (current-buffer))))
- (let* ((line-start (if (derived-mode-p 'inferior-python-mode)
+ (let* ((is-shell-buffer (derived-mode-p 'inferior-python-mode))
+ (line-start (if is-shell-buffer
;; Working on a shell buffer: use prompt end.
(cdr (python-util-comint-last-prompt))
(line-beginning-position)))
@@ -4100,7 +4101,8 @@ python-shell-completion-at-point
(completion-fn
(with-current-buffer (process-buffer process)
(cond ((or (null prompt)
- (< (point) (cdr prompt-boundaries)))
+ (and is-shell-buffer
+ (< (point) (cdr prompt-boundaries))))
#'ignore)
((or (not python-shell-completion-native-enable)
;; Even if native completion is enabled, for
diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el
index 60ff9bb613..9ad2d16930 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -4411,6 +4411,22 @@ python-shell-completion-1
(insert "A")
(should (completion-at-point)))))
+(ert-deftest python-shell-completion-2 ()
+ "Should work regardless of the point in the Shell buffer."
+ (skip-unless (executable-find python-tests-shell-interpreter))
+ (python-tests-with-temp-buffer-with-shell
+ "
+import abc
+"
+ (let ((inhibit-message t))
+ (python-shell-send-buffer)
+ (python-tests-shell-wait-for-prompt)
+ (python-shell-with-shell-buffer
+ (goto-char (point-min)))
+ (goto-char (point-max))
+ (insert "abc.")
+ (should (completion-at-point)))))
+
(ert-deftest python-shell-completion-native-1 ()
(skip-unless (executable-find python-tests-shell-interpreter))
(python-tests-with-temp-buffer-with-shell
@@ -4427,6 +4443,23 @@ python-shell-completion-native-1
(insert "A")
(should (completion-at-point)))))
+(ert-deftest python-shell-completion-native-2 ()
+ "Should work regardless of the point in the Shell buffer."
+ (skip-unless (executable-find python-tests-shell-interpreter))
+ (python-tests-with-temp-buffer-with-shell
+ "
+import abc
+"
+ (let ((inhibit-message t))
+ (python-shell-completion-native-turn-on)
+ (python-shell-send-buffer)
+ (python-tests-shell-wait-for-prompt)
+ (python-shell-with-shell-buffer
+ (goto-char (point-min)))
+ (goto-char (point-max))
+ (insert "abc.")
+ (should (completion-at-point)))))
+
(ert-deftest python-shell-completion-native-with-ffap-1 ()
(skip-unless (executable-find python-tests-shell-interpreter))
(python-tests-with-temp-buffer-with-shell
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#58441: 29.0.50; Python completion fails when point in shell buffer is before the last prompt
2022-10-11 15:00 bug#58441: 29.0.50; Python completion fails when point in shell buffer is before the last prompt kobarity
@ 2022-10-12 11:14 ` Lars Ingebrigtsen
0 siblings, 0 replies; 2+ messages in thread
From: Lars Ingebrigtsen @ 2022-10-12 11:14 UTC (permalink / raw)
To: kobarity; +Cc: 58441
kobarity <kobarity@gmail.com> writes:
> Attached is a patch to fix this issue.
Thanks; pushed to Emacs 29.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-12 11:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-11 15:00 bug#58441: 29.0.50; Python completion fails when point in shell buffer is before the last prompt kobarity
2022-10-12 11:14 ` Lars Ingebrigtsen
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.