From 5124eed23f284a5eb609a2e39167814bd6247201 Mon Sep 17 00:00:00 2001 From: Jason Rosenzweig Date: Fri, 16 Jul 2021 14:57:46 +0800 Subject: [PATCH 1/6] Fixed bug with gd^U --- qutebrowser/mainwindow/prompt.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py index c8cbe572b..8fee98cb1 100644 --- a/qutebrowser/mainwindow/prompt.py +++ b/qutebrowser/mainwindow/prompt.py @@ -690,10 +690,11 @@ class FilenamePrompt(_BasePrompt): path = os.path.join(self._file_model.rootPath(), self._to_complete) else: path = os.path.normpath(self._file_model.filePath(index)) + print(path) if clicked: path += os.sep - else: + elif path != "/": # On Windows, when we have C:\foo and tab over .., we get C:\ path = path.rstrip(os.sep) From 5f41df5efc042e4d5ffe14465bd72f60f5761854 Mon Sep 17 00:00:00 2001 From: Jason Rosenzweig Date: Fri, 16 Jul 2021 14:59:21 +0800 Subject: [PATCH 2/6] Removed print statement --- qutebrowser/mainwindow/prompt.py | 1 - 1 file changed, 1 deletion(-) diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py index 8fee98cb1..981e6ed38 100644 --- a/qutebrowser/mainwindow/prompt.py +++ b/qutebrowser/mainwindow/prompt.py @@ -690,7 +690,6 @@ class FilenamePrompt(_BasePrompt): path = os.path.join(self._file_model.rootPath(), self._to_complete) else: path = os.path.normpath(self._file_model.filePath(index)) - print(path) if clicked: path += os.sep From 3cf211c807ed05feea26e4c60193fe252452ab02 Mon Sep 17 00:00:00 2001 From: Jason Rosenzweig Date: Mon, 19 Jul 2021 21:13:18 +0800 Subject: [PATCH 3/6] Added test for ^U --- tests/unit/mainwindow/test_prompt.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/unit/mainwindow/test_prompt.py b/tests/unit/mainwindow/test_prompt.py index 5b774bdaa..9e6e55617 100644 --- a/tests/unit/mainwindow/test_prompt.py +++ b/tests/unit/mainwindow/test_prompt.py @@ -18,6 +18,7 @@ # along with qutebrowser. If not, see . import os +from PyQt5.QtGui import QKeySequence import pytest from PyQt5.QtCore import Qt @@ -130,3 +131,9 @@ class TestFileCompletion: """With / as path, show root contents.""" prompt = get_prompt('/') assert prompt._file_model.rootPath() == '/' + + def test_tab_root(self, get_prompt, qtbot): + prompt = get_prompt('/') + qtbot.keySequence(prompt._lineedit, QKeySequence(Qt.CTRL + Qt.Key_U)) + prompt.item_focus('next') + assert prompt._lineedit.text() == '/' \ No newline at end of file From 93d58704d94d87d747c5290bef3507cddd489772 Mon Sep 17 00:00:00 2001 From: Jason Rosenzweig Date: Mon, 19 Jul 2021 21:14:31 +0800 Subject: [PATCH 4/6] Removed whitespace --- tests/unit/mainwindow/test_prompt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/mainwindow/test_prompt.py b/tests/unit/mainwindow/test_prompt.py index 9e6e55617..c2a69523e 100644 --- a/tests/unit/mainwindow/test_prompt.py +++ b/tests/unit/mainwindow/test_prompt.py @@ -131,7 +131,7 @@ class TestFileCompletion: """With / as path, show root contents.""" prompt = get_prompt('/') assert prompt._file_model.rootPath() == '/' - + def test_tab_root(self, get_prompt, qtbot): prompt = get_prompt('/') qtbot.keySequence(prompt._lineedit, QKeySequence(Qt.CTRL + Qt.Key_U)) From 4b152c14ece741411566847e99e0a0235036e574 Mon Sep 17 00:00:00 2001 From: Jason Rosenzweig Date: Mon, 19 Jul 2021 21:14:49 +0800 Subject: [PATCH 5/6] Removed whitespace --- tests/unit/mainwindow/test_prompt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/mainwindow/test_prompt.py b/tests/unit/mainwindow/test_prompt.py index c2a69523e..92a70c3d4 100644 --- a/tests/unit/mainwindow/test_prompt.py +++ b/tests/unit/mainwindow/test_prompt.py @@ -131,7 +131,7 @@ class TestFileCompletion: """With / as path, show root contents.""" prompt = get_prompt('/') assert prompt._file_model.rootPath() == '/' - + def test_tab_root(self, get_prompt, qtbot): prompt = get_prompt('/') qtbot.keySequence(prompt._lineedit, QKeySequence(Qt.CTRL + Qt.Key_U)) From e182b3dd748e4e3a8fee8889ab8d26b4c7df0527 Mon Sep 17 00:00:00 2001 From: Jason Rosenzweig Date: Mon, 19 Jul 2021 21:43:47 +0800 Subject: [PATCH 6/6] Updated test to not use keySequence --- tests/unit/mainwindow/test_prompt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/mainwindow/test_prompt.py b/tests/unit/mainwindow/test_prompt.py index 92a70c3d4..911e353e2 100644 --- a/tests/unit/mainwindow/test_prompt.py +++ b/tests/unit/mainwindow/test_prompt.py @@ -134,6 +134,6 @@ class TestFileCompletion: def test_tab_root(self, get_prompt, qtbot): prompt = get_prompt('/') - qtbot.keySequence(prompt._lineedit, QKeySequence(Qt.CTRL + Qt.Key_U)) + qtbot.keyPress(prompt._lineedit, Qt.Key_U, Qt.ControlModifier) prompt.item_focus('next') assert prompt._lineedit.text() == '/' \ No newline at end of file