Skip to content
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.

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

Fix some completion issues on the Editor (issue #2352) #2357

Merged
merged 5 commits into from
Apr 24, 2015
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Show module icons for fallback module completions
  • Loading branch information
blink1073 committed Apr 24, 2015
commit 3acfdda78f981092833310e9cadd827e32c98cd6
3 changes: 2 additions & 1 deletion spyderlib/utils/introspection/fallback_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def get_completions(self, info):
if (info.line.strip().startswith(('import ', 'from ')) and
info.is_python_like):
items += module_completion(info.line, [info.filename])
return [(i, 'module') for i in sorted(items)]
elif info.obj:
base = info.obj
tokens = set(info.split_words(-1))
Expand All @@ -54,7 +55,7 @@ def get_completions(self, info):
match = re.search('''[ "\']([\w\.\\\\/]+)\Z''', info.line)
if match:
items += _complete_path(match.groups()[0])
return [(i, '') for i in sorted(items)]
return [(i, '') for i in sorted(items)]

def get_definition(self, info):
"""
Expand Down