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 out-by-one in get_leaf_for_position #218

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
41 changes: 21 additions & 20 deletions parso/tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -414,28 +414,29 @@ def get_leaf_for_position(self, position, include_prefixes=False):
on whitespace or comments before a leaf
:return: :py:class:`parso.tree.Leaf` at ``position``, or ``None``
"""
def binary_search(lower, upper):
if lower == upper:
element = self.children[lower]
if not include_prefixes and position < element.start_pos:
# We're on a prefix.
return None
# In case we have prefixes, a leaf always matches
try:
return element.get_leaf_for_position(position, include_prefixes)
except AttributeError:
return element

index = int((lower + upper) / 2)
element = self.children[index]
if position <= element.end_pos:
return binary_search(lower, index)
if not ((1, 0) <= position < self.children[-1].end_pos):
raise ValueError('Please provide a position that exists within this node.')

# Binary search for matching child.
lower = 0
upper = len(self.children) - 1
while lower < upper:
middle = int((lower + upper) / 2)
element = self.children[middle]
if position < element.end_pos:
upper = middle
else:
return binary_search(index + 1, upper)
lower = middle + 1

if not ((1, 0) <= position <= self.children[-1].end_pos):
raise ValueError('Please provide a position that exists within this node.')
return binary_search(0, len(self.children) - 1)
element = self.children[lower]
if not include_prefixes and position < element.start_pos:
# We're on a prefix.
return None
# In case we have prefixes, a leaf always matches
try:
return element.get_leaf_for_position(position, include_prefixes)
except AttributeError:
return element

def get_first_leaf(self):
return self.children[0].get_first_leaf()
Expand Down
14 changes: 14 additions & 0 deletions test/test_parser_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,3 +264,17 @@ def test_with_stmt_get_test_node_from_name():
def test_search_ancestor(node, node_types, expected_ancestor):
assert node.search_ancestor(*node_types) is expected_ancestor
assert search_ancestor(node, *node_types) is expected_ancestor # deprecated


def test_get_leaf_for_definition():
# https://github.com/davidhalter/parso/issues/217
code = """
from parso import parse
from parso.python import tree
from parso.tree import search_ancestor
"""

module = parse(code, version='3.8')
position = (3, 0)
leaf = module.get_leaf_for_position(position)
assert leaf.start_pos <= position < leaf.end_pos