##// END OF EJS Templates
New .py notebook format implemented.
New .py notebook format implemented.

File last commit:

r3430:ef40b1ca
r4536:7debcc42
Show More
completer.py
869 lines | 31.8 KiB | text/x-python | PythonLexer
ville
initialization (no svn history)
r988 """Word completion for IPython.
This module is a fork of the rlcompleter module in the Python standard
library. The original enhancements made to rlcompleter have been sent
upstream and were accepted as of Python 2.3, but we need a lot more
functionality specific to IPython, so this module will continue to live as an
IPython-specific utility.
Original rlcompleter documentation:
This requires the latest extension to the readline module (the
completes keywords, built-ins and globals in __main__; when completing
NAME.NAME..., it evaluates (!) the expression up to the last dot and
completes its attributes.
It's very cool to do "import string" type "string.", hit the
completion key (twice), and see the list of names defined by the
string module!
Tip: to use the tab key as the completion key, call
readline.parse_and_bind("tab: complete")
Notes:
- Exceptions raised by the completer function are *ignored* (and
generally cause the completion to fail). This is a feature -- since
readline sets the tty device in raw (or cbreak) mode, printing a
traceback wouldn't work well without some complicated hoopla to save,
reset and restore the tty state.
- The evaluation of the NAME.NAME... form may cause arbitrary
application defined code to be executed if an object with a
__getattr__ hook is found. Since it is the responsibility of the
application (or the user) to enable this feature, I consider this an
acceptable risk. More complicated expressions (e.g. function calls or
indexing operations) are *not* evaluated.
- GNU readline is also used by the built-in functions input() and
raw_input(), and thus these also benefit/suffer from the completer
features. Clearly an interactive application can benefit by
specifying its own completer function and using raw_input() for all
its input.
- When the original stdin is not a tty device, GNU readline is never
used, and this module (and the readline module) are silently inactive.
"""
#*****************************************************************************
#
# Since this file is essentially a minimally modified copy of the rlcompleter
# module which is part of the standard Python distribution, I assume that the
# proper procedure is to maintain its copyright as belonging to the Python
# Software Foundation (in addition to my own, for all new code).
#
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 # Copyright (C) 2008-2010 IPython Development Team
# Copyright (C) 2001-2007 Fernando Perez. <fperez@colorado.edu>
ville
initialization (no svn history)
r988 # Copyright (C) 2001 Python Software Foundation, www.python.org
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#
#*****************************************************************************
Fernando Perez
Add line splitting for text completion (like readline does internally)....
r2855 from __future__ import print_function
ville
initialization (no svn history)
r988
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 #-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
ville
initialization (no svn history)
r988 import __builtin__
import __main__
import glob
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 import inspect
Brian Granger
Minor bug fixes and comments to address review....
r2248 import itertools
ville
initialization (no svn history)
r988 import keyword
import os
import re
import shlex
import sys
Brian Granger
Continuing a massive refactor of everything.
r2205
from IPython.core.error import TryNext
Brian Granger
More work on refactoring things into components....
r2244 from IPython.core.prefilter import ESC_MAGIC
Fernando Perez
Restored major default completer functionality (cd, import, run)....
r2959 from IPython.utils import generics
from IPython.utils import io
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 from IPython.utils.dir2 import dir2
Fernando Perez
Fix completer crash with certain unicode inputs....
r3074 from IPython.utils.process import arg_split
ville
initialization (no svn history)
r988
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 #-----------------------------------------------------------------------------
# Globals
#-----------------------------------------------------------------------------
# Public API
ville
initialization (no svn history)
r988 __all__ = ['Completer','IPCompleter']
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 if sys.platform == 'win32':
PROTECTABLES = ' '
else:
Fernando Perez
Fix protection of special characters on tab completion....
r3176 PROTECTABLES = ' ()[]{}?=\\|;:\'#*"^&'
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365
#-----------------------------------------------------------------------------
# Main functions and classes
#-----------------------------------------------------------------------------
Fernando Perez
Fix bug in tab completion of filenames when quotes are present....
r3184 def has_open_quotes(s):
"""Return whether a string has open quotes.
This simply counts whether the number of quote characters of either type in
the string is odd.
Returns
-------
If there is an open quote, the quote character is returned. Else, return
False.
"""
# We check " first, then ', so complex cases with nested quotes will get
# the " to take precedence.
if s.count('"') % 2:
return '"'
elif s.count("'") % 2:
return "'"
else:
return False
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 def protect_filename(s):
"""Escape a string to protect certain characters."""
return "".join([(ch in PROTECTABLES and '\\' + ch or ch)
for ch in s])
Fernando Perez
Multiple improvements to tab completion....
r2839 def mark_dirs(matches):
"""Mark directories in input list by appending '/' to their names."""
out = []
isdir = os.path.isdir
for x in matches:
if isdir(x):
out.append(x+'/')
else:
out.append(x)
return out
Fernando Perez
Fix bugs with completions of paths that have ~ in them....
r2965 def expand_user(path):
"""Expand '~'-style usernames in strings.
This is similar to :func:`os.path.expanduser`, but it computes and returns
extra information that will be useful if the input was being used in
computing completions, and you wish to return the completions with the
original '~' instead of its expanded value.
Parameters
----------
path : str
String to be expanded. If no ~ is present, the output is the same as the
input.
Returns
-------
newpath : str
Result of ~ expansion in the input path.
tilde_expand : bool
Whether any expansion was performed or not.
tilde_val : str
The value that ~ was replaced with.
"""
# Default values
tilde_expand = False
tilde_val = ''
newpath = path
if path.startswith('~'):
tilde_expand = True
rest = path[1:]
newpath = os.path.expanduser(path)
tilde_val = newpath.replace(rest, '')
return newpath, tilde_expand, tilde_val
def compress_user(path, tilde_expand, tilde_val):
"""Does the opposite of expand_user, with its outputs.
"""
if tilde_expand:
return path.replace(tilde_val, '~')
else:
return path
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 def single_dir_expand(matches):
"Recursively expand match lists containing a single dir."
if len(matches) == 1 and os.path.isdir(matches[0]):
# Takes care of links to directories also. Use '/'
# explicitly, even under Windows, so that name completions
# don't end up escaped.
d = matches[0]
if d[-1] in ['/','\\']:
d = d[:-1]
subdirs = os.listdir(d)
if subdirs:
matches = [ (d + '/' + p) for p in subdirs]
return single_dir_expand(matches)
else:
return matches
else:
return matches
Fernando Perez
Add line splitting for text completion (like readline does internally)....
r2855 class Bunch(object): pass
class CompletionSplitter(object):
"""An object to split an input line in a manner similar to readline.
By having our own implementation, we can expose readline-like completion in
a uniform manner to all frontends. This object only needs to be given the
line of text to be split and the cursor position on said line, and it
returns the 'word' to be completed on at the cursor after splitting the
entire line.
What characters are used as splitting delimiters can be controlled by
setting the `delims` attribute (this is a property that internally
automatically builds the necessary """
# Private interface
# A string of delimiter characters. The default value makes sense for
# IPython's most typical usage patterns.
_delims = ' \t\n`!@#$^&*()=+[{]}\\|;:\'",<>?'
# The expression (a normal string) to be compiled into a regular expression
# for actual splitting. We store it as an attribute mostly for ease of
# debugging, since this type of code can be so tricky to debug.
_delim_expr = None
# The regular expression that does the actual splitting
_delim_re = None
def __init__(self, delims=None):
delims = CompletionSplitter._delims if delims is None else delims
self.set_delims(delims)
def set_delims(self, delims):
"""Set the delimiters for line splitting."""
expr = '[' + ''.join('\\'+ c for c in delims) + ']'
self._delim_re = re.compile(expr)
self._delims = delims
self._delim_expr = expr
def get_delims(self):
"""Return the string of delimiter characters."""
return self._delims
def split_line(self, line, cursor_pos=None):
"""Split a line of text with a cursor at the given position.
"""
l = line if cursor_pos is None else line[:cursor_pos]
return self._delim_re.split(l)[-1]
class Completer(object):
Fernando Perez
Improvements to tab completion in Qt GUI with new api....
r2857 def __init__(self, namespace=None, global_namespace=None):
ville
initialization (no svn history)
r988 """Create a new completer for the command line.
Completer([namespace,global_namespace]) -> completer instance.
If unspecified, the default namespace where completions are performed
is __main__ (technically, __main__.__dict__). Namespaces should be
given as dictionaries.
An optional second namespace can be given. This allows the completer
to handle cases where both the local and global scopes need to be
distinguished.
Completer instances should be used as the completion mechanism of
readline via the set_completer() call:
readline.set_completer(Completer(my_namespace).complete)
"""
# Don't bind to namespace quite yet, but flag whether the user wants a
# specific namespace or to use __main__.__dict__. This will allow us
# to bind to __main__.__dict__ at completion time, not now.
if namespace is None:
self.use_main_ns = 1
else:
self.use_main_ns = 0
self.namespace = namespace
# The global namespace, if given, can be bound directly
if global_namespace is None:
self.global_namespace = {}
else:
self.global_namespace = global_namespace
def complete(self, text, state):
"""Return the next possible completion for 'text'.
This is called successively with state == 0, 1, 2, ... until it
returns None. The completion should begin with 'text'.
"""
if self.use_main_ns:
self.namespace = __main__.__dict__
if state == 0:
if "." in text:
self.matches = self.attr_matches(text)
else:
self.matches = self.global_matches(text)
try:
return self.matches[state]
except IndexError:
return None
def global_matches(self, text):
"""Compute matches when text is a simple name.
Return a list of all keywords, built-in functions and names currently
defined in self.namespace or self.global_namespace that match.
"""
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 #print 'Completer->global_matches, txt=%r' % text # dbg
ville
initialization (no svn history)
r988 matches = []
match_append = matches.append
n = len(text)
for lst in [keyword.kwlist,
__builtin__.__dict__.keys(),
self.namespace.keys(),
self.global_namespace.keys()]:
for word in lst:
if word[:n] == text and word != "__builtins__":
match_append(word)
return matches
def attr_matches(self, text):
"""Compute matches when text contains a dot.
Assuming the text is of the form NAME.NAME....[NAME], and is
evaluatable in self.namespace or self.global_namespace, it will be
evaluated and its attributes (as revealed by dir()) are used as
possible completions. (For class instances, class members are are
also considered.)
WARNING: this can still invoke arbitrary C code, if an object
with a __getattr__ hook is evaluated.
"""
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 #print 'Completer->attr_matches, txt=%r' % text # dbg
ville
initialization (no svn history)
r988 # Another option, seems to work great. Catches things like ''.<tab>
m = re.match(r"(\S+(\.\w+)*)\.(\w*)$", text)
if not m:
return []
expr, attr = m.group(1, 3)
try:
obj = eval(expr, self.namespace)
except:
try:
obj = eval(expr, self.global_namespace)
except:
return []
words = dir2(obj)
try:
words = generics.complete_object(obj, words)
Brian Granger
Continuing a massive refactor of everything.
r2205 except TryNext:
ville
initialization (no svn history)
r988 pass
# Build match list to return
n = len(attr)
res = ["%s.%s" % (expr, w) for w in words if w[:n] == attr ]
return res
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365
ville
initialization (no svn history)
r988 class IPCompleter(Completer):
"""Extension of the completer class with IPython-specific features"""
Fernando Perez
Multiple improvements to tab completion....
r2839 def __init__(self, shell, namespace=None, global_namespace=None,
Fernando Perez
Fix name pollution of interactive namespace in pylab mode....
r3195 omit__names=True, alias_table=None, use_readline=True):
ville
initialization (no svn history)
r988 """IPCompleter() -> completer
Return a completer object suitable for use by the readline library
via readline.set_completer().
Inputs:
- shell: a pointer to the ipython shell itself. This is needed
because this completer knows about magic functions, and those can
only be accessed via the ipython instance.
- namespace: an optional dict where completions are performed.
- global_namespace: secondary optional dict for completions, to
handle cases (such as IPython embedded inside functions) where
both Python scopes are visible.
- The optional omit__names parameter sets the completer to omit the
'magic' names (__magicname__) for python objects unless the text
to be completed explicitly starts with one or more underscores.
- If alias_table is supplied, it should be a dictionary of aliases
Fernando Perez
Multiple improvements to tab completion....
r2839 to complete.
use_readline : bool, optional
If true, use the readline library. This completer can still function
without readline, though in that case callers must provide some extra
information on each call about the current line."""
ville
initialization (no svn history)
r988
Fernando Perez
Improvements to tab completion in Qt GUI with new api....
r2857 Completer.__init__(self, namespace, global_namespace)
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365
Brian Granger
More work on refactoring things into components....
r2244 self.magic_escape = ESC_MAGIC
Fernando Perez
Improvements to tab completion in Qt GUI with new api....
r2857 self.splitter = CompletionSplitter()
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 # Readline configuration, only used by the rlcompleter method.
Fernando Perez
Multiple improvements to tab completion....
r2839 if use_readline:
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 # We store the right version of readline so that later code
Fernando Perez
Multiple improvements to tab completion....
r2839 import IPython.utils.rlineimpl as readline
self.readline = readline
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 else:
self.readline = None
Fernando Perez
Multiple improvements to tab completion....
r2839
# List where completion matches will be stored
self.matches = []
ville
initialization (no svn history)
r988 self.omit__names = omit__names
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 self.merge_completions = shell.readline_merge_completions
self.shell = shell.shell
ville
initialization (no svn history)
r988 if alias_table is None:
alias_table = {}
self.alias_table = alias_table
# Regexp to split filenames with spaces in them
self.space_name_re = re.compile(r'([^\\] )')
# Hold a local ref. to glob.glob for speed
self.glob = glob.glob
# Determine if we are running on 'dumb' terminals, like (X)Emacs
# buffers, to avoid completion problems.
term = os.environ.get('TERM','xterm')
self.dumb_terminal = term in ['dumb','emacs']
# Special handling of backslashes needed in win32 platforms
if sys.platform == "win32":
self.clean_glob = self._clean_glob_win32
else:
self.clean_glob = self._clean_glob
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365
# All active matcher routines for completion
ville
initialization (no svn history)
r988 self.matchers = [self.python_matches,
self.file_matches,
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 self.magic_matches,
ville
initialization (no svn history)
r988 self.alias_matches,
Fernando Perez
Multiple improvements to tab completion....
r2839 self.python_func_kw_matches,
]
ville
initialization (no svn history)
r988
def all_completions(self, text):
andy wilson
Fix emacs tab-completion with simpler implementation....
r3430 """
Wrapper around the complete method for the benefit of emacs
and pydb.
"""
return self.complete(text)[1]
ville
initialization (no svn history)
r988
def _clean_glob(self,text):
return self.glob("%s*" % text)
def _clean_glob_win32(self,text):
return [f.replace("\\","/")
for f in self.glob("%s*" % text)]
def file_matches(self, text):
"""Match filenames, expanding ~USER type strings.
Most of the seemingly convoluted logic in this completer is an
attempt to handle filenames with spaces in them. And yet it's not
quite perfect, because Python's readline doesn't expose all of the
GNU readline details needed for this to be done correctly.
For a filename with a space in it, the printed completions will be
only the parts after what's already been typed (instead of the
full completions, as is normally done). I don't think with the
current (as of Python 2.3) Python readline it's possible to do
better."""
Fernando Perez
Fix completer crash with certain unicode inputs....
r3074 #io.rprint('Completer->file_matches: <%r>' % text) # dbg
ville
initialization (no svn history)
r988
# chars that require escaping with backslash - i.e. chars
# that readline treats incorrectly as delimiters, but we
# don't want to treat as delimiters in filename matching
# when escaped with backslash
if text.startswith('!'):
text = text[1:]
text_prefix = '!'
else:
text_prefix = ''
Fernando Perez
Fix bug in tab completion of filenames when quotes are present....
r3184
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 text_until_cursor = self.text_until_cursor
Fernando Perez
Fix bug in tab completion of filenames when quotes are present....
r3184 # track strings with open quotes
open_quotes = has_open_quotes(text_until_cursor)
if '(' in text_until_cursor or '[' in text_until_cursor:
lsplit = text
else:
try:
# arg_split ~ shlex.split, but with unicode bugs fixed by us
lsplit = arg_split(text_until_cursor)[-1]
except ValueError:
# typically an unmatched ", or backslash without escaped char.
if open_quotes:
lsplit = text_until_cursor.split(open_quotes)[-1]
else:
return []
except IndexError:
# tab pressed on empty line
lsplit = ""
ville
initialization (no svn history)
r988
Fernando Perez
Fix file completion of commands with spaces in them.
r2903 if not open_quotes and lsplit != protect_filename(lsplit):
Fernando Perez
Fix bug in tab completion of filenames when quotes are present....
r3184 # if protectables are found, do matching on the whole escaped name
has_protectables = True
ville
initialization (no svn history)
r988 text0,text = text,lsplit
else:
Fernando Perez
Fix bug in tab completion of filenames when quotes are present....
r3184 has_protectables = False
ville
initialization (no svn history)
r988 text = os.path.expanduser(text)
if text == "":
return [text_prefix + protect_filename(f) for f in self.glob("*")]
Fernando Perez
Fix bug in tab completion of filenames when quotes are present....
r3184 # Compute the matches from the filesystem
ville
initialization (no svn history)
r988 m0 = self.clean_glob(text.replace('\\',''))
Fernando Perez
Fix bug in tab completion of filenames when quotes are present....
r3184
ville
initialization (no svn history)
r988 if has_protectables:
# If we had protectables, we need to revert our changes to the
# beginning of filename so that we don't double-write the part
# of the filename we have so far
len_lsplit = len(lsplit)
matches = [text_prefix + text0 +
protect_filename(f[len_lsplit:]) for f in m0]
else:
if open_quotes:
# if we have a string with an open quote, we don't need to
# protect the names at all (and we _shouldn't_, as it
# would cause bugs when the filesystem call is made).
matches = m0
else:
matches = [text_prefix +
protect_filename(f) for f in m0]
Fernando Perez
Fix file completion of commands with spaces in them.
r2903 #io.rprint('mm', matches) # dbg
Fernando Perez
Multiple improvements to tab completion....
r2839 return mark_dirs(matches)
ville
initialization (no svn history)
r988
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 def magic_matches(self, text):
"""Match magics"""
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 #print 'Completer->magic_matches:',text,'lb',self.text_until_cursor # dbg
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 # Get all shell magics now rather than statically, so magics loaded at
# runtime show up too
magics = self.shell.lsmagic()
pre = self.magic_escape
baretext = text.lstrip(pre)
return [ pre+m for m in magics if m.startswith(baretext)]
ville
initialization (no svn history)
r988 def alias_matches(self, text):
"""Match internal system aliases"""
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 #print 'Completer->alias_matches:',text,'lb',self.text_until_cursor # dbg
# if we are not in the first 'item', alias matching
ville
initialization (no svn history)
r988 # doesn't make sense - unless we are starting with 'sudo' command.
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 main_text = self.text_until_cursor.lstrip()
if ' ' in main_text and not main_text.startswith('sudo'):
ville
initialization (no svn history)
r988 return []
text = os.path.expanduser(text)
aliases = self.alias_table.keys()
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 if text == '':
ville
initialization (no svn history)
r988 return aliases
else:
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 return [a for a in aliases if a.startswith(text)]
ville
initialization (no svn history)
r988
def python_matches(self,text):
"""Match attributes or global python names"""
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 #print 'Completer->python_matches, txt=%r' % text # dbg
ville
initialization (no svn history)
r988 if "." in text:
try:
matches = self.attr_matches(text)
if text.endswith('.') and self.omit__names:
if self.omit__names == 1:
# true if txt is _not_ a __ name, false otherwise:
no__name = (lambda txt:
re.match(r'.*\.__.*?__',txt) is None)
else:
# true if txt is _not_ a _ name, false otherwise:
no__name = (lambda txt:
re.match(r'.*\._.*?',txt) is None)
matches = filter(no__name, matches)
except NameError:
# catches <undefined attributes>.<tab>
matches = []
else:
matches = self.global_matches(text)
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365
ville
initialization (no svn history)
r988 return matches
def _default_arguments(self, obj):
"""Return the list of default arguments of obj if it is callable,
or empty list otherwise."""
if not (inspect.isfunction(obj) or inspect.ismethod(obj)):
# for classes, check for __init__,__new__
if inspect.isclass(obj):
obj = (getattr(obj,'__init__',None) or
getattr(obj,'__new__',None))
# for all others, check if they are __call__able
elif hasattr(obj, '__call__'):
obj = obj.__call__
# XXX: is there a way to handle the builtins ?
try:
args,_,_1,defaults = inspect.getargspec(obj)
if defaults:
return args[-len(defaults):]
except TypeError: pass
return []
def python_func_kw_matches(self,text):
"""Match named parameters (kwargs) of the last open function"""
if "." in text: # a parameter cannot be dotted
return []
try: regexp = self.__funcParamsRegex
except AttributeError:
regexp = self.__funcParamsRegex = re.compile(r'''
'.*?' | # single quoted strings or
".*?" | # double quoted strings or
\w+ | # identifier
\S # other characters
''', re.VERBOSE | re.DOTALL)
# 1. find the nearest identifier that comes before an unclosed
# parenthesis e.g. for "foo (1+bar(x), pa", the candidate is "foo"
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 tokens = regexp.findall(self.line_buffer)
ville
initialization (no svn history)
r988 tokens.reverse()
iterTokens = iter(tokens); openPar = 0
for token in iterTokens:
if token == ')':
openPar -= 1
elif token == '(':
openPar += 1
if openPar > 0:
# found the last unclosed parenthesis
break
else:
return []
# 2. Concatenate dotted names ("foo.bar" for "foo.bar(x, pa" )
ids = []
isId = re.compile(r'\w+$').match
while True:
try:
ids.append(iterTokens.next())
if not isId(ids[-1]):
ids.pop(); break
if not iterTokens.next() == '.':
break
except StopIteration:
break
# lookup the candidate callable matches either using global_matches
# or attr_matches for dotted names
if len(ids) == 1:
callableMatches = self.global_matches(ids[0])
else:
callableMatches = self.attr_matches('.'.join(ids[::-1]))
argMatches = []
for callableMatch in callableMatches:
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 try:
namedArgs = self._default_arguments(eval(callableMatch,
ville
initialization (no svn history)
r988 self.namespace))
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 except:
continue
ville
initialization (no svn history)
r988 for namedArg in namedArgs:
if namedArg.startswith(text):
argMatches.append("%s=" %namedArg)
return argMatches
Fernando Perez
Restored major default completer functionality (cd, import, run)....
r2959 def dispatch_custom_completer(self, text):
ville
initialization (no svn history)
r988 #print "Custom! '%s' %s" % (text, self.custom_completers) # dbg
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 line = self.line_buffer
ville
initialization (no svn history)
r988 if not line.strip():
return None
Fernando Perez
Restored major default completer functionality (cd, import, run)....
r2959
# Create a little structure to pass all the relevant information about
# the current completion to any custom completer.
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 event = Bunch()
ville
initialization (no svn history)
r988 event.line = line
event.symbol = text
cmd = line.split(None,1)[0]
event.command = cmd
Fernando Perez
Restored major default completer functionality (cd, import, run)....
r2959 event.text_until_cursor = self.text_until_cursor
ville
initialization (no svn history)
r988 #print "\ncustom:{%s]\n" % event # dbg
# for foo etc, try also to find completer for %foo
if not cmd.startswith(self.magic_escape):
try_magic = self.custom_completers.s_matches(
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 self.magic_escape + cmd)
ville
initialization (no svn history)
r988 else:
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 try_magic = []
ville
initialization (no svn history)
r988
Fernando Perez
Fix tab-completion for magics, other completion cleanup and fixes....
r2365 for c in itertools.chain(self.custom_completers.s_matches(cmd),
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 try_magic,
self.custom_completers.flat_matches(self.text_until_cursor)):
ville
initialization (no svn history)
r988 #print "try",c # dbg
try:
res = c(event)
Fernando Perez
Fix tab-completion crash when no results were returned.
r3064 if res:
# first, try case sensitive match
withcase = [r for r in res if r.startswith(text)]
if withcase:
return withcase
# if none, then case insensitive ones are ok too
text_low = text.lower()
return [r for r in res if r.lower().startswith(text_low)]
Brian Granger
Continuing a massive refactor of everything.
r2205 except TryNext:
ville
initialization (no svn history)
r988 pass
return None
Fernando Perez
Improvements to tab completion in Qt GUI with new api....
r2857 def complete(self, text=None, line_buffer=None, cursor_pos=None):
Fernando Perez
Fix bug in tab completion of filenames when quotes are present....
r3184 """Find completions for the given text and line context.
ville
initialization (no svn history)
r988
This is called successively with state == 0, 1, 2, ... until it
returns None. The completion should begin with 'text'.
Fernando Perez
Improvements to tab completion in Qt GUI with new api....
r2857 Note that both the text and the line_buffer are optional, but at least
one of them must be given.
Fernando Perez
Multiple improvements to tab completion....
r2839 Parameters
----------
Fernando Perez
Improvements to tab completion in Qt GUI with new api....
r2857 text : string, optional
Text to perform the completion on. If not given, the line buffer
is split using the instance's CompletionSplitter object.
Fernando Perez
Multiple improvements to tab completion....
r2839
line_buffer : string, optional
If not given, the completer attempts to obtain the current line
buffer via readline. This keyword allows clients which are
requesting for text completions in non-readline contexts to inform
the completer of the entire text.
cursor_pos : int, optional
Index of the cursor in the full line buffer. Should be provided by
remote frontends where kernel has no access to frontend state.
Fernando Perez
Fix bug in tab completion of filenames when quotes are present....
r3184
Returns
-------
text : str
Text that was actually used in the completion.
matches : list
A list of completion matches.
ville
initialization (no svn history)
r988 """
Fernando Perez
Fix file completion of commands with spaces in them.
r2903 #io.rprint('\nCOMP1 %r %r %r' % (text, line_buffer, cursor_pos)) # dbg
Fernando Perez
Improvements to tab completion in Qt GUI with new api....
r2857
# if the cursor position isn't given, the only sane assumption we can
# make is that it's at the end of the line (the common case)
if cursor_pos is None:
cursor_pos = len(line_buffer) if text is None else len(text)
# if text is either None or an empty string, rely on the line buffer
if not text:
text = self.splitter.split_line(line_buffer, cursor_pos)
# If no line buffer is given, assume the input text is all there was
if line_buffer is None:
line_buffer = text
Fernando Perez
Add line splitting for text completion (like readline does internally)....
r2855
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 self.line_buffer = line_buffer
self.text_until_cursor = self.line_buffer[:cursor_pos]
Fernando Perez
Fix file completion of commands with spaces in them.
r2903 #io.rprint('\nCOMP2 %r %r %r' % (text, line_buffer, cursor_pos)) # dbg
Fernando Perez
Improvements to tab completion in Qt GUI with new api....
r2857
Fernando Perez
Multiple improvements to tab completion....
r2839 # Start with a clean slate of completions
self.matches[:] = []
custom_res = self.dispatch_custom_completer(text)
if custom_res is not None:
# did custom completers produce something?
self.matches = custom_res
ville
initialization (no svn history)
r988 else:
Fernando Perez
Multiple improvements to tab completion....
r2839 # Extend the list of completions with the results of each
# matcher, so we return results to the user from all
# namespaces.
if self.merge_completions:
self.matches = []
for matcher in self.matchers:
Fernando Perez
Prevent completer errors from crashing kernel.
r3073 try:
self.matches.extend(matcher(text))
except:
# Show the ugly traceback if the matcher causes an
# exception, but do NOT crash the kernel!
Fernando Perez
Fix bug in tab completion of filenames when quotes are present....
r3184 sys.excepthook(*sys.exc_info())
Fernando Perez
Multiple improvements to tab completion....
r2839 else:
for matcher in self.matchers:
self.matches = matcher(text)
if self.matches:
break
# FIXME: we should extend our api to return a dict with completions for
# different types of objects. The rlcomplete() method could then
# simply collapse the dict into a list for readline, but we'd have
# richer completion semantics in other evironments.
self.matches = sorted(set(self.matches))
Fernando Perez
Improvements to tab completion in Qt GUI with new api....
r2857 #io.rprint('COMP TEXT, MATCHES: %r, %r' % (text, self.matches)) # dbg
return text, self.matches
Fernando Perez
Multiple improvements to tab completion....
r2839
def rlcomplete(self, text, state):
"""Return the state-th possible completion for 'text'.
ville
initialization (no svn history)
r988
Fernando Perez
Multiple improvements to tab completion....
r2839 This is called successively with state == 0, 1, 2, ... until it
returns None. The completion should begin with 'text'.
ville
initialization (no svn history)
r988
Fernando Perez
Multiple improvements to tab completion....
r2839 Parameters
----------
text : string
Text to perform the completion on.
state : int
Counter used by readline.
"""
if state==0:
Fernando Perez
Add line splitting for text completion (like readline does internally)....
r2855
Fernando Perez
Reorganization of readline and completion dependent code....
r2956 self.line_buffer = line_buffer = self.readline.get_line_buffer()
cursor_pos = self.readline.get_endidx()
Fernando Perez
Multiple improvements to tab completion....
r2839
Fernando Perez
Add line splitting for text completion (like readline does internally)....
r2855 #io.rprint("\nRLCOMPLETE: %r %r %r" %
# (text, line_buffer, cursor_pos) ) # dbg
Fernando Perez
Multiple improvements to tab completion....
r2839 # if there is only a tab on a line with only whitespace, instead of
# the mostly useless 'do you want to see all million completions'
# message, just do the right thing and give the user his tab!
# Incidentally, this enables pasting of tabbed text from an editor
# (as long as autoindent is off).
# It should be noted that at least pyreadline still shows file
# completions - is there a way around it?
# don't apply this on 'dumb' terminals, such as emacs buffers, so
# we don't interfere with their own tab-completion mechanism.
Fernando Perez
Add line splitting for text completion (like readline does internally)....
r2855 if not (self.dumb_terminal or line_buffer.strip()):
Fernando Perez
Multiple improvements to tab completion....
r2839 self.readline.insert_text('\t')
sys.stdout.flush()
ville
initialization (no svn history)
r988 return None
Fernando Perez
Multiple improvements to tab completion....
r2839
Fernando Perez
Restored major default completer functionality (cd, import, run)....
r2959 # Note: debugging exceptions that may occur in completion is very
# tricky, because readline unconditionally silences them. So if
# during development you suspect a bug in the completion code, turn
# this flag on temporarily by uncommenting the second form (don't
# flip the value in the first line, as the '# dbg' marker can be
# automatically detected and is used elsewhere).
DEBUG = False
#DEBUG = True # dbg
if DEBUG:
try:
self.complete(text, line_buffer, cursor_pos)
except:
import traceback; traceback.print_exc()
else:
# The normal production version is here
# This method computes the self.matches array
self.complete(text, line_buffer, cursor_pos)
Fernando Perez
Multiple improvements to tab completion....
r2839
try:
return self.matches[state]
except IndexError:
ville
initialization (no svn history)
r988 return None