From bb63f9fd921df0a25d52c11fd4a3bd4f6d7b1877 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 5 Nov 2017 07:39:20 -0500
Subject: [PATCH 1/2] Implement completion-item-yank.

Yank the text from the first column of the completion menu.
Resolves #1588.
---
 qutebrowser/completion/completionwidget.py     | 14 ++++++++++++++
 tests/unit/completion/test_completionwidget.py | 17 +++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/qutebrowser/completion/completionwidget.py b/qutebrowser/completion/completionwidget.py
index 43ebffa84..bec0e6511 100644
--- a/qutebrowser/completion/completionwidget.py
+++ b/qutebrowser/completion/completionwidget.py
@@ -377,3 +377,17 @@ class CompletionView(QTreeView):
         if not index.isValid():
             raise cmdexc.CommandError("No item selected!")
         self.model().delete_cur_item(index)
+
+    @cmdutils.register(instance='completion', hide=True,
+                       modes=[usertypes.KeyMode.command], scope='window')
+    def completion_item_yank(self, sel=False):
+        """Yank the current completion item onto the clipboard.
+
+        Args:
+            sel: True to use the primary selection instead of the clipboard.
+        """
+        index = self.currentIndex()
+        if not index.isValid():
+            raise cmdexc.CommandError("No item selected!")
+        data = self.model().data(index)
+        utils.set_clipboard(data, selection=sel)
diff --git a/tests/unit/completion/test_completionwidget.py b/tests/unit/completion/test_completionwidget.py
index 22c71a2b7..500f9614a 100644
--- a/tests/unit/completion/test_completionwidget.py
+++ b/tests/unit/completion/test_completionwidget.py
@@ -245,6 +245,23 @@ def test_completion_item_del_no_selection(completionview):
     func.assert_not_called()
 
 
+@pytest.mark.parametrize('sel', [True, False])
+def test_completion_item_yank(completionview, mocker, sel):
+    """Test that completion_item_yank invokes delete_cur_item in the model."""
+    m = mocker.patch(
+        'qutebrowser.completion.completionwidget.utils',
+        autospec=True)
+    model = completionmodel.CompletionModel()
+    cat = listcategory.ListCategory('', [('foo', 'bar')])
+    model.add_category(cat)
+
+    completionview.set_model(model)
+    completionview.completion_item_focus('next')
+    completionview.completion_item_yank(sel)
+
+    m.set_clipboard.assert_called_once_with('foo', sel)
+
+
 def test_resize_no_model(completionview, qtbot):
     """Ensure no crash if resizeEvent is triggered with no model (#2854)."""
     completionview.resizeEvent(None)

From db3b1aee0de1438abb433996cdfde71de21884e0 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 5 Nov 2017 11:14:28 -0500
Subject: [PATCH 2/2] Add default ctrl+c binding for completion yank.

By default, ctrl+c will yank the selection from the completion menu onto
the clipboard, and ctrl+shift+c will yank it onto the primary selection.

Unfortunately ctrl+y was already taken by rl-yank (which,
counter-intuitively to vim users, will paste the last deleted text).
---
 qutebrowser/config/configdata.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index a99152e88..28afa03f6 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -2245,6 +2245,8 @@ bindings.default:
       <Ctrl-Shift-Tab>: completion-item-focus prev-category
       <Ctrl-D>: completion-item-del
       <Shift-Delete>: completion-item-del
+      <Ctrl-C>: completion-item-yank
+      <Ctrl-Shift-C>: completion-item-yank --sel
       <Return>: command-accept
       <Ctrl-B>: rl-backward-char
       <Ctrl-F>: rl-forward-char