From e23d611b3750c2fcd295c4826dd794311de26278 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Mon, 12 Sep 2016 21:30:10 -0400
Subject: [PATCH] Strip quotes from completion pattern.

Given a commandline like:
`:set general editor "gvim -f"|`, the pattern should be 'gvim -f'
rather than '"gvim -f"'.
---
 qutebrowser/completion/completer.py     | 1 +
 tests/unit/completion/test_completer.py | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index 9fdc816ed..e06187116 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -252,6 +252,7 @@ class Completer(QObject):
             completion.set_model(None)
             return
 
+        pattern = pattern.strip("'\"")
         model = self._get_new_completion(before_cursor, pattern)
 
         log.completion.debug("Setting completion model to {} with pattern '{}'"
diff --git a/tests/unit/completion/test_completer.py b/tests/unit/completion/test_completer.py
index 473058a34..b84751b44 100644
--- a/tests/unit/completion/test_completer.py
+++ b/tests/unit/completion/test_completer.py
@@ -82,7 +82,7 @@ def instances(monkeypatch):
     }
     instances[usertypes.Completion.value] = {
         'general': {
-            'ignore-case': FakeCompletionModel(usertypes.Completion.value),
+            'editor': FakeCompletionModel(usertypes.Completion.value),
         }
     }
     monkeypatch.setattr('qutebrowser.completion.completer.instances',
@@ -150,7 +150,10 @@ def _set_cmd_prompt(cmd, txt):
     (':set gen|', usertypes.Completion.section, 'gen'),
     (':set general |', usertypes.Completion.option, ''),
     (':set what |', None, ''),
-    (':set general ignore-case |', usertypes.Completion.value, ''),
+    (':set general editor |', usertypes.Completion.value, ''),
+    (':set general editor gv|', usertypes.Completion.value, 'gv'),
+    (':set general editor "gvim -f"|', usertypes.Completion.value, 'gvim -f'),
+    (':set general editor "gvim |', usertypes.Completion.value, 'gvim'),
     (':set general huh |', None, ''),
     (':help |', usertypes.Completion.helptopic, ''),
     (':help     |', usertypes.Completion.helptopic, ''),