From f8df682b90381f16b3459dadf9321ba8de8c6443 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 12 Jan 2024 10:40:04 +0100 Subject: Reapply "Merge pull request #7955 from arza-zara/search_any_order" This reverts commit 45d483479aebb6af5a53aea97d65228d8621ad86. --- qutebrowser/completion/models/listcategory.py | 8 +++++--- tests/unit/completion/test_listcategory.py | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/qutebrowser/completion/models/listcategory.py b/qutebrowser/completion/models/listcategory.py index edf24f5a4..e46f18c69 100644 --- a/qutebrowser/completion/models/listcategory.py +++ b/qutebrowser/completion/models/listcategory.py @@ -48,9 +48,11 @@ class ListCategory(QSortFilterProxyModel): log.completion.warning(f"Trimming {len(val)}-char pattern to 5000") val = val[:5000] self._pattern = val - val = re.sub(r' +', r' ', val) # See #1919 - val = re.escape(val) - val = val.replace(r'\ ', '.*') + + # Positive lookahead per search term. This means that all search terms must + # be matched but they can be matched anywhere in the string, so they can be + # in any order. For example "foo bar" -> "(?=.*foo)(?=.*bar)" + val = '(?=.*' + ')(?=.*'.join(map(re.escape, val.split())) + ')' rx = QRegularExpression(val, QRegularExpression.PatternOption.CaseInsensitiveOption) qtutils.ensure_valid(rx) self.setFilterRegularExpression(rx) diff --git a/tests/unit/completion/test_listcategory.py b/tests/unit/completion/test_listcategory.py index b91f391bb..80bcb5c39 100644 --- a/tests/unit/completion/test_listcategory.py +++ b/tests/unit/completion/test_listcategory.py @@ -32,6 +32,11 @@ from qutebrowser.completion.models import listcategory [('foo', 'bar'), ('bar', 'foo'), ('bar', 'bar')], [('foo', 'bar'), ('bar', 'foo')], [('foo', 'bar'), ('bar', 'foo')]), + + ('foo bar', + [('foobar', ''), ('barfoo', ''), ('foobaz', '')], + [('barfoo', ''), ('foobar', '')], + [('foobar', ''), ('barfoo', '')]), ]) def test_set_pattern(pattern, before, after, after_nosort, model_validator): """Validate the filtering and sorting results of set_pattern.""" -- cgit v1.2.3-54-g00ecf