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

Ignore empty parts when calculating cursor part.

Browse Source 
Fixes #389.
This commit is contained in:
Florian Bruhin 2014-12-26 16:57:08 +01:00
parent d1e0de236d
commit b1501a691d
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qutebrowser/completion/completer.py
View File

@ -177,7 +177,11 @@ class Completer(QObject):
return return
except IndexError: except IndexError:
pass pass
log.completion.debug("Before filtering flags: parts {}, cursor_part "
"{}".format(parts, cursor_part))
parts, cursor_part = self._filter_cmdline_parts(parts, cursor_part) parts, cursor_part = self._filter_cmdline_parts(parts, cursor_part)
log.completion.debug("After filtering flags: parts {}, cursor_part "
"{}".format(parts, cursor_part))
if cursor_part == 0: if cursor_part == 0:
# '|' or 'set|' # '|' or 'set|'
return self._models[usertypes.Completion.command] return self._models[usertypes.Completion.command]
@ -359,28 +363,33 @@ class Completer(QObject):
"text: {}, parts: {}, cursor_pos after removing prefix '{}': " "text: {}, parts: {}, cursor_pos after removing prefix '{}': "
"{}".format(self._cmd.text(), parts, self._cmd.prefix(), "{}".format(self._cmd.text(), parts, self._cmd.prefix(),
cursor_pos)) cursor_pos))
skip = 0
for i, part in enumerate(parts): for i, part in enumerate(parts):
log.completion.vdebug("Checking part {}: {}".format(i, parts[i])) log.completion.vdebug("Checking part {}: {}".format(i, parts[i]))
if not part:
skip += 1
continue
if cursor_pos <= len(part): if cursor_pos <= len(part):
# foo| bar # foo| bar
self._cursor_part = i self._cursor_part = i - skip
if spaces: if spaces:
self._empty_item_idx = i self._empty_item_idx = i - skip
else: else:
self._empty_item_idx = None self._empty_item_idx = None
log.completion.vdebug("cursor_pos {} <= len(part) {}, " log.completion.vdebug("cursor_pos {} <= len(part) {}, "
"setting cursor_part {}, empty_item_idx " "setting cursor_part {} - {} (skip), "
"{}".format(cursor_pos, len(part), i, "empty_item_idx {}".format(
self._empty_item_idx)) cursor_pos, len(part), i, skip,
self._empty_item_idx))
break break
cursor_pos -= len(part) cursor_pos -= len(part)
log.completion.vdebug( log.completion.vdebug(
"Removing len({!r}) -> {} from cursor_pos -> {}".format( "Removing len({!r}) -> {} from cursor_pos -> {}".format(
part, len(part), cursor_pos)) part, len(part), cursor_pos))
else: else:
self._cursor_part = i self._cursor_part = i - skip
if spaces: if spaces:
self._empty_item_idx = i self._empty_item_idx = i - skip
else: else:
self._empty_item_idx = None self._empty_item_idx = None
log.completion.debug("cursor_part {}, spaces {}".format( log.completion.debug("cursor_part {}, spaces {}".format(