rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid scheduling spurious completion updates

Browse Source 
Instead of setting `_ignore_change` to `True` before calling
`_change_completed_part` we just stop `_cmd` from emitting
`update_completion`.

This has the nice side-effect that when writing a complete command
`_ignore_change` was set to `True` regardless, and thus hitting space
would not update the completion view.

Now, hitting space will (as always) schedule a completion update that
now will not be incorrectly ignored
This commit is contained in:
Luca Benci 2017-10-21 23:20:37 +02:00
parent 4c2aeb01a8
commit 56d29a1b5f
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qutebrowser/completion/completer.py
View File

@ -186,8 +186,6 @@ class Completer(QObject):
# keep offering completions (see issue #1519) # keep offering completions (see issue #1519)
self._ignore_change = True self._ignore_change = True
else: else:
log.completion.debug("Will ignore next completion update.")
self._ignore_change = True
self._change_completed_part(text, before, after) self._change_completed_part(text, before, after)
@pyqtSlot() @pyqtSlot()
@ -284,7 +282,20 @@ class Completer(QObject):
# pad with a space if quick-completing the last entry # pad with a space if quick-completing the last entry
text += ' ' text += ' '
log.completion.debug("setting text = '{}', pos = {}".format(text, pos)) log.completion.debug("setting text = '{}', pos = {}".format(text, pos))
# generally, we don't want to let self._cmd emit cursorPositionChanged,
# because that'll schedule a completion update. That happens when
# tabbing through the completions, and we want to change the command
# text but we also want to keep the original completion list for the
# command the user manually entered. The exception is when we're
# immediately completing, in which case we *do* want to update the
# completion view so that we can start completing the next part
if not immediate:
self._cmd.blockSignals(True)
self._cmd.setText(text) self._cmd.setText(text)
self._cmd.setCursorPosition(pos) self._cmd.setCursorPosition(pos)
self._cmd.setFocus() self._cmd.setFocus()
self._cmd.blockSignals(False)
self._cmd.show_cmd.emit() self._cmd.show_cmd.emit()