diff --git a/pythonx/UltiSnips/debug.py b/pythonx/UltiSnips/debug.py index 62555e4..10c34ec 100644 --- a/pythonx/UltiSnips/debug.py +++ b/pythonx/UltiSnips/debug.py @@ -14,7 +14,7 @@ with open(DUMP_FILENAME, "w"): pass # clears the file def echo_to_hierarchy(text_object): - """Outputs the given 'text_object' and its childs hierarchically.""" + """Outputs the given 'text_object' and its children hierarchically.""" # pylint:disable=protected-access parent = text_object while parent._parent: @@ -24,7 +24,7 @@ def echo_to_hierarchy(text_object): """prints recursively.""" debug(indent + as_unicode(text_object)) try: - for child in text_object._childs: + for child in text_object._children: _do_print(child, indent=indent + " ") except AttributeError: pass diff --git a/pythonx/UltiSnips/text_objects/_base.py b/pythonx/UltiSnips/text_objects/_base.py index 8f9abbe..8ddc103 100755 --- a/pythonx/UltiSnips/text_objects/_base.py +++ b/pythonx/UltiSnips/text_objects/_base.py @@ -115,7 +115,7 @@ class TextObject(object): length information. If 'gtext' is None use the initial text of this object. """ - # We explicitly do not want to move our childs around here as we + # We explicitly do not want to move our children around here as we # either have non or we are replacing text initially which means we do # not want to mess with their positions if self.current_text == gtext: @@ -125,7 +125,7 @@ class TextObject(object): self._start, self._end, gtext or self._initial_text) if self._parent: self._parent._child_has_moved( - self._parent._childs.index(self), min(old_end, self._end), + self._parent._children.index(self), min(old_end, self._end), self._end.delta(old_end) ) @@ -144,21 +144,21 @@ class EditableTextObject(TextObject): """ def __init__(self, *args, **kwargs): TextObject.__init__(self, *args, **kwargs) - self._childs = [] + self._children = [] self._tabstops = {} ############## # Properties # ############## @property - def childs(self): - """List of all childs.""" - return self._childs + def children(self): + """List of all children.""" + return self._children @property - def _editable_childs(self): - """List of all childs that are EditableTextObjects""" - return [child for child in self._childs if + def _editable_children(self): + """List of all children that are EditableTextObjects""" + return [child for child in self._children if isinstance(child, EditableTextObject)] #################### @@ -166,9 +166,9 @@ class EditableTextObject(TextObject): #################### def find_parent_for_new_to(self, pos): """Figure out the parent object for something at 'pos'.""" - for childs in self._editable_childs: - if childs._start <= pos < childs._end: - return childs.find_parent_for_new_to(pos) + for children in self._editable_children: + if children._start <= pos < children._end: + return children.find_parent_for_new_to(pos) return self ############################### @@ -182,7 +182,7 @@ class EditableTextObject(TextObject): to_kill = set() new_cmds = [] - for child in self._childs: + for child in self._children: if ctype == "I": # Insertion if (child._start < pos < Position(child._end.line, child._end.col) and @@ -247,7 +247,7 @@ class EditableTextObject(TextObject): delta.col *= -1 pivot = Position(line, col) idx = -1 - for cidx, child in enumerate(self._childs): + for cidx, child in enumerate(self._children): if child._start < pivot <= child._end: idx = cidx self._child_has_moved(idx, pivot, delta) @@ -255,7 +255,7 @@ class EditableTextObject(TextObject): def _move(self, pivot, diff): TextObject._move(self, pivot, diff) - for child in self._childs: + for child in self._children: child._move(pivot, diff) def _child_has_moved(self, idx, pivot, diff): @@ -263,12 +263,12 @@ class EditableTextObject(TextObject): 'diff'.""" self._end.move(pivot, diff) - for child in self._childs[idx+1:]: + for child in self._children[idx+1:]: child._move(pivot, diff) if self._parent: self._parent._child_has_moved( - self._parent._childs.index(self), pivot, diff + self._parent._children.index(self), pivot, diff ) def _get_next_tab(self, number): @@ -285,7 +285,7 @@ class EditableTextObject(TextObject): break i += 1 - child = [c._get_next_tab(number) for c in self._editable_childs] + child = [c._get_next_tab(number) for c in self._editable_children] child = [c for c in child if c] possible_sol += child @@ -310,7 +310,7 @@ class EditableTextObject(TextObject): break i -= 1 - child = [c._get_prev_tab(number) for c in self._editable_childs] + child = [c._get_prev_tab(number) for c in self._editable_children] child = [c for c in child if c] possible_sol += child @@ -325,7 +325,7 @@ class EditableTextObject(TextObject): interested in this.""" if number in self._tabstops: return self._tabstops[number] - for child in self._editable_childs: + for child in self._editable_children: if child is requester: continue rv = child._get_tabstop(self, number) @@ -335,20 +335,20 @@ class EditableTextObject(TextObject): return self._parent._get_tabstop(self, number) def _update(self, done): - if all((child in done) for child in self._childs): + if all((child in done) for child in self._children): assert self not in done done.add(self) return True def _add_child(self, child): """Add 'child' as a new child of this text object.""" - self._childs.append(child) - self._childs.sort() + self._children.append(child) + self._children.sort() def _del_child(self, child): """Delete this 'child'.""" child._parent = None - self._childs.remove(child) + self._children.remove(child) # If this is a tabstop, delete it try: diff --git a/pythonx/UltiSnips/text_objects/_parser.py b/pythonx/UltiSnips/text_objects/_parser.py index 1bdf532..bc76e8b 100755 --- a/pythonx/UltiSnips/text_objects/_parser.py +++ b/pythonx/UltiSnips/text_objects/_parser.py @@ -60,8 +60,8 @@ def _do_parse(all_tokens, seen_ts, parent_to, text, indent): def parse_text_object(parent_to, text, indent): """Parses a text object from 'text' assuming the current 'indent'. Will - instantiate all the objects and link them as childs to parent_to. Will also - put the initial text into Vim.""" + instantiate all the objects and link them as children to parent_to. Will + also put the initial text into Vim.""" seen_ts = {} all_tokens = [] diff --git a/pythonx/UltiSnips/text_objects/_snippet_instance.py b/pythonx/UltiSnips/text_objects/_snippet_instance.py index 7da649a..a9c12a6 100755 --- a/pythonx/UltiSnips/text_objects/_snippet_instance.py +++ b/pythonx/UltiSnips/text_objects/_snippet_instance.py @@ -37,10 +37,10 @@ class SnippetInstance(EditableTextObject): def replace_initial_text(self): """Puts the initial text of all text elements into Vim.""" def _place_initial_text(obj): - """recurses on the childs to do the work.""" + """recurses on the children to do the work.""" obj.overwrite() if isinstance(obj, EditableTextObject): - for child in obj._childs: + for child in obj._children: _place_initial_text(child) _place_initial_text(self) @@ -60,7 +60,7 @@ class SnippetInstance(EditableTextObject): def _find_recursive(obj): """Finds all text objects and puts them into 'not_done'.""" if isinstance(obj, EditableTextObject): - for child in obj._childs: + for child in obj._children: _find_recursive(child) not_done.add(obj) _find_recursive(self)