Skip to content
Browse files

Switches to use a better completion API and send the whole line.

* sends the whole line of code to get better results
* not updated for xemacs yet
  • Loading branch information...
1 parent 4a983ca commit 65ce75fda72742ca35d347d7b4d70cb474b99d72 @paykroyd committed
Showing with 5 additions and 4 deletions.
  1. +5 −4 docs/emacs/ipython.el
9 docs/emacs/ipython.el
@@ -314,7 +314,7 @@ gets converted to:
(replace-match "" t nil)))))
(defvar ipython-completion-command-string
- "print(';'.join(get_ipython().Completer.all_completions('%s'))) #PYTHON-MODE SILENT\n"
+ "print(';'.join(get_ipython().complete('%s', '%s')[1])) #PYTHON-MODE SILENT\n"
"The string send to ipython to query for all possible completions")
@@ -390,6 +390,7 @@ in the current *Python* session."
(beg (save-excursion (skip-chars-backward "a-z0-9A-Z_./" (point-at-bol))
(end (point))
+ (line (buffer-substring-no-properties (point-at-bol) end))
(pattern (buffer-substring-no-properties beg end))
(completions nil)
(completion-table nil)
@@ -401,7 +402,7 @@ in the current *Python* session."
(setq ugly-return (concat ugly-return string))
(process-send-string python-process
- (format ipython-completion-command-string pattern))
+ (format ipython-completion-command-string pattern line))
(accept-process-output python-process)
(setq completions
(split-string (substring ugly-return 0 (position ?\n ugly-return)) sep))
@@ -411,10 +412,10 @@ in the current *Python* session."
(setq completion (try-completion pattern completion-table))
(cond ((eq completion t))
((null completion)
- (message "Can't find completion for \"%s\"" pattern)
+ (message "Can't find completion for \"%s\" based on line %s" pattern line)
((not (string= pattern completion))
- (delete-region beg end)
+ (delete-region (- end (length pattern)) end)
(insert completion))
(message "Making completion list...")

0 comments on commit 65ce75f

Please sign in to comment.
Something went wrong with that request. Please try again.