VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-06 22:14:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

A minor issue for getting the stack at a position, fixes #590.

Browse Source
This commit is contained in:
Dave Halter
2016-07-08 08:39:36 +02:00
parent e5f09e1c7d
commit baa745a6ac
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jedi/api/helpers.py
View File

@@ -3,6 +3,7 @@ Helpers for the API
""" """
import re import re
from collections import namedtuple from collections import namedtuple
from textwrap import dedent
from jedi._compatibility import u from jedi._compatibility import u
from jedi.evaluate.helpers import call_of_leaf from jedi.evaluate.helpers import call_of_leaf
@@ -28,9 +29,6 @@ def get_on_completion_name(lines, position):
def _get_code(code_lines, start_pos, end_pos): def _get_code(code_lines, start_pos, end_pos):
"""
:param code_start_pos: is where the code starts.
"""
# Get relevant lines. # Get relevant lines.
lines = code_lines[start_pos[0] - 1:end_pos[0]] lines = code_lines[start_pos[0] - 1:end_pos[0]]
# Remove the parts at the end of the line. # Remove the parts at the end of the line.
@@ -70,7 +68,15 @@ def get_stack_at_position(grammar, code_lines, module, pos):
# impossible. # impossible.
raise OnErrorLeaf(user_stmt) raise OnErrorLeaf(user_stmt)
code = _get_code(code_lines, user_stmt.start_pos, pos) start_pos = user_stmt.start_pos
if user_stmt.first_leaf() == '@':
# TODO this once again proves that just using user_stmt.get_code
# would probably be nicer than _get_code.
# Remove the indent to have a statement that is aligned (properties
# on the same line as function)
start_pos = start_pos[0], 0
code = _get_code(code_lines, start_pos, pos)
if code == ';': if code == ';':
# ; cannot be parsed. # ; cannot be parsed.
code = u('') code = u('')
@@ -78,7 +84,9 @@ def get_stack_at_position(grammar, code_lines, module, pos):
# Remove whitespace at the end. Necessary, because the tokenizer will parse # Remove whitespace at the end. Necessary, because the tokenizer will parse
# an error token (there's no new line at the end in our case). This doesn't # an error token (there's no new line at the end in our case). This doesn't
# alter any truth about the valid tokens at that position. # alter any truth about the valid tokens at that position.
code = code.strip('\t ') code = code.rstrip('\t ')
# Remove as many indents from **all** code lines as possible.
code = dedent(code)
class EndMarkerReached(Exception): class EndMarkerReached(Exception):
pass pass

9
test/completion/parser.py
View File

@@ -1,5 +1,5 @@
""" """
Issues with the parser not the completion engine should be here. Issues with the parser and not the type inference should be part of this file.
""" """
class IndentIssues(): class IndentIssues():
@@ -34,3 +34,10 @@ complete to definition.
definition = 0 definition = 0
#? ['definition'] #? ['definition']
str(def str(def
# It might be hard to determine the context
class Foo(object):
@property
#? ['str']
def bar(str