Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 01:34:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pass entire line of input to module completer

Browse source 
The module completer wants e.g. 'from xxx' as input, not just 'xxx'.

This change also causes all modules to be offered as completions to
'from ', whereas previously this was regarded as empty input.
This commit is contained in:
Dan Davison 2012-05-17 00:03:38 -03:00 committed by Fabián Ezequiel Gallina
parent 936bc8333f
commit 53df7818c0
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/progmodes/python.el
View file

@ -1750,24 +1750,32 @@ completions on the current context."
(buffer-substring-no-properties
(overlay-start comint-last-prompt-overlay)
(overlay-end comint-last-prompt-overlay))))
(completion-code
(completion-context
;; Check wether a prompt matches a pdb string, an import statement
;; or just the standard prompt and use the correct
;; python-shell-completion-*-code string
(cond ((and (> (length python-shell-completion-pdb-string-code) 0)
(string-match
(concat "^" python-shell-prompt-pdb-regexp) prompt))
python-shell-completion-pdb-string-code)
'pdb)
((and (>
(length python-shell-completion-module-string-code) 0)
(string-match
(concat "^" python-shell-prompt-regexp) prompt)
(string-match "^\\(from\\|import\\)[ \t]" line))
python-shell-completion-module-string-code)
'import)
((string-match
(concat "^" python-shell-prompt-regexp) prompt)
python-shell-completion-string-code)
'default)
(t nil)))
(completion-code
(case completion-context
('pdb python-shell-completion-pdb-string-code)
('import python-shell-completion-module-string-code)
('default python-shell-completion-string-code)
(t nil)))
(input
(if (eq completion-context 'import) line input))
(completions
(and completion-code (> (length input) 0)
(python-shell-completion--get-completions