From c69e0c2aecf37ef9e672a88dc870ffd62c789775 2018-01-03 16:04:19
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: 2018-01-03 16:04:19
Subject: [PATCH] Skip our own Python matches when using Jedi

---

diff --git a/IPython/core/completer.py b/IPython/core/completer.py
index af19b2e..8c8e4b8 100644
--- a/IPython/core/completer.py
+++ b/IPython/core/completer.py
@@ -1102,13 +1102,20 @@ class IPCompleter(Completer):
         #= re.compile(r'[\s|\[]*(\w+)(?:\s*=?\s*.*)')
 
         # All active matcher routines for completion
-        self.matchers = [
-                         self.python_matches,
-                         self.file_matches,
-                         self.magic_matches,
-                         self.python_func_kw_matches,
-                         self.dict_key_matches,
-                         ]
+        if self.use_jedi:
+            self.matchers = [
+                self.file_matches,
+                self.magic_matches,
+                self.dict_key_matches,
+            ]
+        else:
+            self.matchers = [
+                self.python_matches,
+                self.file_matches,
+                self.magic_matches,
+                self.python_func_kw_matches,
+                self.dict_key_matches,
+            ]
         self.magic_arg_matchers = [
             self.magic_config_matches,
             self.magic_color_matches,