##// END OF EJS Templates
Skip our own Python matches when using Jedi
Thomas Kluyver -
Show More
@@ -1102,13 +1102,20 b' class IPCompleter(Completer):'
1102 #= re.compile(r'[\s|\[]*(\w+)(?:\s*=?\s*.*)')
1102 #= re.compile(r'[\s|\[]*(\w+)(?:\s*=?\s*.*)')
1103
1103
1104 # All active matcher routines for completion
1104 # All active matcher routines for completion
1105 self.matchers = [
1105 if self.use_jedi:
1106 self.python_matches,
1106 self.matchers = [
1107 self.file_matches,
1107 self.file_matches,
1108 self.magic_matches,
1108 self.magic_matches,
1109 self.python_func_kw_matches,
1109 self.dict_key_matches,
1110 self.dict_key_matches,
1110 ]
1111 ]
1111 else:
1112 self.matchers = [
1113 self.python_matches,
1114 self.file_matches,
1115 self.magic_matches,
1116 self.python_func_kw_matches,
1117 self.dict_key_matches,
1118 ]
1112 self.magic_arg_matchers = [
1119 self.magic_arg_matchers = [
1113 self.magic_config_matches,
1120 self.magic_config_matches,
1114 self.magic_color_matches,
1121 self.magic_color_matches,
General Comments 0
You need to be logged in to leave comments. Login now