VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2026-08-13 11:31:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename indent -> column.

Browse Source
This commit is contained in:
Dave Halter
2017-08-28 21:34:17 +02:00
parent 826a6b4453
commit 45c434799f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parso/python/tree.py
+2 -2
View File
@@ -125,7 +125,7 @@ class _LeafWithoutNewlines(PythonLeaf):
@property @property
def end_pos(self): def end_pos(self):
return self.line, self.indent + len(self.value) return self.line, self.column + len(self.value)
# Python base classes # Python base classes
@@ -170,7 +170,7 @@ class Name(_LeafWithoutNewlines):
def __repr__(self): def __repr__(self):
return "<%s: %s@%s,%s>" % (type(self).__name__, self.value, return "<%s: %s@%s,%s>" % (type(self).__name__, self.value,
self.line, self.indent) self.line, self.column)
def is_definition(self): def is_definition(self):
if self.parent.type in ('power', 'atom_expr'): if self.parent.type in ('power', 'atom_expr'):
parso/tree.py
+6 -6
View File
@@ -155,7 +155,7 @@ class NodeOrLeaf(object):
class Leaf(NodeOrLeaf): class Leaf(NodeOrLeaf):
__slots__ = ('value', 'parent', 'line', 'indent', 'prefix') __slots__ = ('value', 'parent', 'line', 'column', 'prefix')
def __init__(self, value, start_pos, prefix=''): def __init__(self, value, start_pos, prefix=''):
self.value = value self.value = value
@@ -165,12 +165,12 @@ class Leaf(NodeOrLeaf):
@property @property
def start_pos(self): def start_pos(self):
return self.line, self.indent return self.line, self.column
@start_pos.setter @start_pos.setter
def start_pos(self, value): def start_pos(self, value):
self.line = value[0] self.line = value[0]
self.indent = value[1] self.column = value[1]
def get_start_pos_of_prefix(self): def get_start_pos_of_prefix(self):
previous_leaf = self.get_previous_leaf() previous_leaf = self.get_previous_leaf()
@@ -196,10 +196,10 @@ class Leaf(NodeOrLeaf):
end_pos_line = self.line + len(lines) - 1 end_pos_line = self.line + len(lines) - 1
# Check for multiline token # Check for multiline token
if self.line == end_pos_line: if self.line == end_pos_line:
end_pos_indent = self.indent + len(lines[-1]) end_pos_column = self.column + len(lines[-1])
else: else:
end_pos_indent = len(lines[-1]) end_pos_column = len(lines[-1])
return end_pos_line, end_pos_indent return end_pos_line, end_pos_column
@utf8_repr @utf8_repr
def __repr__(self): def __repr__(self):