From e72e8b8556561c74eb5700c7e800aa0838f30a4c Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 14 Nov 2017 13:29:58 +0100 Subject: [PATCH] Revert "Hide quickmark/bookmark completion if empty." This reverts commit 23716f1212744878d345a81a4f9ccb65ab57605a. See #3016 Fixes #3288 Reopens #960 --- qutebrowser/completion/models/urlmodel.py | 15 +++----- tests/unit/completion/test_models.py | 46 +---------------------- 2 files changed, 7 insertions(+), 54 deletions(-) diff --git a/qutebrowser/completion/models/urlmodel.py b/qutebrowser/completion/models/urlmodel.py index 1d7a075eb..617fa74b5 100644 --- a/qutebrowser/completion/models/urlmodel.py +++ b/qutebrowser/completion/models/urlmodel.py @@ -56,17 +56,14 @@ def url(*, info): """ model = completionmodel.CompletionModel(column_widths=(40, 50, 10)) - quickmarks = [(url, name) for (name, url) - in objreg.get('quickmark-manager').marks.items()] + quickmarks = ((url, name) for (name, url) + in objreg.get('quickmark-manager').marks.items()) bookmarks = objreg.get('bookmark-manager').marks.items() - if quickmarks: - model.add_category(listcategory.ListCategory( - 'Quickmarks', quickmarks, delete_func=_delete_quickmark, - sort=False)) - if bookmarks: - model.add_category(listcategory.ListCategory( - 'Bookmarks', bookmarks, delete_func=_delete_bookmark, sort=False)) + model.add_category(listcategory.ListCategory( + 'Quickmarks', quickmarks, delete_func=_delete_quickmark, sort=False)) + model.add_category(listcategory.ListCategory( + 'Bookmarks', bookmarks, delete_func=_delete_bookmark, sort=False)) if info.config.get('completion.web_history_max_items') != 0: hist_cat = histcategory.HistoryCategory(delete_func=_delete_history) diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py index 1481ec47a..5276ffd2a 100644 --- a/tests/unit/completion/test_models.py +++ b/tests/unit/completion/test_models.py @@ -356,50 +356,6 @@ def test_url_completion(qtmodeltester, web_history_populated, }) -def test_url_completion_no_quickmarks(qtmodeltester, web_history_populated, - quickmark_manager_stub, bookmarks, info): - """Test that the quickmark category is gone with no quickmarks.""" - model = urlmodel.url(info=info) - model.set_pattern('') - qtmodeltester.data_display_may_return_none = True - qtmodeltester.check(model) - - _check_completions(model, { - "Bookmarks": [ - ('https://github.com', 'GitHub', None), - ('https://python.org', 'Welcome to Python.org', None), - ('http://qutebrowser.org', 'qutebrowser | qutebrowser', None), - ], - "History": [ - ('https://github.com', 'https://github.com', '2016-05-01'), - ('https://python.org', 'Welcome to Python.org', '2016-03-08'), - ('http://qutebrowser.org', 'qutebrowser', '2015-09-05'), - ], - }) - - -def test_url_completion_no_bookmarks(qtmodeltester, web_history_populated, - quickmarks, bookmark_manager_stub, info): - """Test that the bookmarks category is gone with no bookmarks.""" - model = urlmodel.url(info=info) - model.set_pattern('') - qtmodeltester.data_display_may_return_none = True - qtmodeltester.check(model) - - _check_completions(model, { - "Quickmarks": [ - ('https://wiki.archlinux.org', 'aw', None), - ('https://wikipedia.org', 'wiki', None), - ('https://duckduckgo.com', 'ddg', None), - ], - "History": [ - ('https://github.com', 'https://github.com', '2016-05-01'), - ('https://python.org', 'Welcome to Python.org', '2016-03-08'), - ('http://qutebrowser.org', 'qutebrowser', '2015-09-05'), - ], - }) - - @pytest.mark.parametrize('url, title, pattern, rowcount', [ ('example.com', 'Site Title', '', 1), ('example.com', 'Site Title', 'ex', 1), @@ -426,7 +382,7 @@ def test_url_completion_pattern(web_history, quickmark_manager_stub, model = urlmodel.url(info=info) model.set_pattern(pattern) # 2, 0 is History - assert model.rowCount(model.index(0, 0)) == rowcount + assert model.rowCount(model.index(2, 0)) == rowcount def test_url_completion_delete_bookmark(qtmodeltester, bookmarks,