Remove _ignore_change

This commit is contained in:
Luca Benci 2017-10-27 20:15:33 +02:00
parent 17e0f6d23c
commit f5f11f7f4e

View File

@ -43,7 +43,6 @@ class Completer(QObject):
Attributes: Attributes:
_cmd: The statusbar Command object this completer belongs to. _cmd: The statusbar Command object this completer belongs to.
_ignore_change: Whether to ignore the next completion update.
_timer: The timer used to trigger the completion update. _timer: The timer used to trigger the completion update.
_last_cursor_pos: The old cursor position so we avoid double completion _last_cursor_pos: The old cursor position so we avoid double completion
updates. updates.
@ -54,7 +53,6 @@ class Completer(QObject):
def __init__(self, cmd, parent=None): def __init__(self, cmd, parent=None):
super().__init__(parent) super().__init__(parent)
self._cmd = cmd self._cmd = cmd
self._ignore_change = False
self._timer = QTimer() self._timer = QTimer()
self._timer.setSingleShot(True) self._timer.setSingleShot(True)
self._timer.setInterval(0) self._timer.setInterval(0)
@ -178,13 +176,14 @@ class Completer(QObject):
text = self._quote(text) text = self._quote(text)
model = self._model() model = self._model()
if model.count() == 1 and config.val.completion.quick: if model.count() == 1 and config.val.completion.quick:
# If we only have one item, we want to apply it immediately # If we only have one item, we want to apply it immediately and go
# and go on to the next part. # on to the next part, unless we are quick-completing the part
self._change_completed_part(text, before, after, immediate=True) # after maxsplit, so that we don't keep offering completions
# (see issue #1519)
if maxsplit is not None and maxsplit < len(before): if maxsplit is not None and maxsplit < len(before):
# If we are quick-completing the part after maxsplit, don't self._change_completed_part(text, before, after)
# keep offering completions (see issue #1519) else:
self._ignore_change = True self._change_completed_part(text, before, after, immediate=True)
else: else:
self._change_completed_part(text, before, after) self._change_completed_part(text, before, after)
@ -219,12 +218,6 @@ class Completer(QObject):
@pyqtSlot() @pyqtSlot()
def _update_completion(self): def _update_completion(self):
"""Check if completions are available and activate them.""" """Check if completions are available and activate them."""
if self._ignore_change:
log.completion.debug("Ignoring completion update because "
"ignore_change is True.")
self._ignore_change = False
return
completion = self.parent() completion = self.parent()
if self._cmd.prefix() != ':': if self._cmd.prefix() != ':':