Show More
@@ -1,2060 +1,2060 | |||||
1 | """Completion for IPython. |
|
1 | """Completion for IPython. | |
2 |
|
2 | |||
3 | This module started as fork of the rlcompleter module in the Python standard |
|
3 | This module started as fork of the rlcompleter module in the Python standard | |
4 | library. The original enhancements made to rlcompleter have been sent |
|
4 | library. The original enhancements made to rlcompleter have been sent | |
5 | upstream and were accepted as of Python 2.3, |
|
5 | upstream and were accepted as of Python 2.3, | |
6 |
|
6 | |||
7 | This module now support a wide variety of completion mechanism both available |
|
7 | This module now support a wide variety of completion mechanism both available | |
8 | for normal classic Python code, as well as completer for IPython specific |
|
8 | for normal classic Python code, as well as completer for IPython specific | |
9 | Syntax like magics. |
|
9 | Syntax like magics. | |
10 |
|
10 | |||
11 | Latex and Unicode completion |
|
11 | Latex and Unicode completion | |
12 | ============================ |
|
12 | ============================ | |
13 |
|
13 | |||
14 | IPython and compatible frontends not only can complete your code, but can help |
|
14 | IPython and compatible frontends not only can complete your code, but can help | |
15 | you to input a wide range of characters. In particular we allow you to insert |
|
15 | you to input a wide range of characters. In particular we allow you to insert | |
16 | a unicode character using the tab completion mechanism. |
|
16 | a unicode character using the tab completion mechanism. | |
17 |
|
17 | |||
18 | Forward latex/unicode completion |
|
18 | Forward latex/unicode completion | |
19 | -------------------------------- |
|
19 | -------------------------------- | |
20 |
|
20 | |||
21 | Forward completion allows you to easily type a unicode character using its latex |
|
21 | Forward completion allows you to easily type a unicode character using its latex | |
22 | name, or unicode long description. To do so type a backslash follow by the |
|
22 | name, or unicode long description. To do so type a backslash follow by the | |
23 | relevant name and press tab: |
|
23 | relevant name and press tab: | |
24 |
|
24 | |||
25 |
|
25 | |||
26 | Using latex completion: |
|
26 | Using latex completion: | |
27 |
|
27 | |||
28 | .. code:: |
|
28 | .. code:: | |
29 |
|
29 | |||
30 | \\alpha<tab> |
|
30 | \\alpha<tab> | |
31 | Ξ± |
|
31 | Ξ± | |
32 |
|
32 | |||
33 | or using unicode completion: |
|
33 | or using unicode completion: | |
34 |
|
34 | |||
35 |
|
35 | |||
36 | .. code:: |
|
36 | .. code:: | |
37 |
|
37 | |||
38 | \\greek small letter alpha<tab> |
|
38 | \\greek small letter alpha<tab> | |
39 | Ξ± |
|
39 | Ξ± | |
40 |
|
40 | |||
41 |
|
41 | |||
42 | Only valid Python identifiers will complete. Combining characters (like arrow or |
|
42 | Only valid Python identifiers will complete. Combining characters (like arrow or | |
43 | dots) are also available, unlike latex they need to be put after the their |
|
43 | dots) are also available, unlike latex they need to be put after the their | |
44 | counterpart that is to say, `F\\\\vec<tab>` is correct, not `\\\\vec<tab>F`. |
|
44 | counterpart that is to say, `F\\\\vec<tab>` is correct, not `\\\\vec<tab>F`. | |
45 |
|
45 | |||
46 | Some browsers are known to display combining characters incorrectly. |
|
46 | Some browsers are known to display combining characters incorrectly. | |
47 |
|
47 | |||
48 | Backward latex completion |
|
48 | Backward latex completion | |
49 | ------------------------- |
|
49 | ------------------------- | |
50 |
|
50 | |||
51 | It is sometime challenging to know how to type a character, if you are using |
|
51 | It is sometime challenging to know how to type a character, if you are using | |
52 | IPython, or any compatible frontend you can prepend backslash to the character |
|
52 | IPython, or any compatible frontend you can prepend backslash to the character | |
53 | and press `<tab>` to expand it to its latex form. |
|
53 | and press `<tab>` to expand it to its latex form. | |
54 |
|
54 | |||
55 | .. code:: |
|
55 | .. code:: | |
56 |
|
56 | |||
57 | \\Ξ±<tab> |
|
57 | \\Ξ±<tab> | |
58 | \\alpha |
|
58 | \\alpha | |
59 |
|
59 | |||
60 |
|
60 | |||
61 | Both forward and backward completions can be deactivated by setting the |
|
61 | Both forward and backward completions can be deactivated by setting the | |
62 | ``Completer.backslash_combining_completions`` option to ``False``. |
|
62 | ``Completer.backslash_combining_completions`` option to ``False``. | |
63 |
|
63 | |||
64 |
|
64 | |||
65 | Experimental |
|
65 | Experimental | |
66 | ============ |
|
66 | ============ | |
67 |
|
67 | |||
68 | Starting with IPython 6.0, this module can make use of the Jedi library to |
|
68 | Starting with IPython 6.0, this module can make use of the Jedi library to | |
69 | generate completions both using static analysis of the code, and dynamically |
|
69 | generate completions both using static analysis of the code, and dynamically | |
70 | inspecting multiple namespaces. The APIs attached to this new mechanism is |
|
70 | inspecting multiple namespaces. The APIs attached to this new mechanism is | |
71 | unstable and will raise unless use in an :any:`provisionalcompleter` context |
|
71 | unstable and will raise unless use in an :any:`provisionalcompleter` context | |
72 | manager. |
|
72 | manager. | |
73 |
|
73 | |||
74 | You will find that the following are experimental: |
|
74 | You will find that the following are experimental: | |
75 |
|
75 | |||
76 | - :any:`provisionalcompleter` |
|
76 | - :any:`provisionalcompleter` | |
77 | - :any:`IPCompleter.completions` |
|
77 | - :any:`IPCompleter.completions` | |
78 | - :any:`Completion` |
|
78 | - :any:`Completion` | |
79 | - :any:`rectify_completions` |
|
79 | - :any:`rectify_completions` | |
80 |
|
80 | |||
81 | .. note:: |
|
81 | .. note:: | |
82 |
|
82 | |||
83 | better name for :any:`rectify_completions` ? |
|
83 | better name for :any:`rectify_completions` ? | |
84 |
|
84 | |||
85 | We welcome any feedback on these new API, and we also encourage you to try this |
|
85 | We welcome any feedback on these new API, and we also encourage you to try this | |
86 | module in debug mode (start IPython with ``--Completer.debug=True``) in order |
|
86 | module in debug mode (start IPython with ``--Completer.debug=True``) in order | |
87 | to have extra logging information is :any:`jedi` is crashing, or if current |
|
87 | to have extra logging information is :any:`jedi` is crashing, or if current | |
88 | IPython completer pending deprecations are returning results not yet handled |
|
88 | IPython completer pending deprecations are returning results not yet handled | |
89 | by :any:`jedi` |
|
89 | by :any:`jedi` | |
90 |
|
90 | |||
91 | Using Jedi for tab completion allow snippets like the following to work without |
|
91 | Using Jedi for tab completion allow snippets like the following to work without | |
92 | having to execute any code: |
|
92 | having to execute any code: | |
93 |
|
93 | |||
94 | >>> myvar = ['hello', 42] |
|
94 | >>> myvar = ['hello', 42] | |
95 | ... myvar[1].bi<tab> |
|
95 | ... myvar[1].bi<tab> | |
96 |
|
96 | |||
97 | Tab completion will be able to infer that ``myvar[1]`` is a real number without |
|
97 | Tab completion will be able to infer that ``myvar[1]`` is a real number without | |
98 | executing any code unlike the previously available ``IPCompleter.greedy`` |
|
98 | executing any code unlike the previously available ``IPCompleter.greedy`` | |
99 | option. |
|
99 | option. | |
100 |
|
100 | |||
101 | Be sure to update :any:`jedi` to the latest stable version or to try the |
|
101 | Be sure to update :any:`jedi` to the latest stable version or to try the | |
102 | current development version to get better completions. |
|
102 | current development version to get better completions. | |
103 | """ |
|
103 | """ | |
104 |
|
104 | |||
105 |
|
105 | |||
106 | # Copyright (c) IPython Development Team. |
|
106 | # Copyright (c) IPython Development Team. | |
107 | # Distributed under the terms of the Modified BSD License. |
|
107 | # Distributed under the terms of the Modified BSD License. | |
108 | # |
|
108 | # | |
109 | # Some of this code originated from rlcompleter in the Python standard library |
|
109 | # Some of this code originated from rlcompleter in the Python standard library | |
110 | # Copyright (C) 2001 Python Software Foundation, www.python.org |
|
110 | # Copyright (C) 2001 Python Software Foundation, www.python.org | |
111 |
|
111 | |||
112 |
|
112 | |||
113 | import __main__ |
|
113 | import __main__ | |
114 | import builtins as builtin_mod |
|
114 | import builtins as builtin_mod | |
115 | import glob |
|
115 | import glob | |
116 | import time |
|
116 | import time | |
117 | import inspect |
|
117 | import inspect | |
118 | import itertools |
|
118 | import itertools | |
119 | import keyword |
|
119 | import keyword | |
120 | import os |
|
120 | import os | |
121 | import re |
|
121 | import re | |
122 | import sys |
|
122 | import sys | |
123 | import unicodedata |
|
123 | import unicodedata | |
124 | import string |
|
124 | import string | |
125 | import warnings |
|
125 | import warnings | |
126 |
|
126 | |||
127 | from contextlib import contextmanager |
|
127 | from contextlib import contextmanager | |
128 | from importlib import import_module |
|
128 | from importlib import import_module | |
129 | from typing import Iterator, List, Tuple, Iterable, Union |
|
129 | from typing import Iterator, List, Tuple, Iterable, Union | |
130 | from types import SimpleNamespace |
|
130 | from types import SimpleNamespace | |
131 |
|
131 | |||
132 | from traitlets.config.configurable import Configurable |
|
132 | from traitlets.config.configurable import Configurable | |
133 | from IPython.core.error import TryNext |
|
133 | from IPython.core.error import TryNext | |
134 | from IPython.core.inputsplitter import ESC_MAGIC |
|
134 | from IPython.core.inputsplitter import ESC_MAGIC | |
135 | from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol |
|
135 | from IPython.core.latex_symbols import latex_symbols, reverse_latex_symbol | |
136 | from IPython.core.oinspect import InspectColors |
|
136 | from IPython.core.oinspect import InspectColors | |
137 | from IPython.utils import generics |
|
137 | from IPython.utils import generics | |
138 | from IPython.utils.dir2 import dir2, get_real_method |
|
138 | from IPython.utils.dir2 import dir2, get_real_method | |
139 | from IPython.utils.process import arg_split |
|
139 | from IPython.utils.process import arg_split | |
140 | from traitlets import Bool, Enum, observe, Int |
|
140 | from traitlets import Bool, Enum, observe, Int | |
141 |
|
141 | |||
142 | # skip module docstests |
|
142 | # skip module docstests | |
143 | skip_doctest = True |
|
143 | skip_doctest = True | |
144 |
|
144 | |||
145 | try: |
|
145 | try: | |
146 | import jedi |
|
146 | import jedi | |
147 | jedi.settings.case_insensitive_completion = False |
|
147 | jedi.settings.case_insensitive_completion = False | |
148 | import jedi.api.helpers |
|
148 | import jedi.api.helpers | |
149 | import jedi.api.classes |
|
149 | import jedi.api.classes | |
150 | JEDI_INSTALLED = True |
|
150 | JEDI_INSTALLED = True | |
151 | except ImportError: |
|
151 | except ImportError: | |
152 | JEDI_INSTALLED = False |
|
152 | JEDI_INSTALLED = False | |
153 | #----------------------------------------------------------------------------- |
|
153 | #----------------------------------------------------------------------------- | |
154 | # Globals |
|
154 | # Globals | |
155 | #----------------------------------------------------------------------------- |
|
155 | #----------------------------------------------------------------------------- | |
156 |
|
156 | |||
157 | # Public API |
|
157 | # Public API | |
158 | __all__ = ['Completer','IPCompleter'] |
|
158 | __all__ = ['Completer','IPCompleter'] | |
159 |
|
159 | |||
160 | if sys.platform == 'win32': |
|
160 | if sys.platform == 'win32': | |
161 | PROTECTABLES = ' ' |
|
161 | PROTECTABLES = ' ' | |
162 | else: |
|
162 | else: | |
163 | PROTECTABLES = ' ()[]{}?=\\|;:\'#*"^&' |
|
163 | PROTECTABLES = ' ()[]{}?=\\|;:\'#*"^&' | |
164 |
|
164 | |||
165 | # Protect against returning an enormous number of completions which the frontend |
|
165 | # Protect against returning an enormous number of completions which the frontend | |
166 | # may have trouble processing. |
|
166 | # may have trouble processing. | |
167 | MATCHES_LIMIT = 500 |
|
167 | MATCHES_LIMIT = 500 | |
168 |
|
168 | |||
169 | _deprecation_readline_sentinel = object() |
|
169 | _deprecation_readline_sentinel = object() | |
170 |
|
170 | |||
171 |
|
171 | |||
172 | class ProvisionalCompleterWarning(FutureWarning): |
|
172 | class ProvisionalCompleterWarning(FutureWarning): | |
173 | """ |
|
173 | """ | |
174 | Exception raise by an experimental feature in this module. |
|
174 | Exception raise by an experimental feature in this module. | |
175 |
|
175 | |||
176 | Wrap code in :any:`provisionalcompleter` context manager if you |
|
176 | Wrap code in :any:`provisionalcompleter` context manager if you | |
177 | are certain you want to use an unstable feature. |
|
177 | are certain you want to use an unstable feature. | |
178 | """ |
|
178 | """ | |
179 | pass |
|
179 | pass | |
180 |
|
180 | |||
181 | warnings.filterwarnings('error', category=ProvisionalCompleterWarning) |
|
181 | warnings.filterwarnings('error', category=ProvisionalCompleterWarning) | |
182 |
|
182 | |||
183 | @contextmanager |
|
183 | @contextmanager | |
184 | def provisionalcompleter(action='ignore'): |
|
184 | def provisionalcompleter(action='ignore'): | |
185 | """ |
|
185 | """ | |
186 |
|
186 | |||
187 |
|
187 | |||
188 | This contest manager has to be used in any place where unstable completer |
|
188 | This contest manager has to be used in any place where unstable completer | |
189 | behavior and API may be called. |
|
189 | behavior and API may be called. | |
190 |
|
190 | |||
191 | >>> with provisionalcompleter(): |
|
191 | >>> with provisionalcompleter(): | |
192 | ... completer.do_experimetal_things() # works |
|
192 | ... completer.do_experimetal_things() # works | |
193 |
|
193 | |||
194 | >>> completer.do_experimental_things() # raises. |
|
194 | >>> completer.do_experimental_things() # raises. | |
195 |
|
195 | |||
196 | .. note:: Unstable |
|
196 | .. note:: Unstable | |
197 |
|
197 | |||
198 | By using this context manager you agree that the API in use may change |
|
198 | By using this context manager you agree that the API in use may change | |
199 | without warning, and that you won't complain if they do so. |
|
199 | without warning, and that you won't complain if they do so. | |
200 |
|
200 | |||
201 | You also understand that if the API is not to you liking you should report |
|
201 | You also understand that if the API is not to you liking you should report | |
202 | a bug to explain your use case upstream and improve the API and will loose |
|
202 | a bug to explain your use case upstream and improve the API and will loose | |
203 | credibility if you complain after the API is make stable. |
|
203 | credibility if you complain after the API is make stable. | |
204 |
|
204 | |||
205 | We'll be happy to get your feedback , feature request and improvement on |
|
205 | We'll be happy to get your feedback , feature request and improvement on | |
206 | any of the unstable APIs ! |
|
206 | any of the unstable APIs ! | |
207 | """ |
|
207 | """ | |
208 | with warnings.catch_warnings(): |
|
208 | with warnings.catch_warnings(): | |
209 | warnings.filterwarnings(action, category=ProvisionalCompleterWarning) |
|
209 | warnings.filterwarnings(action, category=ProvisionalCompleterWarning) | |
210 | yield |
|
210 | yield | |
211 |
|
211 | |||
212 |
|
212 | |||
213 | def has_open_quotes(s): |
|
213 | def has_open_quotes(s): | |
214 | """Return whether a string has open quotes. |
|
214 | """Return whether a string has open quotes. | |
215 |
|
215 | |||
216 | This simply counts whether the number of quote characters of either type in |
|
216 | This simply counts whether the number of quote characters of either type in | |
217 | the string is odd. |
|
217 | the string is odd. | |
218 |
|
218 | |||
219 | Returns |
|
219 | Returns | |
220 | ------- |
|
220 | ------- | |
221 | If there is an open quote, the quote character is returned. Else, return |
|
221 | If there is an open quote, the quote character is returned. Else, return | |
222 | False. |
|
222 | False. | |
223 | """ |
|
223 | """ | |
224 | # We check " first, then ', so complex cases with nested quotes will get |
|
224 | # We check " first, then ', so complex cases with nested quotes will get | |
225 | # the " to take precedence. |
|
225 | # the " to take precedence. | |
226 | if s.count('"') % 2: |
|
226 | if s.count('"') % 2: | |
227 | return '"' |
|
227 | return '"' | |
228 | elif s.count("'") % 2: |
|
228 | elif s.count("'") % 2: | |
229 | return "'" |
|
229 | return "'" | |
230 | else: |
|
230 | else: | |
231 | return False |
|
231 | return False | |
232 |
|
232 | |||
233 |
|
233 | |||
234 | def protect_filename(s, protectables=PROTECTABLES): |
|
234 | def protect_filename(s, protectables=PROTECTABLES): | |
235 | """Escape a string to protect certain characters.""" |
|
235 | """Escape a string to protect certain characters.""" | |
236 | if set(s) & set(protectables): |
|
236 | if set(s) & set(protectables): | |
237 | if sys.platform == "win32": |
|
237 | if sys.platform == "win32": | |
238 | return '"' + s + '"' |
|
238 | return '"' + s + '"' | |
239 | else: |
|
239 | else: | |
240 | return "".join(("\\" + c if c in protectables else c) for c in s) |
|
240 | return "".join(("\\" + c if c in protectables else c) for c in s) | |
241 | else: |
|
241 | else: | |
242 | return s |
|
242 | return s | |
243 |
|
243 | |||
244 |
|
244 | |||
245 | def expand_user(path:str) -> Tuple[str, bool, str]: |
|
245 | def expand_user(path:str) -> Tuple[str, bool, str]: | |
246 | """Expand ``~``-style usernames in strings. |
|
246 | """Expand ``~``-style usernames in strings. | |
247 |
|
247 | |||
248 | This is similar to :func:`os.path.expanduser`, but it computes and returns |
|
248 | This is similar to :func:`os.path.expanduser`, but it computes and returns | |
249 | extra information that will be useful if the input was being used in |
|
249 | extra information that will be useful if the input was being used in | |
250 | computing completions, and you wish to return the completions with the |
|
250 | computing completions, and you wish to return the completions with the | |
251 | original '~' instead of its expanded value. |
|
251 | original '~' instead of its expanded value. | |
252 |
|
252 | |||
253 | Parameters |
|
253 | Parameters | |
254 | ---------- |
|
254 | ---------- | |
255 | path : str |
|
255 | path : str | |
256 | String to be expanded. If no ~ is present, the output is the same as the |
|
256 | String to be expanded. If no ~ is present, the output is the same as the | |
257 | input. |
|
257 | input. | |
258 |
|
258 | |||
259 | Returns |
|
259 | Returns | |
260 | ------- |
|
260 | ------- | |
261 | newpath : str |
|
261 | newpath : str | |
262 | Result of ~ expansion in the input path. |
|
262 | Result of ~ expansion in the input path. | |
263 | tilde_expand : bool |
|
263 | tilde_expand : bool | |
264 | Whether any expansion was performed or not. |
|
264 | Whether any expansion was performed or not. | |
265 | tilde_val : str |
|
265 | tilde_val : str | |
266 | The value that ~ was replaced with. |
|
266 | The value that ~ was replaced with. | |
267 | """ |
|
267 | """ | |
268 | # Default values |
|
268 | # Default values | |
269 | tilde_expand = False |
|
269 | tilde_expand = False | |
270 | tilde_val = '' |
|
270 | tilde_val = '' | |
271 | newpath = path |
|
271 | newpath = path | |
272 |
|
272 | |||
273 | if path.startswith('~'): |
|
273 | if path.startswith('~'): | |
274 | tilde_expand = True |
|
274 | tilde_expand = True | |
275 | rest = len(path)-1 |
|
275 | rest = len(path)-1 | |
276 | newpath = os.path.expanduser(path) |
|
276 | newpath = os.path.expanduser(path) | |
277 | if rest: |
|
277 | if rest: | |
278 | tilde_val = newpath[:-rest] |
|
278 | tilde_val = newpath[:-rest] | |
279 | else: |
|
279 | else: | |
280 | tilde_val = newpath |
|
280 | tilde_val = newpath | |
281 |
|
281 | |||
282 | return newpath, tilde_expand, tilde_val |
|
282 | return newpath, tilde_expand, tilde_val | |
283 |
|
283 | |||
284 |
|
284 | |||
285 | def compress_user(path:str, tilde_expand:bool, tilde_val:str) -> str: |
|
285 | def compress_user(path:str, tilde_expand:bool, tilde_val:str) -> str: | |
286 | """Does the opposite of expand_user, with its outputs. |
|
286 | """Does the opposite of expand_user, with its outputs. | |
287 | """ |
|
287 | """ | |
288 | if tilde_expand: |
|
288 | if tilde_expand: | |
289 | return path.replace(tilde_val, '~') |
|
289 | return path.replace(tilde_val, '~') | |
290 | else: |
|
290 | else: | |
291 | return path |
|
291 | return path | |
292 |
|
292 | |||
293 |
|
293 | |||
294 | def completions_sorting_key(word): |
|
294 | def completions_sorting_key(word): | |
295 | """key for sorting completions |
|
295 | """key for sorting completions | |
296 |
|
296 | |||
297 | This does several things: |
|
297 | This does several things: | |
298 |
|
298 | |||
299 | - Demote any completions starting with underscores to the end |
|
299 | - Demote any completions starting with underscores to the end | |
300 | - Insert any %magic and %%cellmagic completions in the alphabetical order |
|
300 | - Insert any %magic and %%cellmagic completions in the alphabetical order | |
301 | by their name |
|
301 | by their name | |
302 | """ |
|
302 | """ | |
303 | prio1, prio2 = 0, 0 |
|
303 | prio1, prio2 = 0, 0 | |
304 |
|
304 | |||
305 | if word.startswith('__'): |
|
305 | if word.startswith('__'): | |
306 | prio1 = 2 |
|
306 | prio1 = 2 | |
307 | elif word.startswith('_'): |
|
307 | elif word.startswith('_'): | |
308 | prio1 = 1 |
|
308 | prio1 = 1 | |
309 |
|
309 | |||
310 | if word.endswith('='): |
|
310 | if word.endswith('='): | |
311 | prio1 = -1 |
|
311 | prio1 = -1 | |
312 |
|
312 | |||
313 | if word.startswith('%%'): |
|
313 | if word.startswith('%%'): | |
314 | # If there's another % in there, this is something else, so leave it alone |
|
314 | # If there's another % in there, this is something else, so leave it alone | |
315 | if not "%" in word[2:]: |
|
315 | if not "%" in word[2:]: | |
316 | word = word[2:] |
|
316 | word = word[2:] | |
317 | prio2 = 2 |
|
317 | prio2 = 2 | |
318 | elif word.startswith('%'): |
|
318 | elif word.startswith('%'): | |
319 | if not "%" in word[1:]: |
|
319 | if not "%" in word[1:]: | |
320 | word = word[1:] |
|
320 | word = word[1:] | |
321 | prio2 = 1 |
|
321 | prio2 = 1 | |
322 |
|
322 | |||
323 | return prio1, word, prio2 |
|
323 | return prio1, word, prio2 | |
324 |
|
324 | |||
325 |
|
325 | |||
326 | class _FakeJediCompletion: |
|
326 | class _FakeJediCompletion: | |
327 | """ |
|
327 | """ | |
328 | This is a workaround to communicate to the UI that Jedi has crashed and to |
|
328 | This is a workaround to communicate to the UI that Jedi has crashed and to | |
329 | report a bug. Will be used only id :any:`IPCompleter.debug` is set to true. |
|
329 | report a bug. Will be used only id :any:`IPCompleter.debug` is set to true. | |
330 |
|
330 | |||
331 | Added in IPython 6.0 so should likely be removed for 7.0 |
|
331 | Added in IPython 6.0 so should likely be removed for 7.0 | |
332 |
|
332 | |||
333 | """ |
|
333 | """ | |
334 |
|
334 | |||
335 | def __init__(self, name): |
|
335 | def __init__(self, name): | |
336 |
|
336 | |||
337 | self.name = name |
|
337 | self.name = name | |
338 | self.complete = name |
|
338 | self.complete = name | |
339 | self.type = 'crashed' |
|
339 | self.type = 'crashed' | |
340 | self.name_with_symbols = name |
|
340 | self.name_with_symbols = name | |
341 | self.signature = '' |
|
341 | self.signature = '' | |
342 | self._origin = 'fake' |
|
342 | self._origin = 'fake' | |
343 |
|
343 | |||
344 | def __repr__(self): |
|
344 | def __repr__(self): | |
345 | return '<Fake completion object jedi has crashed>' |
|
345 | return '<Fake completion object jedi has crashed>' | |
346 |
|
346 | |||
347 |
|
347 | |||
348 | class Completion: |
|
348 | class Completion: | |
349 | """ |
|
349 | """ | |
350 | Completion object used and return by IPython completers. |
|
350 | Completion object used and return by IPython completers. | |
351 |
|
351 | |||
352 | .. warning:: Unstable |
|
352 | .. warning:: Unstable | |
353 |
|
353 | |||
354 | This function is unstable, API may change without warning. |
|
354 | This function is unstable, API may change without warning. | |
355 | It will also raise unless use in proper context manager. |
|
355 | It will also raise unless use in proper context manager. | |
356 |
|
356 | |||
357 | This act as a middle ground :any:`Completion` object between the |
|
357 | This act as a middle ground :any:`Completion` object between the | |
358 | :any:`jedi.api.classes.Completion` object and the Prompt Toolkit completion |
|
358 | :any:`jedi.api.classes.Completion` object and the Prompt Toolkit completion | |
359 | object. While Jedi need a lot of information about evaluator and how the |
|
359 | object. While Jedi need a lot of information about evaluator and how the | |
360 | code should be ran/inspected, PromptToolkit (and other frontend) mostly |
|
360 | code should be ran/inspected, PromptToolkit (and other frontend) mostly | |
361 | need user facing information. |
|
361 | need user facing information. | |
362 |
|
362 | |||
363 | - Which range should be replaced replaced by what. |
|
363 | - Which range should be replaced replaced by what. | |
364 | - Some metadata (like completion type), or meta information to displayed to |
|
364 | - Some metadata (like completion type), or meta information to displayed to | |
365 | the use user. |
|
365 | the use user. | |
366 |
|
366 | |||
367 | For debugging purpose we can also store the origin of the completion (``jedi``, |
|
367 | For debugging purpose we can also store the origin of the completion (``jedi``, | |
368 | ``IPython.python_matches``, ``IPython.magics_matches``...). |
|
368 | ``IPython.python_matches``, ``IPython.magics_matches``...). | |
369 | """ |
|
369 | """ | |
370 |
|
370 | |||
371 | __slots__ = ['start', 'end', 'text', 'type', 'signature', '_origin'] |
|
371 | __slots__ = ['start', 'end', 'text', 'type', 'signature', '_origin'] | |
372 |
|
372 | |||
373 | def __init__(self, start: int, end: int, text: str, *, type: str=None, _origin='', signature='') -> None: |
|
373 | def __init__(self, start: int, end: int, text: str, *, type: str=None, _origin='', signature='') -> None: | |
374 | warnings.warn("``Completion`` is a provisional API (as of IPython 6.0). " |
|
374 | warnings.warn("``Completion`` is a provisional API (as of IPython 6.0). " | |
375 | "It may change without warnings. " |
|
375 | "It may change without warnings. " | |
376 | "Use in corresponding context manager.", |
|
376 | "Use in corresponding context manager.", | |
377 | category=ProvisionalCompleterWarning, stacklevel=2) |
|
377 | category=ProvisionalCompleterWarning, stacklevel=2) | |
378 |
|
378 | |||
379 | self.start = start |
|
379 | self.start = start | |
380 | self.end = end |
|
380 | self.end = end | |
381 | self.text = text |
|
381 | self.text = text | |
382 | self.type = type |
|
382 | self.type = type | |
383 | self.signature = signature |
|
383 | self.signature = signature | |
384 | self._origin = _origin |
|
384 | self._origin = _origin | |
385 |
|
385 | |||
386 | def __repr__(self): |
|
386 | def __repr__(self): | |
387 | return '<Completion start=%s end=%s text=%r type=%r, signature=%r,>' % \ |
|
387 | return '<Completion start=%s end=%s text=%r type=%r, signature=%r,>' % \ | |
388 | (self.start, self.end, self.text, self.type or '?', self.signature or '?') |
|
388 | (self.start, self.end, self.text, self.type or '?', self.signature or '?') | |
389 |
|
389 | |||
390 | def __eq__(self, other)->Bool: |
|
390 | def __eq__(self, other)->Bool: | |
391 | """ |
|
391 | """ | |
392 | Equality and hash do not hash the type (as some completer may not be |
|
392 | Equality and hash do not hash the type (as some completer may not be | |
393 | able to infer the type), but are use to (partially) de-duplicate |
|
393 | able to infer the type), but are use to (partially) de-duplicate | |
394 | completion. |
|
394 | completion. | |
395 |
|
395 | |||
396 | Completely de-duplicating completion is a bit tricker that just |
|
396 | Completely de-duplicating completion is a bit tricker that just | |
397 | comparing as it depends on surrounding text, which Completions are not |
|
397 | comparing as it depends on surrounding text, which Completions are not | |
398 | aware of. |
|
398 | aware of. | |
399 | """ |
|
399 | """ | |
400 | return self.start == other.start and \ |
|
400 | return self.start == other.start and \ | |
401 | self.end == other.end and \ |
|
401 | self.end == other.end and \ | |
402 | self.text == other.text |
|
402 | self.text == other.text | |
403 |
|
403 | |||
404 | def __hash__(self): |
|
404 | def __hash__(self): | |
405 | return hash((self.start, self.end, self.text)) |
|
405 | return hash((self.start, self.end, self.text)) | |
406 |
|
406 | |||
407 |
|
407 | |||
408 | _IC = Iterable[Completion] |
|
408 | _IC = Iterable[Completion] | |
409 |
|
409 | |||
410 |
|
410 | |||
411 | def _deduplicate_completions(text: str, completions: _IC)-> _IC: |
|
411 | def _deduplicate_completions(text: str, completions: _IC)-> _IC: | |
412 | """ |
|
412 | """ | |
413 | Deduplicate a set of completions. |
|
413 | Deduplicate a set of completions. | |
414 |
|
414 | |||
415 | .. warning:: Unstable |
|
415 | .. warning:: Unstable | |
416 |
|
416 | |||
417 | This function is unstable, API may change without warning. |
|
417 | This function is unstable, API may change without warning. | |
418 |
|
418 | |||
419 | Parameters |
|
419 | Parameters | |
420 | ---------- |
|
420 | ---------- | |
421 | text: str |
|
421 | text: str | |
422 | text that should be completed. |
|
422 | text that should be completed. | |
423 | completions: Iterator[Completion] |
|
423 | completions: Iterator[Completion] | |
424 | iterator over the completions to deduplicate |
|
424 | iterator over the completions to deduplicate | |
425 |
|
425 | |||
426 | Yields |
|
426 | Yields | |
427 | ------ |
|
427 | ------ | |
428 | `Completions` objects |
|
428 | `Completions` objects | |
429 |
|
429 | |||
430 |
|
430 | |||
431 | Completions coming from multiple sources, may be different but end up having |
|
431 | Completions coming from multiple sources, may be different but end up having | |
432 | the same effect when applied to ``text``. If this is the case, this will |
|
432 | the same effect when applied to ``text``. If this is the case, this will | |
433 | consider completions as equal and only emit the first encountered. |
|
433 | consider completions as equal and only emit the first encountered. | |
434 |
|
434 | |||
435 | Not folded in `completions()` yet for debugging purpose, and to detect when |
|
435 | Not folded in `completions()` yet for debugging purpose, and to detect when | |
436 | the IPython completer does return things that Jedi does not, but should be |
|
436 | the IPython completer does return things that Jedi does not, but should be | |
437 | at some point. |
|
437 | at some point. | |
438 | """ |
|
438 | """ | |
439 | completions = list(completions) |
|
439 | completions = list(completions) | |
440 | if not completions: |
|
440 | if not completions: | |
441 | return |
|
441 | return | |
442 |
|
442 | |||
443 | new_start = min(c.start for c in completions) |
|
443 | new_start = min(c.start for c in completions) | |
444 | new_end = max(c.end for c in completions) |
|
444 | new_end = max(c.end for c in completions) | |
445 |
|
445 | |||
446 | seen = set() |
|
446 | seen = set() | |
447 | for c in completions: |
|
447 | for c in completions: | |
448 | new_text = text[new_start:c.start] + c.text + text[c.end:new_end] |
|
448 | new_text = text[new_start:c.start] + c.text + text[c.end:new_end] | |
449 | if new_text not in seen: |
|
449 | if new_text not in seen: | |
450 | yield c |
|
450 | yield c | |
451 | seen.add(new_text) |
|
451 | seen.add(new_text) | |
452 |
|
452 | |||
453 |
|
453 | |||
454 | def rectify_completions(text: str, completions: _IC, *, _debug=False)->_IC: |
|
454 | def rectify_completions(text: str, completions: _IC, *, _debug=False)->_IC: | |
455 | """ |
|
455 | """ | |
456 | Rectify a set of completions to all have the same ``start`` and ``end`` |
|
456 | Rectify a set of completions to all have the same ``start`` and ``end`` | |
457 |
|
457 | |||
458 | .. warning:: Unstable |
|
458 | .. warning:: Unstable | |
459 |
|
459 | |||
460 | This function is unstable, API may change without warning. |
|
460 | This function is unstable, API may change without warning. | |
461 | It will also raise unless use in proper context manager. |
|
461 | It will also raise unless use in proper context manager. | |
462 |
|
462 | |||
463 | Parameters |
|
463 | Parameters | |
464 | ---------- |
|
464 | ---------- | |
465 | text: str |
|
465 | text: str | |
466 | text that should be completed. |
|
466 | text that should be completed. | |
467 | completions: Iterator[Completion] |
|
467 | completions: Iterator[Completion] | |
468 | iterator over the completions to rectify |
|
468 | iterator over the completions to rectify | |
469 |
|
469 | |||
470 |
|
470 | |||
471 | :any:`jedi.api.classes.Completion` s returned by Jedi may not have the same start and end, though |
|
471 | :any:`jedi.api.classes.Completion` s returned by Jedi may not have the same start and end, though | |
472 | the Jupyter Protocol requires them to behave like so. This will readjust |
|
472 | the Jupyter Protocol requires them to behave like so. This will readjust | |
473 | the completion to have the same ``start`` and ``end`` by padding both |
|
473 | the completion to have the same ``start`` and ``end`` by padding both | |
474 | extremities with surrounding text. |
|
474 | extremities with surrounding text. | |
475 |
|
475 | |||
476 | During stabilisation should support a ``_debug`` option to log which |
|
476 | During stabilisation should support a ``_debug`` option to log which | |
477 | completion are return by the IPython completer and not found in Jedi in |
|
477 | completion are return by the IPython completer and not found in Jedi in | |
478 | order to make upstream bug report. |
|
478 | order to make upstream bug report. | |
479 | """ |
|
479 | """ | |
480 | warnings.warn("`rectify_completions` is a provisional API (as of IPython 6.0). " |
|
480 | warnings.warn("`rectify_completions` is a provisional API (as of IPython 6.0). " | |
481 | "It may change without warnings. " |
|
481 | "It may change without warnings. " | |
482 | "Use in corresponding context manager.", |
|
482 | "Use in corresponding context manager.", | |
483 | category=ProvisionalCompleterWarning, stacklevel=2) |
|
483 | category=ProvisionalCompleterWarning, stacklevel=2) | |
484 |
|
484 | |||
485 | completions = list(completions) |
|
485 | completions = list(completions) | |
486 | if not completions: |
|
486 | if not completions: | |
487 | return |
|
487 | return | |
488 | starts = (c.start for c in completions) |
|
488 | starts = (c.start for c in completions) | |
489 | ends = (c.end for c in completions) |
|
489 | ends = (c.end for c in completions) | |
490 |
|
490 | |||
491 | new_start = min(starts) |
|
491 | new_start = min(starts) | |
492 | new_end = max(ends) |
|
492 | new_end = max(ends) | |
493 |
|
493 | |||
494 | seen_jedi = set() |
|
494 | seen_jedi = set() | |
495 | seen_python_matches = set() |
|
495 | seen_python_matches = set() | |
496 | for c in completions: |
|
496 | for c in completions: | |
497 | new_text = text[new_start:c.start] + c.text + text[c.end:new_end] |
|
497 | new_text = text[new_start:c.start] + c.text + text[c.end:new_end] | |
498 | if c._origin == 'jedi': |
|
498 | if c._origin == 'jedi': | |
499 | seen_jedi.add(new_text) |
|
499 | seen_jedi.add(new_text) | |
500 | elif c._origin == 'IPCompleter.python_matches': |
|
500 | elif c._origin == 'IPCompleter.python_matches': | |
501 | seen_python_matches.add(new_text) |
|
501 | seen_python_matches.add(new_text) | |
502 | yield Completion(new_start, new_end, new_text, type=c.type, _origin=c._origin, signature=c.signature) |
|
502 | yield Completion(new_start, new_end, new_text, type=c.type, _origin=c._origin, signature=c.signature) | |
503 | diff = seen_python_matches.difference(seen_jedi) |
|
503 | diff = seen_python_matches.difference(seen_jedi) | |
504 | if diff and _debug: |
|
504 | if diff and _debug: | |
505 | print('IPython.python matches have extras:', diff) |
|
505 | print('IPython.python matches have extras:', diff) | |
506 |
|
506 | |||
507 |
|
507 | |||
508 | if sys.platform == 'win32': |
|
508 | if sys.platform == 'win32': | |
509 | DELIMS = ' \t\n`!@#$^&*()=+[{]}|;\'",<>?' |
|
509 | DELIMS = ' \t\n`!@#$^&*()=+[{]}|;\'",<>?' | |
510 | else: |
|
510 | else: | |
511 | DELIMS = ' \t\n`!@#$^&*()=+[{]}\\|;:\'",<>?' |
|
511 | DELIMS = ' \t\n`!@#$^&*()=+[{]}\\|;:\'",<>?' | |
512 |
|
512 | |||
513 | GREEDY_DELIMS = ' =\r\n' |
|
513 | GREEDY_DELIMS = ' =\r\n' | |
514 |
|
514 | |||
515 |
|
515 | |||
516 | class CompletionSplitter(object): |
|
516 | class CompletionSplitter(object): | |
517 | """An object to split an input line in a manner similar to readline. |
|
517 | """An object to split an input line in a manner similar to readline. | |
518 |
|
518 | |||
519 | By having our own implementation, we can expose readline-like completion in |
|
519 | By having our own implementation, we can expose readline-like completion in | |
520 | a uniform manner to all frontends. This object only needs to be given the |
|
520 | a uniform manner to all frontends. This object only needs to be given the | |
521 | line of text to be split and the cursor position on said line, and it |
|
521 | line of text to be split and the cursor position on said line, and it | |
522 | returns the 'word' to be completed on at the cursor after splitting the |
|
522 | returns the 'word' to be completed on at the cursor after splitting the | |
523 | entire line. |
|
523 | entire line. | |
524 |
|
524 | |||
525 | What characters are used as splitting delimiters can be controlled by |
|
525 | What characters are used as splitting delimiters can be controlled by | |
526 | setting the ``delims`` attribute (this is a property that internally |
|
526 | setting the ``delims`` attribute (this is a property that internally | |
527 | automatically builds the necessary regular expression)""" |
|
527 | automatically builds the necessary regular expression)""" | |
528 |
|
528 | |||
529 | # Private interface |
|
529 | # Private interface | |
530 |
|
530 | |||
531 | # A string of delimiter characters. The default value makes sense for |
|
531 | # A string of delimiter characters. The default value makes sense for | |
532 | # IPython's most typical usage patterns. |
|
532 | # IPython's most typical usage patterns. | |
533 | _delims = DELIMS |
|
533 | _delims = DELIMS | |
534 |
|
534 | |||
535 | # The expression (a normal string) to be compiled into a regular expression |
|
535 | # The expression (a normal string) to be compiled into a regular expression | |
536 | # for actual splitting. We store it as an attribute mostly for ease of |
|
536 | # for actual splitting. We store it as an attribute mostly for ease of | |
537 | # debugging, since this type of code can be so tricky to debug. |
|
537 | # debugging, since this type of code can be so tricky to debug. | |
538 | _delim_expr = None |
|
538 | _delim_expr = None | |
539 |
|
539 | |||
540 | # The regular expression that does the actual splitting |
|
540 | # The regular expression that does the actual splitting | |
541 | _delim_re = None |
|
541 | _delim_re = None | |
542 |
|
542 | |||
543 | def __init__(self, delims=None): |
|
543 | def __init__(self, delims=None): | |
544 | delims = CompletionSplitter._delims if delims is None else delims |
|
544 | delims = CompletionSplitter._delims if delims is None else delims | |
545 | self.delims = delims |
|
545 | self.delims = delims | |
546 |
|
546 | |||
547 | @property |
|
547 | @property | |
548 | def delims(self): |
|
548 | def delims(self): | |
549 | """Return the string of delimiter characters.""" |
|
549 | """Return the string of delimiter characters.""" | |
550 | return self._delims |
|
550 | return self._delims | |
551 |
|
551 | |||
552 | @delims.setter |
|
552 | @delims.setter | |
553 | def delims(self, delims): |
|
553 | def delims(self, delims): | |
554 | """Set the delimiters for line splitting.""" |
|
554 | """Set the delimiters for line splitting.""" | |
555 | expr = '[' + ''.join('\\'+ c for c in delims) + ']' |
|
555 | expr = '[' + ''.join('\\'+ c for c in delims) + ']' | |
556 | self._delim_re = re.compile(expr) |
|
556 | self._delim_re = re.compile(expr) | |
557 | self._delims = delims |
|
557 | self._delims = delims | |
558 | self._delim_expr = expr |
|
558 | self._delim_expr = expr | |
559 |
|
559 | |||
560 | def split_line(self, line, cursor_pos=None): |
|
560 | def split_line(self, line, cursor_pos=None): | |
561 | """Split a line of text with a cursor at the given position. |
|
561 | """Split a line of text with a cursor at the given position. | |
562 | """ |
|
562 | """ | |
563 | l = line if cursor_pos is None else line[:cursor_pos] |
|
563 | l = line if cursor_pos is None else line[:cursor_pos] | |
564 | return self._delim_re.split(l)[-1] |
|
564 | return self._delim_re.split(l)[-1] | |
565 |
|
565 | |||
566 |
|
566 | |||
567 |
|
567 | |||
568 | class Completer(Configurable): |
|
568 | class Completer(Configurable): | |
569 |
|
569 | |||
570 | greedy = Bool(False, |
|
570 | greedy = Bool(False, | |
571 | help="""Activate greedy completion |
|
571 | help="""Activate greedy completion | |
572 | PENDING DEPRECTION. this is now mostly taken care of with Jedi. |
|
572 | PENDING DEPRECTION. this is now mostly taken care of with Jedi. | |
573 |
|
573 | |||
574 | This will enable completion on elements of lists, results of function calls, etc., |
|
574 | This will enable completion on elements of lists, results of function calls, etc., | |
575 | but can be unsafe because the code is actually evaluated on TAB. |
|
575 | but can be unsafe because the code is actually evaluated on TAB. | |
576 | """ |
|
576 | """ | |
577 | ).tag(config=True) |
|
577 | ).tag(config=True) | |
578 |
|
578 | |||
579 |
use_jedi = Bool(default_value= |
|
579 | use_jedi = Bool(default_value=False, | |
580 | help="Experimental: Use Jedi to generate autocompletions. " |
|
580 | help="Experimental: Use Jedi to generate autocompletions. " | |
581 |
" |
|
581 | "Off by default.").tag(config=True) | |
582 |
|
582 | |||
583 | jedi_compute_type_timeout = Int(default_value=400, |
|
583 | jedi_compute_type_timeout = Int(default_value=400, | |
584 | help="""Experimental: restrict time (in milliseconds) during which Jedi can compute types. |
|
584 | help="""Experimental: restrict time (in milliseconds) during which Jedi can compute types. | |
585 | Set to 0 to stop computing types. Non-zero value lower than 100ms may hurt |
|
585 | Set to 0 to stop computing types. Non-zero value lower than 100ms may hurt | |
586 | performance by preventing jedi to build its cache. |
|
586 | performance by preventing jedi to build its cache. | |
587 | """).tag(config=True) |
|
587 | """).tag(config=True) | |
588 |
|
588 | |||
589 | debug = Bool(default_value=False, |
|
589 | debug = Bool(default_value=False, | |
590 | help='Enable debug for the Completer. Mostly print extra ' |
|
590 | help='Enable debug for the Completer. Mostly print extra ' | |
591 | 'information for experimental jedi integration.')\ |
|
591 | 'information for experimental jedi integration.')\ | |
592 | .tag(config=True) |
|
592 | .tag(config=True) | |
593 |
|
593 | |||
594 | backslash_combining_completions = Bool(True, |
|
594 | backslash_combining_completions = Bool(True, | |
595 | help="Enable unicode completions, e.g. \\alpha<tab> . " |
|
595 | help="Enable unicode completions, e.g. \\alpha<tab> . " | |
596 | "Includes completion of latex commands, unicode names, and expanding " |
|
596 | "Includes completion of latex commands, unicode names, and expanding " | |
597 | "unicode characters back to latex commands.").tag(config=True) |
|
597 | "unicode characters back to latex commands.").tag(config=True) | |
598 |
|
598 | |||
599 |
|
599 | |||
600 |
|
600 | |||
601 | def __init__(self, namespace=None, global_namespace=None, **kwargs): |
|
601 | def __init__(self, namespace=None, global_namespace=None, **kwargs): | |
602 | """Create a new completer for the command line. |
|
602 | """Create a new completer for the command line. | |
603 |
|
603 | |||
604 | Completer(namespace=ns, global_namespace=ns2) -> completer instance. |
|
604 | Completer(namespace=ns, global_namespace=ns2) -> completer instance. | |
605 |
|
605 | |||
606 | If unspecified, the default namespace where completions are performed |
|
606 | If unspecified, the default namespace where completions are performed | |
607 | is __main__ (technically, __main__.__dict__). Namespaces should be |
|
607 | is __main__ (technically, __main__.__dict__). Namespaces should be | |
608 | given as dictionaries. |
|
608 | given as dictionaries. | |
609 |
|
609 | |||
610 | An optional second namespace can be given. This allows the completer |
|
610 | An optional second namespace can be given. This allows the completer | |
611 | to handle cases where both the local and global scopes need to be |
|
611 | to handle cases where both the local and global scopes need to be | |
612 | distinguished. |
|
612 | distinguished. | |
613 | """ |
|
613 | """ | |
614 |
|
614 | |||
615 | # Don't bind to namespace quite yet, but flag whether the user wants a |
|
615 | # Don't bind to namespace quite yet, but flag whether the user wants a | |
616 | # specific namespace or to use __main__.__dict__. This will allow us |
|
616 | # specific namespace or to use __main__.__dict__. This will allow us | |
617 | # to bind to __main__.__dict__ at completion time, not now. |
|
617 | # to bind to __main__.__dict__ at completion time, not now. | |
618 | if namespace is None: |
|
618 | if namespace is None: | |
619 | self.use_main_ns = True |
|
619 | self.use_main_ns = True | |
620 | else: |
|
620 | else: | |
621 | self.use_main_ns = False |
|
621 | self.use_main_ns = False | |
622 | self.namespace = namespace |
|
622 | self.namespace = namespace | |
623 |
|
623 | |||
624 | # The global namespace, if given, can be bound directly |
|
624 | # The global namespace, if given, can be bound directly | |
625 | if global_namespace is None: |
|
625 | if global_namespace is None: | |
626 | self.global_namespace = {} |
|
626 | self.global_namespace = {} | |
627 | else: |
|
627 | else: | |
628 | self.global_namespace = global_namespace |
|
628 | self.global_namespace = global_namespace | |
629 |
|
629 | |||
630 | super(Completer, self).__init__(**kwargs) |
|
630 | super(Completer, self).__init__(**kwargs) | |
631 |
|
631 | |||
632 | def complete(self, text, state): |
|
632 | def complete(self, text, state): | |
633 | """Return the next possible completion for 'text'. |
|
633 | """Return the next possible completion for 'text'. | |
634 |
|
634 | |||
635 | This is called successively with state == 0, 1, 2, ... until it |
|
635 | This is called successively with state == 0, 1, 2, ... until it | |
636 | returns None. The completion should begin with 'text'. |
|
636 | returns None. The completion should begin with 'text'. | |
637 |
|
637 | |||
638 | """ |
|
638 | """ | |
639 | if self.use_main_ns: |
|
639 | if self.use_main_ns: | |
640 | self.namespace = __main__.__dict__ |
|
640 | self.namespace = __main__.__dict__ | |
641 |
|
641 | |||
642 | if state == 0: |
|
642 | if state == 0: | |
643 | if "." in text: |
|
643 | if "." in text: | |
644 | self.matches = self.attr_matches(text) |
|
644 | self.matches = self.attr_matches(text) | |
645 | else: |
|
645 | else: | |
646 | self.matches = self.global_matches(text) |
|
646 | self.matches = self.global_matches(text) | |
647 | try: |
|
647 | try: | |
648 | return self.matches[state] |
|
648 | return self.matches[state] | |
649 | except IndexError: |
|
649 | except IndexError: | |
650 | return None |
|
650 | return None | |
651 |
|
651 | |||
652 | def global_matches(self, text): |
|
652 | def global_matches(self, text): | |
653 | """Compute matches when text is a simple name. |
|
653 | """Compute matches when text is a simple name. | |
654 |
|
654 | |||
655 | Return a list of all keywords, built-in functions and names currently |
|
655 | Return a list of all keywords, built-in functions and names currently | |
656 | defined in self.namespace or self.global_namespace that match. |
|
656 | defined in self.namespace or self.global_namespace that match. | |
657 |
|
657 | |||
658 | """ |
|
658 | """ | |
659 | matches = [] |
|
659 | matches = [] | |
660 | match_append = matches.append |
|
660 | match_append = matches.append | |
661 | n = len(text) |
|
661 | n = len(text) | |
662 | for lst in [keyword.kwlist, |
|
662 | for lst in [keyword.kwlist, | |
663 | builtin_mod.__dict__.keys(), |
|
663 | builtin_mod.__dict__.keys(), | |
664 | self.namespace.keys(), |
|
664 | self.namespace.keys(), | |
665 | self.global_namespace.keys()]: |
|
665 | self.global_namespace.keys()]: | |
666 | for word in lst: |
|
666 | for word in lst: | |
667 | if word[:n] == text and word != "__builtins__": |
|
667 | if word[:n] == text and word != "__builtins__": | |
668 | match_append(word) |
|
668 | match_append(word) | |
669 |
|
669 | |||
670 | snake_case_re = re.compile(r"[^_]+(_[^_]+)+?\Z") |
|
670 | snake_case_re = re.compile(r"[^_]+(_[^_]+)+?\Z") | |
671 | for lst in [self.namespace.keys(), |
|
671 | for lst in [self.namespace.keys(), | |
672 | self.global_namespace.keys()]: |
|
672 | self.global_namespace.keys()]: | |
673 | shortened = {"_".join([sub[0] for sub in word.split('_')]) : word |
|
673 | shortened = {"_".join([sub[0] for sub in word.split('_')]) : word | |
674 | for word in lst if snake_case_re.match(word)} |
|
674 | for word in lst if snake_case_re.match(word)} | |
675 | for word in shortened.keys(): |
|
675 | for word in shortened.keys(): | |
676 | if word[:n] == text and word != "__builtins__": |
|
676 | if word[:n] == text and word != "__builtins__": | |
677 | match_append(shortened[word]) |
|
677 | match_append(shortened[word]) | |
678 | return matches |
|
678 | return matches | |
679 |
|
679 | |||
680 | def attr_matches(self, text): |
|
680 | def attr_matches(self, text): | |
681 | """Compute matches when text contains a dot. |
|
681 | """Compute matches when text contains a dot. | |
682 |
|
682 | |||
683 | Assuming the text is of the form NAME.NAME....[NAME], and is |
|
683 | Assuming the text is of the form NAME.NAME....[NAME], and is | |
684 | evaluatable in self.namespace or self.global_namespace, it will be |
|
684 | evaluatable in self.namespace or self.global_namespace, it will be | |
685 | evaluated and its attributes (as revealed by dir()) are used as |
|
685 | evaluated and its attributes (as revealed by dir()) are used as | |
686 | possible completions. (For class instances, class members are |
|
686 | possible completions. (For class instances, class members are | |
687 | also considered.) |
|
687 | also considered.) | |
688 |
|
688 | |||
689 | WARNING: this can still invoke arbitrary C code, if an object |
|
689 | WARNING: this can still invoke arbitrary C code, if an object | |
690 | with a __getattr__ hook is evaluated. |
|
690 | with a __getattr__ hook is evaluated. | |
691 |
|
691 | |||
692 | """ |
|
692 | """ | |
693 |
|
693 | |||
694 | # Another option, seems to work great. Catches things like ''.<tab> |
|
694 | # Another option, seems to work great. Catches things like ''.<tab> | |
695 | m = re.match(r"(\S+(\.\w+)*)\.(\w*)$", text) |
|
695 | m = re.match(r"(\S+(\.\w+)*)\.(\w*)$", text) | |
696 |
|
696 | |||
697 | if m: |
|
697 | if m: | |
698 | expr, attr = m.group(1, 3) |
|
698 | expr, attr = m.group(1, 3) | |
699 | elif self.greedy: |
|
699 | elif self.greedy: | |
700 | m2 = re.match(r"(.+)\.(\w*)$", self.line_buffer) |
|
700 | m2 = re.match(r"(.+)\.(\w*)$", self.line_buffer) | |
701 | if not m2: |
|
701 | if not m2: | |
702 | return [] |
|
702 | return [] | |
703 | expr, attr = m2.group(1,2) |
|
703 | expr, attr = m2.group(1,2) | |
704 | else: |
|
704 | else: | |
705 | return [] |
|
705 | return [] | |
706 |
|
706 | |||
707 | try: |
|
707 | try: | |
708 | obj = eval(expr, self.namespace) |
|
708 | obj = eval(expr, self.namespace) | |
709 | except: |
|
709 | except: | |
710 | try: |
|
710 | try: | |
711 | obj = eval(expr, self.global_namespace) |
|
711 | obj = eval(expr, self.global_namespace) | |
712 | except: |
|
712 | except: | |
713 | return [] |
|
713 | return [] | |
714 |
|
714 | |||
715 | if self.limit_to__all__ and hasattr(obj, '__all__'): |
|
715 | if self.limit_to__all__ and hasattr(obj, '__all__'): | |
716 | words = get__all__entries(obj) |
|
716 | words = get__all__entries(obj) | |
717 | else: |
|
717 | else: | |
718 | words = dir2(obj) |
|
718 | words = dir2(obj) | |
719 |
|
719 | |||
720 | try: |
|
720 | try: | |
721 | words = generics.complete_object(obj, words) |
|
721 | words = generics.complete_object(obj, words) | |
722 | except TryNext: |
|
722 | except TryNext: | |
723 | pass |
|
723 | pass | |
724 | except AssertionError: |
|
724 | except AssertionError: | |
725 | raise |
|
725 | raise | |
726 | except Exception: |
|
726 | except Exception: | |
727 | # Silence errors from completion function |
|
727 | # Silence errors from completion function | |
728 | #raise # dbg |
|
728 | #raise # dbg | |
729 | pass |
|
729 | pass | |
730 | # Build match list to return |
|
730 | # Build match list to return | |
731 | n = len(attr) |
|
731 | n = len(attr) | |
732 | return [u"%s.%s" % (expr, w) for w in words if w[:n] == attr ] |
|
732 | return [u"%s.%s" % (expr, w) for w in words if w[:n] == attr ] | |
733 |
|
733 | |||
734 |
|
734 | |||
735 | def get__all__entries(obj): |
|
735 | def get__all__entries(obj): | |
736 | """returns the strings in the __all__ attribute""" |
|
736 | """returns the strings in the __all__ attribute""" | |
737 | try: |
|
737 | try: | |
738 | words = getattr(obj, '__all__') |
|
738 | words = getattr(obj, '__all__') | |
739 | except: |
|
739 | except: | |
740 | return [] |
|
740 | return [] | |
741 |
|
741 | |||
742 | return [w for w in words if isinstance(w, str)] |
|
742 | return [w for w in words if isinstance(w, str)] | |
743 |
|
743 | |||
744 |
|
744 | |||
745 | def match_dict_keys(keys: List[str], prefix: str, delims: str): |
|
745 | def match_dict_keys(keys: List[str], prefix: str, delims: str): | |
746 | """Used by dict_key_matches, matching the prefix to a list of keys |
|
746 | """Used by dict_key_matches, matching the prefix to a list of keys | |
747 |
|
747 | |||
748 | Parameters |
|
748 | Parameters | |
749 | ========== |
|
749 | ========== | |
750 | keys: |
|
750 | keys: | |
751 | list of keys in dictionary currently being completed. |
|
751 | list of keys in dictionary currently being completed. | |
752 | prefix: |
|
752 | prefix: | |
753 | Part of the text already typed by the user. e.g. `mydict[b'fo` |
|
753 | Part of the text already typed by the user. e.g. `mydict[b'fo` | |
754 | delims: |
|
754 | delims: | |
755 | String of delimiters to consider when finding the current key. |
|
755 | String of delimiters to consider when finding the current key. | |
756 |
|
756 | |||
757 | Returns |
|
757 | Returns | |
758 | ======= |
|
758 | ======= | |
759 |
|
759 | |||
760 | A tuple of three elements: ``quote``, ``token_start``, ``matched``, with |
|
760 | A tuple of three elements: ``quote``, ``token_start``, ``matched``, with | |
761 | ``quote`` being the quote that need to be used to close current string. |
|
761 | ``quote`` being the quote that need to be used to close current string. | |
762 | ``token_start`` the position where the replacement should start occurring, |
|
762 | ``token_start`` the position where the replacement should start occurring, | |
763 | ``matches`` a list of replacement/completion |
|
763 | ``matches`` a list of replacement/completion | |
764 |
|
764 | |||
765 | """ |
|
765 | """ | |
766 | if not prefix: |
|
766 | if not prefix: | |
767 | return None, 0, [repr(k) for k in keys |
|
767 | return None, 0, [repr(k) for k in keys | |
768 | if isinstance(k, (str, bytes))] |
|
768 | if isinstance(k, (str, bytes))] | |
769 | quote_match = re.search('["\']', prefix) |
|
769 | quote_match = re.search('["\']', prefix) | |
770 | quote = quote_match.group() |
|
770 | quote = quote_match.group() | |
771 | try: |
|
771 | try: | |
772 | prefix_str = eval(prefix + quote, {}) |
|
772 | prefix_str = eval(prefix + quote, {}) | |
773 | except Exception: |
|
773 | except Exception: | |
774 | return None, 0, [] |
|
774 | return None, 0, [] | |
775 |
|
775 | |||
776 | pattern = '[^' + ''.join('\\' + c for c in delims) + ']*$' |
|
776 | pattern = '[^' + ''.join('\\' + c for c in delims) + ']*$' | |
777 | token_match = re.search(pattern, prefix, re.UNICODE) |
|
777 | token_match = re.search(pattern, prefix, re.UNICODE) | |
778 | token_start = token_match.start() |
|
778 | token_start = token_match.start() | |
779 | token_prefix = token_match.group() |
|
779 | token_prefix = token_match.group() | |
780 |
|
780 | |||
781 | matched = [] |
|
781 | matched = [] | |
782 | for key in keys: |
|
782 | for key in keys: | |
783 | try: |
|
783 | try: | |
784 | if not key.startswith(prefix_str): |
|
784 | if not key.startswith(prefix_str): | |
785 | continue |
|
785 | continue | |
786 | except (AttributeError, TypeError, UnicodeError): |
|
786 | except (AttributeError, TypeError, UnicodeError): | |
787 | # Python 3+ TypeError on b'a'.startswith('a') or vice-versa |
|
787 | # Python 3+ TypeError on b'a'.startswith('a') or vice-versa | |
788 | continue |
|
788 | continue | |
789 |
|
789 | |||
790 | # reformat remainder of key to begin with prefix |
|
790 | # reformat remainder of key to begin with prefix | |
791 | rem = key[len(prefix_str):] |
|
791 | rem = key[len(prefix_str):] | |
792 | # force repr wrapped in ' |
|
792 | # force repr wrapped in ' | |
793 | rem_repr = repr(rem + '"') if isinstance(rem, str) else repr(rem + b'"') |
|
793 | rem_repr = repr(rem + '"') if isinstance(rem, str) else repr(rem + b'"') | |
794 | if rem_repr.startswith('u') and prefix[0] not in 'uU': |
|
794 | if rem_repr.startswith('u') and prefix[0] not in 'uU': | |
795 | # Found key is unicode, but prefix is Py2 string. |
|
795 | # Found key is unicode, but prefix is Py2 string. | |
796 | # Therefore attempt to interpret key as string. |
|
796 | # Therefore attempt to interpret key as string. | |
797 | try: |
|
797 | try: | |
798 | rem_repr = repr(rem.encode('ascii') + '"') |
|
798 | rem_repr = repr(rem.encode('ascii') + '"') | |
799 | except UnicodeEncodeError: |
|
799 | except UnicodeEncodeError: | |
800 | continue |
|
800 | continue | |
801 |
|
801 | |||
802 | rem_repr = rem_repr[1 + rem_repr.index("'"):-2] |
|
802 | rem_repr = rem_repr[1 + rem_repr.index("'"):-2] | |
803 | if quote == '"': |
|
803 | if quote == '"': | |
804 | # The entered prefix is quoted with ", |
|
804 | # The entered prefix is quoted with ", | |
805 | # but the match is quoted with '. |
|
805 | # but the match is quoted with '. | |
806 | # A contained " hence needs escaping for comparison: |
|
806 | # A contained " hence needs escaping for comparison: | |
807 | rem_repr = rem_repr.replace('"', '\\"') |
|
807 | rem_repr = rem_repr.replace('"', '\\"') | |
808 |
|
808 | |||
809 | # then reinsert prefix from start of token |
|
809 | # then reinsert prefix from start of token | |
810 | matched.append('%s%s' % (token_prefix, rem_repr)) |
|
810 | matched.append('%s%s' % (token_prefix, rem_repr)) | |
811 | return quote, token_start, matched |
|
811 | return quote, token_start, matched | |
812 |
|
812 | |||
813 |
|
813 | |||
814 | def cursor_to_position(text:str, line:int, column:int)->int: |
|
814 | def cursor_to_position(text:str, line:int, column:int)->int: | |
815 | """ |
|
815 | """ | |
816 |
|
816 | |||
817 | Convert the (line,column) position of the cursor in text to an offset in a |
|
817 | Convert the (line,column) position of the cursor in text to an offset in a | |
818 | string. |
|
818 | string. | |
819 |
|
819 | |||
820 | Parameters |
|
820 | Parameters | |
821 | ---------- |
|
821 | ---------- | |
822 |
|
822 | |||
823 | text : str |
|
823 | text : str | |
824 | The text in which to calculate the cursor offset |
|
824 | The text in which to calculate the cursor offset | |
825 | line : int |
|
825 | line : int | |
826 | Line of the cursor; 0-indexed |
|
826 | Line of the cursor; 0-indexed | |
827 | column : int |
|
827 | column : int | |
828 | Column of the cursor 0-indexed |
|
828 | Column of the cursor 0-indexed | |
829 |
|
829 | |||
830 | Return |
|
830 | Return | |
831 | ------ |
|
831 | ------ | |
832 | Position of the cursor in ``text``, 0-indexed. |
|
832 | Position of the cursor in ``text``, 0-indexed. | |
833 |
|
833 | |||
834 | See Also |
|
834 | See Also | |
835 | -------- |
|
835 | -------- | |
836 | position_to_cursor: reciprocal of this function |
|
836 | position_to_cursor: reciprocal of this function | |
837 |
|
837 | |||
838 | """ |
|
838 | """ | |
839 | lines = text.split('\n') |
|
839 | lines = text.split('\n') | |
840 | assert line <= len(lines), '{} <= {}'.format(str(line), str(len(lines))) |
|
840 | assert line <= len(lines), '{} <= {}'.format(str(line), str(len(lines))) | |
841 |
|
841 | |||
842 | return sum(len(l) + 1 for l in lines[:line]) + column |
|
842 | return sum(len(l) + 1 for l in lines[:line]) + column | |
843 |
|
843 | |||
844 | def position_to_cursor(text:str, offset:int)->Tuple[int, int]: |
|
844 | def position_to_cursor(text:str, offset:int)->Tuple[int, int]: | |
845 | """ |
|
845 | """ | |
846 | Convert the position of the cursor in text (0 indexed) to a line |
|
846 | Convert the position of the cursor in text (0 indexed) to a line | |
847 | number(0-indexed) and a column number (0-indexed) pair |
|
847 | number(0-indexed) and a column number (0-indexed) pair | |
848 |
|
848 | |||
849 | Position should be a valid position in ``text``. |
|
849 | Position should be a valid position in ``text``. | |
850 |
|
850 | |||
851 | Parameters |
|
851 | Parameters | |
852 | ---------- |
|
852 | ---------- | |
853 |
|
853 | |||
854 | text : str |
|
854 | text : str | |
855 | The text in which to calculate the cursor offset |
|
855 | The text in which to calculate the cursor offset | |
856 | offset : int |
|
856 | offset : int | |
857 | Position of the cursor in ``text``, 0-indexed. |
|
857 | Position of the cursor in ``text``, 0-indexed. | |
858 |
|
858 | |||
859 | Return |
|
859 | Return | |
860 | ------ |
|
860 | ------ | |
861 | (line, column) : (int, int) |
|
861 | (line, column) : (int, int) | |
862 | Line of the cursor; 0-indexed, column of the cursor 0-indexed |
|
862 | Line of the cursor; 0-indexed, column of the cursor 0-indexed | |
863 |
|
863 | |||
864 |
|
864 | |||
865 | See Also |
|
865 | See Also | |
866 | -------- |
|
866 | -------- | |
867 | cursor_to_position : reciprocal of this function |
|
867 | cursor_to_position : reciprocal of this function | |
868 |
|
868 | |||
869 |
|
869 | |||
870 | """ |
|
870 | """ | |
871 |
|
871 | |||
872 | assert 0 <= offset <= len(text) , "0 <= %s <= %s" % (offset , len(text)) |
|
872 | assert 0 <= offset <= len(text) , "0 <= %s <= %s" % (offset , len(text)) | |
873 |
|
873 | |||
874 | before = text[:offset] |
|
874 | before = text[:offset] | |
875 | blines = before.split('\n') # ! splitnes trim trailing \n |
|
875 | blines = before.split('\n') # ! splitnes trim trailing \n | |
876 | line = before.count('\n') |
|
876 | line = before.count('\n') | |
877 | col = len(blines[-1]) |
|
877 | col = len(blines[-1]) | |
878 | return line, col |
|
878 | return line, col | |
879 |
|
879 | |||
880 |
|
880 | |||
881 | def _safe_isinstance(obj, module, class_name): |
|
881 | def _safe_isinstance(obj, module, class_name): | |
882 | """Checks if obj is an instance of module.class_name if loaded |
|
882 | """Checks if obj is an instance of module.class_name if loaded | |
883 | """ |
|
883 | """ | |
884 | return (module in sys.modules and |
|
884 | return (module in sys.modules and | |
885 | isinstance(obj, getattr(import_module(module), class_name))) |
|
885 | isinstance(obj, getattr(import_module(module), class_name))) | |
886 |
|
886 | |||
887 |
|
887 | |||
888 | def back_unicode_name_matches(text): |
|
888 | def back_unicode_name_matches(text): | |
889 | u"""Match unicode characters back to unicode name |
|
889 | u"""Match unicode characters back to unicode name | |
890 |
|
890 | |||
891 | This does ``β`` -> ``\\snowman`` |
|
891 | This does ``β`` -> ``\\snowman`` | |
892 |
|
892 | |||
893 | Note that snowman is not a valid python3 combining character but will be expanded. |
|
893 | Note that snowman is not a valid python3 combining character but will be expanded. | |
894 | Though it will not recombine back to the snowman character by the completion machinery. |
|
894 | Though it will not recombine back to the snowman character by the completion machinery. | |
895 |
|
895 | |||
896 | This will not either back-complete standard sequences like \\n, \\b ... |
|
896 | This will not either back-complete standard sequences like \\n, \\b ... | |
897 |
|
897 | |||
898 | Used on Python 3 only. |
|
898 | Used on Python 3 only. | |
899 | """ |
|
899 | """ | |
900 | if len(text)<2: |
|
900 | if len(text)<2: | |
901 | return u'', () |
|
901 | return u'', () | |
902 | maybe_slash = text[-2] |
|
902 | maybe_slash = text[-2] | |
903 | if maybe_slash != '\\': |
|
903 | if maybe_slash != '\\': | |
904 | return u'', () |
|
904 | return u'', () | |
905 |
|
905 | |||
906 | char = text[-1] |
|
906 | char = text[-1] | |
907 | # no expand on quote for completion in strings. |
|
907 | # no expand on quote for completion in strings. | |
908 | # nor backcomplete standard ascii keys |
|
908 | # nor backcomplete standard ascii keys | |
909 | if char in string.ascii_letters or char in ['"',"'"]: |
|
909 | if char in string.ascii_letters or char in ['"',"'"]: | |
910 | return u'', () |
|
910 | return u'', () | |
911 | try : |
|
911 | try : | |
912 | unic = unicodedata.name(char) |
|
912 | unic = unicodedata.name(char) | |
913 | return '\\'+char,['\\'+unic] |
|
913 | return '\\'+char,['\\'+unic] | |
914 | except KeyError: |
|
914 | except KeyError: | |
915 | pass |
|
915 | pass | |
916 | return u'', () |
|
916 | return u'', () | |
917 |
|
917 | |||
918 | def back_latex_name_matches(text:str): |
|
918 | def back_latex_name_matches(text:str): | |
919 | """Match latex characters back to unicode name |
|
919 | """Match latex characters back to unicode name | |
920 |
|
920 | |||
921 | This does ``\\β΅`` -> ``\\aleph`` |
|
921 | This does ``\\β΅`` -> ``\\aleph`` | |
922 |
|
922 | |||
923 | Used on Python 3 only. |
|
923 | Used on Python 3 only. | |
924 | """ |
|
924 | """ | |
925 | if len(text)<2: |
|
925 | if len(text)<2: | |
926 | return u'', () |
|
926 | return u'', () | |
927 | maybe_slash = text[-2] |
|
927 | maybe_slash = text[-2] | |
928 | if maybe_slash != '\\': |
|
928 | if maybe_slash != '\\': | |
929 | return u'', () |
|
929 | return u'', () | |
930 |
|
930 | |||
931 |
|
931 | |||
932 | char = text[-1] |
|
932 | char = text[-1] | |
933 | # no expand on quote for completion in strings. |
|
933 | # no expand on quote for completion in strings. | |
934 | # nor backcomplete standard ascii keys |
|
934 | # nor backcomplete standard ascii keys | |
935 | if char in string.ascii_letters or char in ['"',"'"]: |
|
935 | if char in string.ascii_letters or char in ['"',"'"]: | |
936 | return u'', () |
|
936 | return u'', () | |
937 | try : |
|
937 | try : | |
938 | latex = reverse_latex_symbol[char] |
|
938 | latex = reverse_latex_symbol[char] | |
939 | # '\\' replace the \ as well |
|
939 | # '\\' replace the \ as well | |
940 | return '\\'+char,[latex] |
|
940 | return '\\'+char,[latex] | |
941 | except KeyError: |
|
941 | except KeyError: | |
942 | pass |
|
942 | pass | |
943 | return u'', () |
|
943 | return u'', () | |
944 |
|
944 | |||
945 |
|
945 | |||
946 | def _formatparamchildren(parameter) -> str: |
|
946 | def _formatparamchildren(parameter) -> str: | |
947 | """ |
|
947 | """ | |
948 | Get parameter name and value from Jedi Private API |
|
948 | Get parameter name and value from Jedi Private API | |
949 |
|
949 | |||
950 | Jedi does not expose a simple way to get `param=value` from its API. |
|
950 | Jedi does not expose a simple way to get `param=value` from its API. | |
951 |
|
951 | |||
952 | Parameter |
|
952 | Parameter | |
953 | ========= |
|
953 | ========= | |
954 |
|
954 | |||
955 | parameter: |
|
955 | parameter: | |
956 | Jedi's function `Param` |
|
956 | Jedi's function `Param` | |
957 |
|
957 | |||
958 | Returns |
|
958 | Returns | |
959 | ======= |
|
959 | ======= | |
960 |
|
960 | |||
961 | A string like 'a', 'b=1', '*args', '**kwargs' |
|
961 | A string like 'a', 'b=1', '*args', '**kwargs' | |
962 |
|
962 | |||
963 |
|
963 | |||
964 | """ |
|
964 | """ | |
965 | description = parameter.description |
|
965 | description = parameter.description | |
966 | if not description.startswith('param '): |
|
966 | if not description.startswith('param '): | |
967 | raise ValueError('Jedi function parameter description have change format.' |
|
967 | raise ValueError('Jedi function parameter description have change format.' | |
968 | 'Expected "param ...", found %r".' % description) |
|
968 | 'Expected "param ...", found %r".' % description) | |
969 | return description[6:] |
|
969 | return description[6:] | |
970 |
|
970 | |||
971 | def _make_signature(completion)-> str: |
|
971 | def _make_signature(completion)-> str: | |
972 | """ |
|
972 | """ | |
973 | Make the signature from a jedi completion |
|
973 | Make the signature from a jedi completion | |
974 |
|
974 | |||
975 | Parameter |
|
975 | Parameter | |
976 | ========= |
|
976 | ========= | |
977 |
|
977 | |||
978 | completion: jedi.Completion |
|
978 | completion: jedi.Completion | |
979 | object does not complete a function type |
|
979 | object does not complete a function type | |
980 |
|
980 | |||
981 | Returns |
|
981 | Returns | |
982 | ======= |
|
982 | ======= | |
983 |
|
983 | |||
984 | a string consisting of the function signature, with the parenthesis but |
|
984 | a string consisting of the function signature, with the parenthesis but | |
985 | without the function name. example: |
|
985 | without the function name. example: | |
986 | `(a, *args, b=1, **kwargs)` |
|
986 | `(a, *args, b=1, **kwargs)` | |
987 |
|
987 | |||
988 | """ |
|
988 | """ | |
989 |
|
989 | |||
990 | return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for p in completion.params) if f]) |
|
990 | return '(%s)'% ', '.join([f for f in (_formatparamchildren(p) for p in completion.params) if f]) | |
991 |
|
991 | |||
992 | class IPCompleter(Completer): |
|
992 | class IPCompleter(Completer): | |
993 | """Extension of the completer class with IPython-specific features""" |
|
993 | """Extension of the completer class with IPython-specific features""" | |
994 |
|
994 | |||
995 | @observe('greedy') |
|
995 | @observe('greedy') | |
996 | def _greedy_changed(self, change): |
|
996 | def _greedy_changed(self, change): | |
997 | """update the splitter and readline delims when greedy is changed""" |
|
997 | """update the splitter and readline delims when greedy is changed""" | |
998 | if change['new']: |
|
998 | if change['new']: | |
999 | self.splitter.delims = GREEDY_DELIMS |
|
999 | self.splitter.delims = GREEDY_DELIMS | |
1000 | else: |
|
1000 | else: | |
1001 | self.splitter.delims = DELIMS |
|
1001 | self.splitter.delims = DELIMS | |
1002 |
|
1002 | |||
1003 | merge_completions = Bool(True, |
|
1003 | merge_completions = Bool(True, | |
1004 | help="""Whether to merge completion results into a single list |
|
1004 | help="""Whether to merge completion results into a single list | |
1005 |
|
1005 | |||
1006 | If False, only the completion results from the first non-empty |
|
1006 | If False, only the completion results from the first non-empty | |
1007 | completer will be returned. |
|
1007 | completer will be returned. | |
1008 | """ |
|
1008 | """ | |
1009 | ).tag(config=True) |
|
1009 | ).tag(config=True) | |
1010 | omit__names = Enum((0,1,2), default_value=2, |
|
1010 | omit__names = Enum((0,1,2), default_value=2, | |
1011 | help="""Instruct the completer to omit private method names |
|
1011 | help="""Instruct the completer to omit private method names | |
1012 |
|
1012 | |||
1013 | Specifically, when completing on ``object.<tab>``. |
|
1013 | Specifically, when completing on ``object.<tab>``. | |
1014 |
|
1014 | |||
1015 | When 2 [default]: all names that start with '_' will be excluded. |
|
1015 | When 2 [default]: all names that start with '_' will be excluded. | |
1016 |
|
1016 | |||
1017 | When 1: all 'magic' names (``__foo__``) will be excluded. |
|
1017 | When 1: all 'magic' names (``__foo__``) will be excluded. | |
1018 |
|
1018 | |||
1019 | When 0: nothing will be excluded. |
|
1019 | When 0: nothing will be excluded. | |
1020 | """ |
|
1020 | """ | |
1021 | ).tag(config=True) |
|
1021 | ).tag(config=True) | |
1022 | limit_to__all__ = Bool(False, |
|
1022 | limit_to__all__ = Bool(False, | |
1023 | help=""" |
|
1023 | help=""" | |
1024 | DEPRECATED as of version 5.0. |
|
1024 | DEPRECATED as of version 5.0. | |
1025 |
|
1025 | |||
1026 | Instruct the completer to use __all__ for the completion |
|
1026 | Instruct the completer to use __all__ for the completion | |
1027 |
|
1027 | |||
1028 | Specifically, when completing on ``object.<tab>``. |
|
1028 | Specifically, when completing on ``object.<tab>``. | |
1029 |
|
1029 | |||
1030 | When True: only those names in obj.__all__ will be included. |
|
1030 | When True: only those names in obj.__all__ will be included. | |
1031 |
|
1031 | |||
1032 | When False [default]: the __all__ attribute is ignored |
|
1032 | When False [default]: the __all__ attribute is ignored | |
1033 | """, |
|
1033 | """, | |
1034 | ).tag(config=True) |
|
1034 | ).tag(config=True) | |
1035 |
|
1035 | |||
1036 | @observe('limit_to__all__') |
|
1036 | @observe('limit_to__all__') | |
1037 | def _limit_to_all_changed(self, change): |
|
1037 | def _limit_to_all_changed(self, change): | |
1038 | warnings.warn('`IPython.core.IPCompleter.limit_to__all__` configuration ' |
|
1038 | warnings.warn('`IPython.core.IPCompleter.limit_to__all__` configuration ' | |
1039 | 'value has been deprecated since IPython 5.0, will be made to have ' |
|
1039 | 'value has been deprecated since IPython 5.0, will be made to have ' | |
1040 | 'no effects and then removed in future version of IPython.', |
|
1040 | 'no effects and then removed in future version of IPython.', | |
1041 | UserWarning) |
|
1041 | UserWarning) | |
1042 |
|
1042 | |||
1043 | def __init__(self, shell=None, namespace=None, global_namespace=None, |
|
1043 | def __init__(self, shell=None, namespace=None, global_namespace=None, | |
1044 | use_readline=_deprecation_readline_sentinel, config=None, **kwargs): |
|
1044 | use_readline=_deprecation_readline_sentinel, config=None, **kwargs): | |
1045 | """IPCompleter() -> completer |
|
1045 | """IPCompleter() -> completer | |
1046 |
|
1046 | |||
1047 | Return a completer object. |
|
1047 | Return a completer object. | |
1048 |
|
1048 | |||
1049 | Parameters |
|
1049 | Parameters | |
1050 | ---------- |
|
1050 | ---------- | |
1051 |
|
1051 | |||
1052 | shell |
|
1052 | shell | |
1053 | a pointer to the ipython shell itself. This is needed |
|
1053 | a pointer to the ipython shell itself. This is needed | |
1054 | because this completer knows about magic functions, and those can |
|
1054 | because this completer knows about magic functions, and those can | |
1055 | only be accessed via the ipython instance. |
|
1055 | only be accessed via the ipython instance. | |
1056 |
|
1056 | |||
1057 | namespace : dict, optional |
|
1057 | namespace : dict, optional | |
1058 | an optional dict where completions are performed. |
|
1058 | an optional dict where completions are performed. | |
1059 |
|
1059 | |||
1060 | global_namespace : dict, optional |
|
1060 | global_namespace : dict, optional | |
1061 | secondary optional dict for completions, to |
|
1061 | secondary optional dict for completions, to | |
1062 | handle cases (such as IPython embedded inside functions) where |
|
1062 | handle cases (such as IPython embedded inside functions) where | |
1063 | both Python scopes are visible. |
|
1063 | both Python scopes are visible. | |
1064 |
|
1064 | |||
1065 | use_readline : bool, optional |
|
1065 | use_readline : bool, optional | |
1066 | DEPRECATED, ignored since IPython 6.0, will have no effects |
|
1066 | DEPRECATED, ignored since IPython 6.0, will have no effects | |
1067 | """ |
|
1067 | """ | |
1068 |
|
1068 | |||
1069 | self.magic_escape = ESC_MAGIC |
|
1069 | self.magic_escape = ESC_MAGIC | |
1070 | self.splitter = CompletionSplitter() |
|
1070 | self.splitter = CompletionSplitter() | |
1071 |
|
1071 | |||
1072 | if use_readline is not _deprecation_readline_sentinel: |
|
1072 | if use_readline is not _deprecation_readline_sentinel: | |
1073 | warnings.warn('The `use_readline` parameter is deprecated and ignored since IPython 6.0.', |
|
1073 | warnings.warn('The `use_readline` parameter is deprecated and ignored since IPython 6.0.', | |
1074 | DeprecationWarning, stacklevel=2) |
|
1074 | DeprecationWarning, stacklevel=2) | |
1075 |
|
1075 | |||
1076 | # _greedy_changed() depends on splitter and readline being defined: |
|
1076 | # _greedy_changed() depends on splitter and readline being defined: | |
1077 | Completer.__init__(self, namespace=namespace, global_namespace=global_namespace, |
|
1077 | Completer.__init__(self, namespace=namespace, global_namespace=global_namespace, | |
1078 | config=config, **kwargs) |
|
1078 | config=config, **kwargs) | |
1079 |
|
1079 | |||
1080 | # List where completion matches will be stored |
|
1080 | # List where completion matches will be stored | |
1081 | self.matches = [] |
|
1081 | self.matches = [] | |
1082 | self.shell = shell |
|
1082 | self.shell = shell | |
1083 | # Regexp to split filenames with spaces in them |
|
1083 | # Regexp to split filenames with spaces in them | |
1084 | self.space_name_re = re.compile(r'([^\\] )') |
|
1084 | self.space_name_re = re.compile(r'([^\\] )') | |
1085 | # Hold a local ref. to glob.glob for speed |
|
1085 | # Hold a local ref. to glob.glob for speed | |
1086 | self.glob = glob.glob |
|
1086 | self.glob = glob.glob | |
1087 |
|
1087 | |||
1088 | # Determine if we are running on 'dumb' terminals, like (X)Emacs |
|
1088 | # Determine if we are running on 'dumb' terminals, like (X)Emacs | |
1089 | # buffers, to avoid completion problems. |
|
1089 | # buffers, to avoid completion problems. | |
1090 | term = os.environ.get('TERM','xterm') |
|
1090 | term = os.environ.get('TERM','xterm') | |
1091 | self.dumb_terminal = term in ['dumb','emacs'] |
|
1091 | self.dumb_terminal = term in ['dumb','emacs'] | |
1092 |
|
1092 | |||
1093 | # Special handling of backslashes needed in win32 platforms |
|
1093 | # Special handling of backslashes needed in win32 platforms | |
1094 | if sys.platform == "win32": |
|
1094 | if sys.platform == "win32": | |
1095 | self.clean_glob = self._clean_glob_win32 |
|
1095 | self.clean_glob = self._clean_glob_win32 | |
1096 | else: |
|
1096 | else: | |
1097 | self.clean_glob = self._clean_glob |
|
1097 | self.clean_glob = self._clean_glob | |
1098 |
|
1098 | |||
1099 | #regexp to parse docstring for function signature |
|
1099 | #regexp to parse docstring for function signature | |
1100 | self.docstring_sig_re = re.compile(r'^[\w|\s.]+\(([^)]*)\).*') |
|
1100 | self.docstring_sig_re = re.compile(r'^[\w|\s.]+\(([^)]*)\).*') | |
1101 | self.docstring_kwd_re = re.compile(r'[\s|\[]*(\w+)(?:\s*=\s*.*)') |
|
1101 | self.docstring_kwd_re = re.compile(r'[\s|\[]*(\w+)(?:\s*=\s*.*)') | |
1102 | #use this if positional argument name is also needed |
|
1102 | #use this if positional argument name is also needed | |
1103 | #= re.compile(r'[\s|\[]*(\w+)(?:\s*=?\s*.*)') |
|
1103 | #= re.compile(r'[\s|\[]*(\w+)(?:\s*=?\s*.*)') | |
1104 |
|
1104 | |||
1105 | self.magic_arg_matchers = [ |
|
1105 | self.magic_arg_matchers = [ | |
1106 | self.magic_config_matches, |
|
1106 | self.magic_config_matches, | |
1107 | self.magic_color_matches, |
|
1107 | self.magic_color_matches, | |
1108 | ] |
|
1108 | ] | |
1109 |
|
1109 | |||
1110 | # This is set externally by InteractiveShell |
|
1110 | # This is set externally by InteractiveShell | |
1111 | self.custom_completers = None |
|
1111 | self.custom_completers = None | |
1112 |
|
1112 | |||
1113 | @property |
|
1113 | @property | |
1114 | def matchers(self): |
|
1114 | def matchers(self): | |
1115 | """All active matcher routines for completion""" |
|
1115 | """All active matcher routines for completion""" | |
1116 | if self.use_jedi: |
|
1116 | if self.use_jedi: | |
1117 | return [ |
|
1117 | return [ | |
1118 | self.file_matches, |
|
1118 | self.file_matches, | |
1119 | self.magic_matches, |
|
1119 | self.magic_matches, | |
1120 | self.dict_key_matches, |
|
1120 | self.dict_key_matches, | |
1121 | ] |
|
1121 | ] | |
1122 | else: |
|
1122 | else: | |
1123 | return [ |
|
1123 | return [ | |
1124 | self.python_matches, |
|
1124 | self.python_matches, | |
1125 | self.file_matches, |
|
1125 | self.file_matches, | |
1126 | self.magic_matches, |
|
1126 | self.magic_matches, | |
1127 | self.python_func_kw_matches, |
|
1127 | self.python_func_kw_matches, | |
1128 | self.dict_key_matches, |
|
1128 | self.dict_key_matches, | |
1129 | ] |
|
1129 | ] | |
1130 |
|
1130 | |||
1131 | def all_completions(self, text): |
|
1131 | def all_completions(self, text): | |
1132 | """ |
|
1132 | """ | |
1133 | Wrapper around the complete method for the benefit of emacs. |
|
1133 | Wrapper around the complete method for the benefit of emacs. | |
1134 | """ |
|
1134 | """ | |
1135 | return self.complete(text)[1] |
|
1135 | return self.complete(text)[1] | |
1136 |
|
1136 | |||
1137 | def _clean_glob(self, text): |
|
1137 | def _clean_glob(self, text): | |
1138 | return self.glob("%s*" % text) |
|
1138 | return self.glob("%s*" % text) | |
1139 |
|
1139 | |||
1140 | def _clean_glob_win32(self,text): |
|
1140 | def _clean_glob_win32(self,text): | |
1141 | return [f.replace("\\","/") |
|
1141 | return [f.replace("\\","/") | |
1142 | for f in self.glob("%s*" % text)] |
|
1142 | for f in self.glob("%s*" % text)] | |
1143 |
|
1143 | |||
1144 | def file_matches(self, text): |
|
1144 | def file_matches(self, text): | |
1145 | """Match filenames, expanding ~USER type strings. |
|
1145 | """Match filenames, expanding ~USER type strings. | |
1146 |
|
1146 | |||
1147 | Most of the seemingly convoluted logic in this completer is an |
|
1147 | Most of the seemingly convoluted logic in this completer is an | |
1148 | attempt to handle filenames with spaces in them. And yet it's not |
|
1148 | attempt to handle filenames with spaces in them. And yet it's not | |
1149 | quite perfect, because Python's readline doesn't expose all of the |
|
1149 | quite perfect, because Python's readline doesn't expose all of the | |
1150 | GNU readline details needed for this to be done correctly. |
|
1150 | GNU readline details needed for this to be done correctly. | |
1151 |
|
1151 | |||
1152 | For a filename with a space in it, the printed completions will be |
|
1152 | For a filename with a space in it, the printed completions will be | |
1153 | only the parts after what's already been typed (instead of the |
|
1153 | only the parts after what's already been typed (instead of the | |
1154 | full completions, as is normally done). I don't think with the |
|
1154 | full completions, as is normally done). I don't think with the | |
1155 | current (as of Python 2.3) Python readline it's possible to do |
|
1155 | current (as of Python 2.3) Python readline it's possible to do | |
1156 | better.""" |
|
1156 | better.""" | |
1157 |
|
1157 | |||
1158 | # chars that require escaping with backslash - i.e. chars |
|
1158 | # chars that require escaping with backslash - i.e. chars | |
1159 | # that readline treats incorrectly as delimiters, but we |
|
1159 | # that readline treats incorrectly as delimiters, but we | |
1160 | # don't want to treat as delimiters in filename matching |
|
1160 | # don't want to treat as delimiters in filename matching | |
1161 | # when escaped with backslash |
|
1161 | # when escaped with backslash | |
1162 | if text.startswith('!'): |
|
1162 | if text.startswith('!'): | |
1163 | text = text[1:] |
|
1163 | text = text[1:] | |
1164 | text_prefix = u'!' |
|
1164 | text_prefix = u'!' | |
1165 | else: |
|
1165 | else: | |
1166 | text_prefix = u'' |
|
1166 | text_prefix = u'' | |
1167 |
|
1167 | |||
1168 | text_until_cursor = self.text_until_cursor |
|
1168 | text_until_cursor = self.text_until_cursor | |
1169 | # track strings with open quotes |
|
1169 | # track strings with open quotes | |
1170 | open_quotes = has_open_quotes(text_until_cursor) |
|
1170 | open_quotes = has_open_quotes(text_until_cursor) | |
1171 |
|
1171 | |||
1172 | if '(' in text_until_cursor or '[' in text_until_cursor: |
|
1172 | if '(' in text_until_cursor or '[' in text_until_cursor: | |
1173 | lsplit = text |
|
1173 | lsplit = text | |
1174 | else: |
|
1174 | else: | |
1175 | try: |
|
1175 | try: | |
1176 | # arg_split ~ shlex.split, but with unicode bugs fixed by us |
|
1176 | # arg_split ~ shlex.split, but with unicode bugs fixed by us | |
1177 | lsplit = arg_split(text_until_cursor)[-1] |
|
1177 | lsplit = arg_split(text_until_cursor)[-1] | |
1178 | except ValueError: |
|
1178 | except ValueError: | |
1179 | # typically an unmatched ", or backslash without escaped char. |
|
1179 | # typically an unmatched ", or backslash without escaped char. | |
1180 | if open_quotes: |
|
1180 | if open_quotes: | |
1181 | lsplit = text_until_cursor.split(open_quotes)[-1] |
|
1181 | lsplit = text_until_cursor.split(open_quotes)[-1] | |
1182 | else: |
|
1182 | else: | |
1183 | return [] |
|
1183 | return [] | |
1184 | except IndexError: |
|
1184 | except IndexError: | |
1185 | # tab pressed on empty line |
|
1185 | # tab pressed on empty line | |
1186 | lsplit = "" |
|
1186 | lsplit = "" | |
1187 |
|
1187 | |||
1188 | if not open_quotes and lsplit != protect_filename(lsplit): |
|
1188 | if not open_quotes and lsplit != protect_filename(lsplit): | |
1189 | # if protectables are found, do matching on the whole escaped name |
|
1189 | # if protectables are found, do matching on the whole escaped name | |
1190 | has_protectables = True |
|
1190 | has_protectables = True | |
1191 | text0,text = text,lsplit |
|
1191 | text0,text = text,lsplit | |
1192 | else: |
|
1192 | else: | |
1193 | has_protectables = False |
|
1193 | has_protectables = False | |
1194 | text = os.path.expanduser(text) |
|
1194 | text = os.path.expanduser(text) | |
1195 |
|
1195 | |||
1196 | if text == "": |
|
1196 | if text == "": | |
1197 | return [text_prefix + protect_filename(f) for f in self.glob("*")] |
|
1197 | return [text_prefix + protect_filename(f) for f in self.glob("*")] | |
1198 |
|
1198 | |||
1199 | # Compute the matches from the filesystem |
|
1199 | # Compute the matches from the filesystem | |
1200 | if sys.platform == 'win32': |
|
1200 | if sys.platform == 'win32': | |
1201 | m0 = self.clean_glob(text) |
|
1201 | m0 = self.clean_glob(text) | |
1202 | else: |
|
1202 | else: | |
1203 | m0 = self.clean_glob(text.replace('\\', '')) |
|
1203 | m0 = self.clean_glob(text.replace('\\', '')) | |
1204 |
|
1204 | |||
1205 | if has_protectables: |
|
1205 | if has_protectables: | |
1206 | # If we had protectables, we need to revert our changes to the |
|
1206 | # If we had protectables, we need to revert our changes to the | |
1207 | # beginning of filename so that we don't double-write the part |
|
1207 | # beginning of filename so that we don't double-write the part | |
1208 | # of the filename we have so far |
|
1208 | # of the filename we have so far | |
1209 | len_lsplit = len(lsplit) |
|
1209 | len_lsplit = len(lsplit) | |
1210 | matches = [text_prefix + text0 + |
|
1210 | matches = [text_prefix + text0 + | |
1211 | protect_filename(f[len_lsplit:]) for f in m0] |
|
1211 | protect_filename(f[len_lsplit:]) for f in m0] | |
1212 | else: |
|
1212 | else: | |
1213 | if open_quotes: |
|
1213 | if open_quotes: | |
1214 | # if we have a string with an open quote, we don't need to |
|
1214 | # if we have a string with an open quote, we don't need to | |
1215 | # protect the names beyond the quote (and we _shouldn't_, as |
|
1215 | # protect the names beyond the quote (and we _shouldn't_, as | |
1216 | # it would cause bugs when the filesystem call is made). |
|
1216 | # it would cause bugs when the filesystem call is made). | |
1217 | matches = m0 if sys.platform == "win32" else\ |
|
1217 | matches = m0 if sys.platform == "win32" else\ | |
1218 | [protect_filename(f, open_quotes) for f in m0] |
|
1218 | [protect_filename(f, open_quotes) for f in m0] | |
1219 | else: |
|
1219 | else: | |
1220 | matches = [text_prefix + |
|
1220 | matches = [text_prefix + | |
1221 | protect_filename(f) for f in m0] |
|
1221 | protect_filename(f) for f in m0] | |
1222 |
|
1222 | |||
1223 | # Mark directories in input list by appending '/' to their names. |
|
1223 | # Mark directories in input list by appending '/' to their names. | |
1224 | return [x+'/' if os.path.isdir(x) else x for x in matches] |
|
1224 | return [x+'/' if os.path.isdir(x) else x for x in matches] | |
1225 |
|
1225 | |||
1226 | def magic_matches(self, text): |
|
1226 | def magic_matches(self, text): | |
1227 | """Match magics""" |
|
1227 | """Match magics""" | |
1228 | # Get all shell magics now rather than statically, so magics loaded at |
|
1228 | # Get all shell magics now rather than statically, so magics loaded at | |
1229 | # runtime show up too. |
|
1229 | # runtime show up too. | |
1230 | lsm = self.shell.magics_manager.lsmagic() |
|
1230 | lsm = self.shell.magics_manager.lsmagic() | |
1231 | line_magics = lsm['line'] |
|
1231 | line_magics = lsm['line'] | |
1232 | cell_magics = lsm['cell'] |
|
1232 | cell_magics = lsm['cell'] | |
1233 | pre = self.magic_escape |
|
1233 | pre = self.magic_escape | |
1234 | pre2 = pre+pre |
|
1234 | pre2 = pre+pre | |
1235 |
|
1235 | |||
1236 | explicit_magic = text.startswith(pre) |
|
1236 | explicit_magic = text.startswith(pre) | |
1237 |
|
1237 | |||
1238 | # Completion logic: |
|
1238 | # Completion logic: | |
1239 | # - user gives %%: only do cell magics |
|
1239 | # - user gives %%: only do cell magics | |
1240 | # - user gives %: do both line and cell magics |
|
1240 | # - user gives %: do both line and cell magics | |
1241 | # - no prefix: do both |
|
1241 | # - no prefix: do both | |
1242 | # In other words, line magics are skipped if the user gives %% explicitly |
|
1242 | # In other words, line magics are skipped if the user gives %% explicitly | |
1243 | # |
|
1243 | # | |
1244 | # We also exclude magics that match any currently visible names: |
|
1244 | # We also exclude magics that match any currently visible names: | |
1245 | # https://github.com/ipython/ipython/issues/4877, unless the user has |
|
1245 | # https://github.com/ipython/ipython/issues/4877, unless the user has | |
1246 | # typed a %: |
|
1246 | # typed a %: | |
1247 | # https://github.com/ipython/ipython/issues/10754 |
|
1247 | # https://github.com/ipython/ipython/issues/10754 | |
1248 | bare_text = text.lstrip(pre) |
|
1248 | bare_text = text.lstrip(pre) | |
1249 | global_matches = self.global_matches(bare_text) |
|
1249 | global_matches = self.global_matches(bare_text) | |
1250 | if not explicit_magic: |
|
1250 | if not explicit_magic: | |
1251 | def matches(magic): |
|
1251 | def matches(magic): | |
1252 | """ |
|
1252 | """ | |
1253 | Filter magics, in particular remove magics that match |
|
1253 | Filter magics, in particular remove magics that match | |
1254 | a name present in global namespace. |
|
1254 | a name present in global namespace. | |
1255 | """ |
|
1255 | """ | |
1256 | return ( magic.startswith(bare_text) and |
|
1256 | return ( magic.startswith(bare_text) and | |
1257 | magic not in global_matches ) |
|
1257 | magic not in global_matches ) | |
1258 | else: |
|
1258 | else: | |
1259 | def matches(magic): |
|
1259 | def matches(magic): | |
1260 | return magic.startswith(bare_text) |
|
1260 | return magic.startswith(bare_text) | |
1261 |
|
1261 | |||
1262 | comp = [ pre2+m for m in cell_magics if matches(m)] |
|
1262 | comp = [ pre2+m for m in cell_magics if matches(m)] | |
1263 | if not text.startswith(pre2): |
|
1263 | if not text.startswith(pre2): | |
1264 | comp += [ pre+m for m in line_magics if matches(m)] |
|
1264 | comp += [ pre+m for m in line_magics if matches(m)] | |
1265 |
|
1265 | |||
1266 | return comp |
|
1266 | return comp | |
1267 |
|
1267 | |||
1268 | def magic_config_matches(self, text:str) -> List[str]: |
|
1268 | def magic_config_matches(self, text:str) -> List[str]: | |
1269 | """ Match class names and attributes for %config magic """ |
|
1269 | """ Match class names and attributes for %config magic """ | |
1270 | texts = text.strip().split() |
|
1270 | texts = text.strip().split() | |
1271 |
|
1271 | |||
1272 | if len(texts) > 0 and (texts[0] == 'config' or texts[0] == '%config'): |
|
1272 | if len(texts) > 0 and (texts[0] == 'config' or texts[0] == '%config'): | |
1273 | # get all configuration classes |
|
1273 | # get all configuration classes | |
1274 | classes = sorted(set([ c for c in self.shell.configurables |
|
1274 | classes = sorted(set([ c for c in self.shell.configurables | |
1275 | if c.__class__.class_traits(config=True) |
|
1275 | if c.__class__.class_traits(config=True) | |
1276 | ]), key=lambda x: x.__class__.__name__) |
|
1276 | ]), key=lambda x: x.__class__.__name__) | |
1277 | classnames = [ c.__class__.__name__ for c in classes ] |
|
1277 | classnames = [ c.__class__.__name__ for c in classes ] | |
1278 |
|
1278 | |||
1279 | # return all classnames if config or %config is given |
|
1279 | # return all classnames if config or %config is given | |
1280 | if len(texts) == 1: |
|
1280 | if len(texts) == 1: | |
1281 | return classnames |
|
1281 | return classnames | |
1282 |
|
1282 | |||
1283 | # match classname |
|
1283 | # match classname | |
1284 | classname_texts = texts[1].split('.') |
|
1284 | classname_texts = texts[1].split('.') | |
1285 | classname = classname_texts[0] |
|
1285 | classname = classname_texts[0] | |
1286 | classname_matches = [ c for c in classnames |
|
1286 | classname_matches = [ c for c in classnames | |
1287 | if c.startswith(classname) ] |
|
1287 | if c.startswith(classname) ] | |
1288 |
|
1288 | |||
1289 | # return matched classes or the matched class with attributes |
|
1289 | # return matched classes or the matched class with attributes | |
1290 | if texts[1].find('.') < 0: |
|
1290 | if texts[1].find('.') < 0: | |
1291 | return classname_matches |
|
1291 | return classname_matches | |
1292 | elif len(classname_matches) == 1 and \ |
|
1292 | elif len(classname_matches) == 1 and \ | |
1293 | classname_matches[0] == classname: |
|
1293 | classname_matches[0] == classname: | |
1294 | cls = classes[classnames.index(classname)].__class__ |
|
1294 | cls = classes[classnames.index(classname)].__class__ | |
1295 | help = cls.class_get_help() |
|
1295 | help = cls.class_get_help() | |
1296 | # strip leading '--' from cl-args: |
|
1296 | # strip leading '--' from cl-args: | |
1297 | help = re.sub(re.compile(r'^--', re.MULTILINE), '', help) |
|
1297 | help = re.sub(re.compile(r'^--', re.MULTILINE), '', help) | |
1298 | return [ attr.split('=')[0] |
|
1298 | return [ attr.split('=')[0] | |
1299 | for attr in help.strip().splitlines() |
|
1299 | for attr in help.strip().splitlines() | |
1300 | if attr.startswith(texts[1]) ] |
|
1300 | if attr.startswith(texts[1]) ] | |
1301 | return [] |
|
1301 | return [] | |
1302 |
|
1302 | |||
1303 | def magic_color_matches(self, text:str) -> List[str] : |
|
1303 | def magic_color_matches(self, text:str) -> List[str] : | |
1304 | """ Match color schemes for %colors magic""" |
|
1304 | """ Match color schemes for %colors magic""" | |
1305 | texts = text.split() |
|
1305 | texts = text.split() | |
1306 | if text.endswith(' '): |
|
1306 | if text.endswith(' '): | |
1307 | # .split() strips off the trailing whitespace. Add '' back |
|
1307 | # .split() strips off the trailing whitespace. Add '' back | |
1308 | # so that: '%colors ' -> ['%colors', ''] |
|
1308 | # so that: '%colors ' -> ['%colors', ''] | |
1309 | texts.append('') |
|
1309 | texts.append('') | |
1310 |
|
1310 | |||
1311 | if len(texts) == 2 and (texts[0] == 'colors' or texts[0] == '%colors'): |
|
1311 | if len(texts) == 2 and (texts[0] == 'colors' or texts[0] == '%colors'): | |
1312 | prefix = texts[1] |
|
1312 | prefix = texts[1] | |
1313 | return [ color for color in InspectColors.keys() |
|
1313 | return [ color for color in InspectColors.keys() | |
1314 | if color.startswith(prefix) ] |
|
1314 | if color.startswith(prefix) ] | |
1315 | return [] |
|
1315 | return [] | |
1316 |
|
1316 | |||
1317 | def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str): |
|
1317 | def _jedi_matches(self, cursor_column:int, cursor_line:int, text:str): | |
1318 | """ |
|
1318 | """ | |
1319 |
|
1319 | |||
1320 | Return a list of :any:`jedi.api.Completions` object from a ``text`` and |
|
1320 | Return a list of :any:`jedi.api.Completions` object from a ``text`` and | |
1321 | cursor position. |
|
1321 | cursor position. | |
1322 |
|
1322 | |||
1323 | Parameters |
|
1323 | Parameters | |
1324 | ---------- |
|
1324 | ---------- | |
1325 | cursor_column : int |
|
1325 | cursor_column : int | |
1326 | column position of the cursor in ``text``, 0-indexed. |
|
1326 | column position of the cursor in ``text``, 0-indexed. | |
1327 | cursor_line : int |
|
1327 | cursor_line : int | |
1328 | line position of the cursor in ``text``, 0-indexed |
|
1328 | line position of the cursor in ``text``, 0-indexed | |
1329 | text : str |
|
1329 | text : str | |
1330 | text to complete |
|
1330 | text to complete | |
1331 |
|
1331 | |||
1332 | Debugging |
|
1332 | Debugging | |
1333 | --------- |
|
1333 | --------- | |
1334 |
|
1334 | |||
1335 | If ``IPCompleter.debug`` is ``True`` may return a :any:`_FakeJediCompletion` |
|
1335 | If ``IPCompleter.debug`` is ``True`` may return a :any:`_FakeJediCompletion` | |
1336 | object containing a string with the Jedi debug information attached. |
|
1336 | object containing a string with the Jedi debug information attached. | |
1337 | """ |
|
1337 | """ | |
1338 | namespaces = [self.namespace] |
|
1338 | namespaces = [self.namespace] | |
1339 | if self.global_namespace is not None: |
|
1339 | if self.global_namespace is not None: | |
1340 | namespaces.append(self.global_namespace) |
|
1340 | namespaces.append(self.global_namespace) | |
1341 |
|
1341 | |||
1342 | completion_filter = lambda x:x |
|
1342 | completion_filter = lambda x:x | |
1343 | offset = cursor_to_position(text, cursor_line, cursor_column) |
|
1343 | offset = cursor_to_position(text, cursor_line, cursor_column) | |
1344 | # filter output if we are completing for object members |
|
1344 | # filter output if we are completing for object members | |
1345 | if offset: |
|
1345 | if offset: | |
1346 | pre = text[offset-1] |
|
1346 | pre = text[offset-1] | |
1347 | if pre == '.': |
|
1347 | if pre == '.': | |
1348 | if self.omit__names == 2: |
|
1348 | if self.omit__names == 2: | |
1349 | completion_filter = lambda c:not c.name.startswith('_') |
|
1349 | completion_filter = lambda c:not c.name.startswith('_') | |
1350 | elif self.omit__names == 1: |
|
1350 | elif self.omit__names == 1: | |
1351 | completion_filter = lambda c:not (c.name.startswith('__') and c.name.endswith('__')) |
|
1351 | completion_filter = lambda c:not (c.name.startswith('__') and c.name.endswith('__')) | |
1352 | elif self.omit__names == 0: |
|
1352 | elif self.omit__names == 0: | |
1353 | completion_filter = lambda x:x |
|
1353 | completion_filter = lambda x:x | |
1354 | else: |
|
1354 | else: | |
1355 | raise ValueError("Don't understand self.omit__names == {}".format(self.omit__names)) |
|
1355 | raise ValueError("Don't understand self.omit__names == {}".format(self.omit__names)) | |
1356 |
|
1356 | |||
1357 | interpreter = jedi.Interpreter( |
|
1357 | interpreter = jedi.Interpreter( | |
1358 | text[:offset], namespaces, column=cursor_column, line=cursor_line + 1) |
|
1358 | text[:offset], namespaces, column=cursor_column, line=cursor_line + 1) | |
1359 | try_jedi = True |
|
1359 | try_jedi = True | |
1360 |
|
1360 | |||
1361 | try: |
|
1361 | try: | |
1362 | # should we check the type of the node is Error ? |
|
1362 | # should we check the type of the node is Error ? | |
1363 | try: |
|
1363 | try: | |
1364 | # jedi < 0.11 |
|
1364 | # jedi < 0.11 | |
1365 | from jedi.parser.tree import ErrorLeaf |
|
1365 | from jedi.parser.tree import ErrorLeaf | |
1366 | except ImportError: |
|
1366 | except ImportError: | |
1367 | # jedi >= 0.11 |
|
1367 | # jedi >= 0.11 | |
1368 | from parso.tree import ErrorLeaf |
|
1368 | from parso.tree import ErrorLeaf | |
1369 |
|
1369 | |||
1370 | next_to_last_tree = interpreter._get_module().tree_node.children[-2] |
|
1370 | next_to_last_tree = interpreter._get_module().tree_node.children[-2] | |
1371 | completing_string = False |
|
1371 | completing_string = False | |
1372 | if isinstance(next_to_last_tree, ErrorLeaf): |
|
1372 | if isinstance(next_to_last_tree, ErrorLeaf): | |
1373 | completing_string = next_to_last_tree.value.lstrip()[0] in {'"', "'"} |
|
1373 | completing_string = next_to_last_tree.value.lstrip()[0] in {'"', "'"} | |
1374 | # if we are in a string jedi is likely not the right candidate for |
|
1374 | # if we are in a string jedi is likely not the right candidate for | |
1375 | # now. Skip it. |
|
1375 | # now. Skip it. | |
1376 | try_jedi = not completing_string |
|
1376 | try_jedi = not completing_string | |
1377 | except Exception as e: |
|
1377 | except Exception as e: | |
1378 | # many of things can go wrong, we are using private API just don't crash. |
|
1378 | # many of things can go wrong, we are using private API just don't crash. | |
1379 | if self.debug: |
|
1379 | if self.debug: | |
1380 | print("Error detecting if completing a non-finished string :", e, '|') |
|
1380 | print("Error detecting if completing a non-finished string :", e, '|') | |
1381 |
|
1381 | |||
1382 | if not try_jedi: |
|
1382 | if not try_jedi: | |
1383 | return [] |
|
1383 | return [] | |
1384 | try: |
|
1384 | try: | |
1385 | return filter(completion_filter, interpreter.completions()) |
|
1385 | return filter(completion_filter, interpreter.completions()) | |
1386 | except Exception as e: |
|
1386 | except Exception as e: | |
1387 | if self.debug: |
|
1387 | if self.debug: | |
1388 | return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))] |
|
1388 | return [_FakeJediCompletion('Oops Jedi has crashed, please report a bug with the following:\n"""\n%s\ns"""' % (e))] | |
1389 | else: |
|
1389 | else: | |
1390 | return [] |
|
1390 | return [] | |
1391 |
|
1391 | |||
1392 | def python_matches(self, text): |
|
1392 | def python_matches(self, text): | |
1393 | """Match attributes or global python names""" |
|
1393 | """Match attributes or global python names""" | |
1394 | if "." in text: |
|
1394 | if "." in text: | |
1395 | try: |
|
1395 | try: | |
1396 | matches = self.attr_matches(text) |
|
1396 | matches = self.attr_matches(text) | |
1397 | if text.endswith('.') and self.omit__names: |
|
1397 | if text.endswith('.') and self.omit__names: | |
1398 | if self.omit__names == 1: |
|
1398 | if self.omit__names == 1: | |
1399 | # true if txt is _not_ a __ name, false otherwise: |
|
1399 | # true if txt is _not_ a __ name, false otherwise: | |
1400 | no__name = (lambda txt: |
|
1400 | no__name = (lambda txt: | |
1401 | re.match(r'.*\.__.*?__',txt) is None) |
|
1401 | re.match(r'.*\.__.*?__',txt) is None) | |
1402 | else: |
|
1402 | else: | |
1403 | # true if txt is _not_ a _ name, false otherwise: |
|
1403 | # true if txt is _not_ a _ name, false otherwise: | |
1404 | no__name = (lambda txt: |
|
1404 | no__name = (lambda txt: | |
1405 | re.match(r'\._.*?',txt[txt.rindex('.'):]) is None) |
|
1405 | re.match(r'\._.*?',txt[txt.rindex('.'):]) is None) | |
1406 | matches = filter(no__name, matches) |
|
1406 | matches = filter(no__name, matches) | |
1407 | except NameError: |
|
1407 | except NameError: | |
1408 | # catches <undefined attributes>.<tab> |
|
1408 | # catches <undefined attributes>.<tab> | |
1409 | matches = [] |
|
1409 | matches = [] | |
1410 | else: |
|
1410 | else: | |
1411 | matches = self.global_matches(text) |
|
1411 | matches = self.global_matches(text) | |
1412 | return matches |
|
1412 | return matches | |
1413 |
|
1413 | |||
1414 | def _default_arguments_from_docstring(self, doc): |
|
1414 | def _default_arguments_from_docstring(self, doc): | |
1415 | """Parse the first line of docstring for call signature. |
|
1415 | """Parse the first line of docstring for call signature. | |
1416 |
|
1416 | |||
1417 | Docstring should be of the form 'min(iterable[, key=func])\n'. |
|
1417 | Docstring should be of the form 'min(iterable[, key=func])\n'. | |
1418 | It can also parse cython docstring of the form |
|
1418 | It can also parse cython docstring of the form | |
1419 | 'Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)'. |
|
1419 | 'Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)'. | |
1420 | """ |
|
1420 | """ | |
1421 | if doc is None: |
|
1421 | if doc is None: | |
1422 | return [] |
|
1422 | return [] | |
1423 |
|
1423 | |||
1424 | #care only the firstline |
|
1424 | #care only the firstline | |
1425 | line = doc.lstrip().splitlines()[0] |
|
1425 | line = doc.lstrip().splitlines()[0] | |
1426 |
|
1426 | |||
1427 | #p = re.compile(r'^[\w|\s.]+\(([^)]*)\).*') |
|
1427 | #p = re.compile(r'^[\w|\s.]+\(([^)]*)\).*') | |
1428 | #'min(iterable[, key=func])\n' -> 'iterable[, key=func]' |
|
1428 | #'min(iterable[, key=func])\n' -> 'iterable[, key=func]' | |
1429 | sig = self.docstring_sig_re.search(line) |
|
1429 | sig = self.docstring_sig_re.search(line) | |
1430 | if sig is None: |
|
1430 | if sig is None: | |
1431 | return [] |
|
1431 | return [] | |
1432 | # iterable[, key=func]' -> ['iterable[' ,' key=func]'] |
|
1432 | # iterable[, key=func]' -> ['iterable[' ,' key=func]'] | |
1433 | sig = sig.groups()[0].split(',') |
|
1433 | sig = sig.groups()[0].split(',') | |
1434 | ret = [] |
|
1434 | ret = [] | |
1435 | for s in sig: |
|
1435 | for s in sig: | |
1436 | #re.compile(r'[\s|\[]*(\w+)(?:\s*=\s*.*)') |
|
1436 | #re.compile(r'[\s|\[]*(\w+)(?:\s*=\s*.*)') | |
1437 | ret += self.docstring_kwd_re.findall(s) |
|
1437 | ret += self.docstring_kwd_re.findall(s) | |
1438 | return ret |
|
1438 | return ret | |
1439 |
|
1439 | |||
1440 | def _default_arguments(self, obj): |
|
1440 | def _default_arguments(self, obj): | |
1441 | """Return the list of default arguments of obj if it is callable, |
|
1441 | """Return the list of default arguments of obj if it is callable, | |
1442 | or empty list otherwise.""" |
|
1442 | or empty list otherwise.""" | |
1443 | call_obj = obj |
|
1443 | call_obj = obj | |
1444 | ret = [] |
|
1444 | ret = [] | |
1445 | if inspect.isbuiltin(obj): |
|
1445 | if inspect.isbuiltin(obj): | |
1446 | pass |
|
1446 | pass | |
1447 | elif not (inspect.isfunction(obj) or inspect.ismethod(obj)): |
|
1447 | elif not (inspect.isfunction(obj) or inspect.ismethod(obj)): | |
1448 | if inspect.isclass(obj): |
|
1448 | if inspect.isclass(obj): | |
1449 | #for cython embedsignature=True the constructor docstring |
|
1449 | #for cython embedsignature=True the constructor docstring | |
1450 | #belongs to the object itself not __init__ |
|
1450 | #belongs to the object itself not __init__ | |
1451 | ret += self._default_arguments_from_docstring( |
|
1451 | ret += self._default_arguments_from_docstring( | |
1452 | getattr(obj, '__doc__', '')) |
|
1452 | getattr(obj, '__doc__', '')) | |
1453 | # for classes, check for __init__,__new__ |
|
1453 | # for classes, check for __init__,__new__ | |
1454 | call_obj = (getattr(obj, '__init__', None) or |
|
1454 | call_obj = (getattr(obj, '__init__', None) or | |
1455 | getattr(obj, '__new__', None)) |
|
1455 | getattr(obj, '__new__', None)) | |
1456 | # for all others, check if they are __call__able |
|
1456 | # for all others, check if they are __call__able | |
1457 | elif hasattr(obj, '__call__'): |
|
1457 | elif hasattr(obj, '__call__'): | |
1458 | call_obj = obj.__call__ |
|
1458 | call_obj = obj.__call__ | |
1459 | ret += self._default_arguments_from_docstring( |
|
1459 | ret += self._default_arguments_from_docstring( | |
1460 | getattr(call_obj, '__doc__', '')) |
|
1460 | getattr(call_obj, '__doc__', '')) | |
1461 |
|
1461 | |||
1462 | _keeps = (inspect.Parameter.KEYWORD_ONLY, |
|
1462 | _keeps = (inspect.Parameter.KEYWORD_ONLY, | |
1463 | inspect.Parameter.POSITIONAL_OR_KEYWORD) |
|
1463 | inspect.Parameter.POSITIONAL_OR_KEYWORD) | |
1464 |
|
1464 | |||
1465 | try: |
|
1465 | try: | |
1466 | sig = inspect.signature(call_obj) |
|
1466 | sig = inspect.signature(call_obj) | |
1467 | ret.extend(k for k, v in sig.parameters.items() if |
|
1467 | ret.extend(k for k, v in sig.parameters.items() if | |
1468 | v.kind in _keeps) |
|
1468 | v.kind in _keeps) | |
1469 | except ValueError: |
|
1469 | except ValueError: | |
1470 | pass |
|
1470 | pass | |
1471 |
|
1471 | |||
1472 | return list(set(ret)) |
|
1472 | return list(set(ret)) | |
1473 |
|
1473 | |||
1474 | def python_func_kw_matches(self,text): |
|
1474 | def python_func_kw_matches(self,text): | |
1475 | """Match named parameters (kwargs) of the last open function""" |
|
1475 | """Match named parameters (kwargs) of the last open function""" | |
1476 |
|
1476 | |||
1477 | if "." in text: # a parameter cannot be dotted |
|
1477 | if "." in text: # a parameter cannot be dotted | |
1478 | return [] |
|
1478 | return [] | |
1479 | try: regexp = self.__funcParamsRegex |
|
1479 | try: regexp = self.__funcParamsRegex | |
1480 | except AttributeError: |
|
1480 | except AttributeError: | |
1481 | regexp = self.__funcParamsRegex = re.compile(r''' |
|
1481 | regexp = self.__funcParamsRegex = re.compile(r''' | |
1482 | '.*?(?<!\\)' | # single quoted strings or |
|
1482 | '.*?(?<!\\)' | # single quoted strings or | |
1483 | ".*?(?<!\\)" | # double quoted strings or |
|
1483 | ".*?(?<!\\)" | # double quoted strings or | |
1484 | \w+ | # identifier |
|
1484 | \w+ | # identifier | |
1485 | \S # other characters |
|
1485 | \S # other characters | |
1486 | ''', re.VERBOSE | re.DOTALL) |
|
1486 | ''', re.VERBOSE | re.DOTALL) | |
1487 | # 1. find the nearest identifier that comes before an unclosed |
|
1487 | # 1. find the nearest identifier that comes before an unclosed | |
1488 | # parenthesis before the cursor |
|
1488 | # parenthesis before the cursor | |
1489 | # e.g. for "foo (1+bar(x), pa<cursor>,a=1)", the candidate is "foo" |
|
1489 | # e.g. for "foo (1+bar(x), pa<cursor>,a=1)", the candidate is "foo" | |
1490 | tokens = regexp.findall(self.text_until_cursor) |
|
1490 | tokens = regexp.findall(self.text_until_cursor) | |
1491 | iterTokens = reversed(tokens); openPar = 0 |
|
1491 | iterTokens = reversed(tokens); openPar = 0 | |
1492 |
|
1492 | |||
1493 | for token in iterTokens: |
|
1493 | for token in iterTokens: | |
1494 | if token == ')': |
|
1494 | if token == ')': | |
1495 | openPar -= 1 |
|
1495 | openPar -= 1 | |
1496 | elif token == '(': |
|
1496 | elif token == '(': | |
1497 | openPar += 1 |
|
1497 | openPar += 1 | |
1498 | if openPar > 0: |
|
1498 | if openPar > 0: | |
1499 | # found the last unclosed parenthesis |
|
1499 | # found the last unclosed parenthesis | |
1500 | break |
|
1500 | break | |
1501 | else: |
|
1501 | else: | |
1502 | return [] |
|
1502 | return [] | |
1503 | # 2. Concatenate dotted names ("foo.bar" for "foo.bar(x, pa" ) |
|
1503 | # 2. Concatenate dotted names ("foo.bar" for "foo.bar(x, pa" ) | |
1504 | ids = [] |
|
1504 | ids = [] | |
1505 | isId = re.compile(r'\w+$').match |
|
1505 | isId = re.compile(r'\w+$').match | |
1506 |
|
1506 | |||
1507 | while True: |
|
1507 | while True: | |
1508 | try: |
|
1508 | try: | |
1509 | ids.append(next(iterTokens)) |
|
1509 | ids.append(next(iterTokens)) | |
1510 | if not isId(ids[-1]): |
|
1510 | if not isId(ids[-1]): | |
1511 | ids.pop(); break |
|
1511 | ids.pop(); break | |
1512 | if not next(iterTokens) == '.': |
|
1512 | if not next(iterTokens) == '.': | |
1513 | break |
|
1513 | break | |
1514 | except StopIteration: |
|
1514 | except StopIteration: | |
1515 | break |
|
1515 | break | |
1516 |
|
1516 | |||
1517 | # Find all named arguments already assigned to, as to avoid suggesting |
|
1517 | # Find all named arguments already assigned to, as to avoid suggesting | |
1518 | # them again |
|
1518 | # them again | |
1519 | usedNamedArgs = set() |
|
1519 | usedNamedArgs = set() | |
1520 | par_level = -1 |
|
1520 | par_level = -1 | |
1521 | for token, next_token in zip(tokens, tokens[1:]): |
|
1521 | for token, next_token in zip(tokens, tokens[1:]): | |
1522 | if token == '(': |
|
1522 | if token == '(': | |
1523 | par_level += 1 |
|
1523 | par_level += 1 | |
1524 | elif token == ')': |
|
1524 | elif token == ')': | |
1525 | par_level -= 1 |
|
1525 | par_level -= 1 | |
1526 |
|
1526 | |||
1527 | if par_level != 0: |
|
1527 | if par_level != 0: | |
1528 | continue |
|
1528 | continue | |
1529 |
|
1529 | |||
1530 | if next_token != '=': |
|
1530 | if next_token != '=': | |
1531 | continue |
|
1531 | continue | |
1532 |
|
1532 | |||
1533 | usedNamedArgs.add(token) |
|
1533 | usedNamedArgs.add(token) | |
1534 |
|
1534 | |||
1535 | # lookup the candidate callable matches either using global_matches |
|
1535 | # lookup the candidate callable matches either using global_matches | |
1536 | # or attr_matches for dotted names |
|
1536 | # or attr_matches for dotted names | |
1537 | if len(ids) == 1: |
|
1537 | if len(ids) == 1: | |
1538 | callableMatches = self.global_matches(ids[0]) |
|
1538 | callableMatches = self.global_matches(ids[0]) | |
1539 | else: |
|
1539 | else: | |
1540 | callableMatches = self.attr_matches('.'.join(ids[::-1])) |
|
1540 | callableMatches = self.attr_matches('.'.join(ids[::-1])) | |
1541 | argMatches = [] |
|
1541 | argMatches = [] | |
1542 | for callableMatch in callableMatches: |
|
1542 | for callableMatch in callableMatches: | |
1543 | try: |
|
1543 | try: | |
1544 | namedArgs = self._default_arguments(eval(callableMatch, |
|
1544 | namedArgs = self._default_arguments(eval(callableMatch, | |
1545 | self.namespace)) |
|
1545 | self.namespace)) | |
1546 | except: |
|
1546 | except: | |
1547 | continue |
|
1547 | continue | |
1548 |
|
1548 | |||
1549 | # Remove used named arguments from the list, no need to show twice |
|
1549 | # Remove used named arguments from the list, no need to show twice | |
1550 | for namedArg in set(namedArgs) - usedNamedArgs: |
|
1550 | for namedArg in set(namedArgs) - usedNamedArgs: | |
1551 | if namedArg.startswith(text): |
|
1551 | if namedArg.startswith(text): | |
1552 | argMatches.append(u"%s=" %namedArg) |
|
1552 | argMatches.append(u"%s=" %namedArg) | |
1553 | return argMatches |
|
1553 | return argMatches | |
1554 |
|
1554 | |||
1555 | def dict_key_matches(self, text): |
|
1555 | def dict_key_matches(self, text): | |
1556 | "Match string keys in a dictionary, after e.g. 'foo[' " |
|
1556 | "Match string keys in a dictionary, after e.g. 'foo[' " | |
1557 | def get_keys(obj): |
|
1557 | def get_keys(obj): | |
1558 | # Objects can define their own completions by defining an |
|
1558 | # Objects can define their own completions by defining an | |
1559 | # _ipy_key_completions_() method. |
|
1559 | # _ipy_key_completions_() method. | |
1560 | method = get_real_method(obj, '_ipython_key_completions_') |
|
1560 | method = get_real_method(obj, '_ipython_key_completions_') | |
1561 | if method is not None: |
|
1561 | if method is not None: | |
1562 | return method() |
|
1562 | return method() | |
1563 |
|
1563 | |||
1564 | # Special case some common in-memory dict-like types |
|
1564 | # Special case some common in-memory dict-like types | |
1565 | if isinstance(obj, dict) or\ |
|
1565 | if isinstance(obj, dict) or\ | |
1566 | _safe_isinstance(obj, 'pandas', 'DataFrame'): |
|
1566 | _safe_isinstance(obj, 'pandas', 'DataFrame'): | |
1567 | try: |
|
1567 | try: | |
1568 | return list(obj.keys()) |
|
1568 | return list(obj.keys()) | |
1569 | except Exception: |
|
1569 | except Exception: | |
1570 | return [] |
|
1570 | return [] | |
1571 | elif _safe_isinstance(obj, 'numpy', 'ndarray') or\ |
|
1571 | elif _safe_isinstance(obj, 'numpy', 'ndarray') or\ | |
1572 | _safe_isinstance(obj, 'numpy', 'void'): |
|
1572 | _safe_isinstance(obj, 'numpy', 'void'): | |
1573 | return obj.dtype.names or [] |
|
1573 | return obj.dtype.names or [] | |
1574 | return [] |
|
1574 | return [] | |
1575 |
|
1575 | |||
1576 | try: |
|
1576 | try: | |
1577 | regexps = self.__dict_key_regexps |
|
1577 | regexps = self.__dict_key_regexps | |
1578 | except AttributeError: |
|
1578 | except AttributeError: | |
1579 | dict_key_re_fmt = r'''(?x) |
|
1579 | dict_key_re_fmt = r'''(?x) | |
1580 | ( # match dict-referring expression wrt greedy setting |
|
1580 | ( # match dict-referring expression wrt greedy setting | |
1581 | %s |
|
1581 | %s | |
1582 | ) |
|
1582 | ) | |
1583 | \[ # open bracket |
|
1583 | \[ # open bracket | |
1584 | \s* # and optional whitespace |
|
1584 | \s* # and optional whitespace | |
1585 | ([uUbB]? # string prefix (r not handled) |
|
1585 | ([uUbB]? # string prefix (r not handled) | |
1586 | (?: # unclosed string |
|
1586 | (?: # unclosed string | |
1587 | '(?:[^']|(?<!\\)\\')* |
|
1587 | '(?:[^']|(?<!\\)\\')* | |
1588 | | |
|
1588 | | | |
1589 | "(?:[^"]|(?<!\\)\\")* |
|
1589 | "(?:[^"]|(?<!\\)\\")* | |
1590 | ) |
|
1590 | ) | |
1591 | )? |
|
1591 | )? | |
1592 | $ |
|
1592 | $ | |
1593 | ''' |
|
1593 | ''' | |
1594 | regexps = self.__dict_key_regexps = { |
|
1594 | regexps = self.__dict_key_regexps = { | |
1595 | False: re.compile(dict_key_re_fmt % ''' |
|
1595 | False: re.compile(dict_key_re_fmt % ''' | |
1596 | # identifiers separated by . |
|
1596 | # identifiers separated by . | |
1597 | (?!\d)\w+ |
|
1597 | (?!\d)\w+ | |
1598 | (?:\.(?!\d)\w+)* |
|
1598 | (?:\.(?!\d)\w+)* | |
1599 | '''), |
|
1599 | '''), | |
1600 | True: re.compile(dict_key_re_fmt % ''' |
|
1600 | True: re.compile(dict_key_re_fmt % ''' | |
1601 | .+ |
|
1601 | .+ | |
1602 | ''') |
|
1602 | ''') | |
1603 | } |
|
1603 | } | |
1604 |
|
1604 | |||
1605 | match = regexps[self.greedy].search(self.text_until_cursor) |
|
1605 | match = regexps[self.greedy].search(self.text_until_cursor) | |
1606 | if match is None: |
|
1606 | if match is None: | |
1607 | return [] |
|
1607 | return [] | |
1608 |
|
1608 | |||
1609 | expr, prefix = match.groups() |
|
1609 | expr, prefix = match.groups() | |
1610 | try: |
|
1610 | try: | |
1611 | obj = eval(expr, self.namespace) |
|
1611 | obj = eval(expr, self.namespace) | |
1612 | except Exception: |
|
1612 | except Exception: | |
1613 | try: |
|
1613 | try: | |
1614 | obj = eval(expr, self.global_namespace) |
|
1614 | obj = eval(expr, self.global_namespace) | |
1615 | except Exception: |
|
1615 | except Exception: | |
1616 | return [] |
|
1616 | return [] | |
1617 |
|
1617 | |||
1618 | keys = get_keys(obj) |
|
1618 | keys = get_keys(obj) | |
1619 | if not keys: |
|
1619 | if not keys: | |
1620 | return keys |
|
1620 | return keys | |
1621 | closing_quote, token_offset, matches = match_dict_keys(keys, prefix, self.splitter.delims) |
|
1621 | closing_quote, token_offset, matches = match_dict_keys(keys, prefix, self.splitter.delims) | |
1622 | if not matches: |
|
1622 | if not matches: | |
1623 | return matches |
|
1623 | return matches | |
1624 |
|
1624 | |||
1625 | # get the cursor position of |
|
1625 | # get the cursor position of | |
1626 | # - the text being completed |
|
1626 | # - the text being completed | |
1627 | # - the start of the key text |
|
1627 | # - the start of the key text | |
1628 | # - the start of the completion |
|
1628 | # - the start of the completion | |
1629 | text_start = len(self.text_until_cursor) - len(text) |
|
1629 | text_start = len(self.text_until_cursor) - len(text) | |
1630 | if prefix: |
|
1630 | if prefix: | |
1631 | key_start = match.start(2) |
|
1631 | key_start = match.start(2) | |
1632 | completion_start = key_start + token_offset |
|
1632 | completion_start = key_start + token_offset | |
1633 | else: |
|
1633 | else: | |
1634 | key_start = completion_start = match.end() |
|
1634 | key_start = completion_start = match.end() | |
1635 |
|
1635 | |||
1636 | # grab the leading prefix, to make sure all completions start with `text` |
|
1636 | # grab the leading prefix, to make sure all completions start with `text` | |
1637 | if text_start > key_start: |
|
1637 | if text_start > key_start: | |
1638 | leading = '' |
|
1638 | leading = '' | |
1639 | else: |
|
1639 | else: | |
1640 | leading = text[text_start:completion_start] |
|
1640 | leading = text[text_start:completion_start] | |
1641 |
|
1641 | |||
1642 | # the index of the `[` character |
|
1642 | # the index of the `[` character | |
1643 | bracket_idx = match.end(1) |
|
1643 | bracket_idx = match.end(1) | |
1644 |
|
1644 | |||
1645 | # append closing quote and bracket as appropriate |
|
1645 | # append closing quote and bracket as appropriate | |
1646 | # this is *not* appropriate if the opening quote or bracket is outside |
|
1646 | # this is *not* appropriate if the opening quote or bracket is outside | |
1647 | # the text given to this method |
|
1647 | # the text given to this method | |
1648 | suf = '' |
|
1648 | suf = '' | |
1649 | continuation = self.line_buffer[len(self.text_until_cursor):] |
|
1649 | continuation = self.line_buffer[len(self.text_until_cursor):] | |
1650 | if key_start > text_start and closing_quote: |
|
1650 | if key_start > text_start and closing_quote: | |
1651 | # quotes were opened inside text, maybe close them |
|
1651 | # quotes were opened inside text, maybe close them | |
1652 | if continuation.startswith(closing_quote): |
|
1652 | if continuation.startswith(closing_quote): | |
1653 | continuation = continuation[len(closing_quote):] |
|
1653 | continuation = continuation[len(closing_quote):] | |
1654 | else: |
|
1654 | else: | |
1655 | suf += closing_quote |
|
1655 | suf += closing_quote | |
1656 | if bracket_idx > text_start: |
|
1656 | if bracket_idx > text_start: | |
1657 | # brackets were opened inside text, maybe close them |
|
1657 | # brackets were opened inside text, maybe close them | |
1658 | if not continuation.startswith(']'): |
|
1658 | if not continuation.startswith(']'): | |
1659 | suf += ']' |
|
1659 | suf += ']' | |
1660 |
|
1660 | |||
1661 | return [leading + k + suf for k in matches] |
|
1661 | return [leading + k + suf for k in matches] | |
1662 |
|
1662 | |||
1663 | def unicode_name_matches(self, text): |
|
1663 | def unicode_name_matches(self, text): | |
1664 | u"""Match Latex-like syntax for unicode characters base |
|
1664 | u"""Match Latex-like syntax for unicode characters base | |
1665 | on the name of the character. |
|
1665 | on the name of the character. | |
1666 |
|
1666 | |||
1667 | This does ``\\GREEK SMALL LETTER ETA`` -> ``Ξ·`` |
|
1667 | This does ``\\GREEK SMALL LETTER ETA`` -> ``Ξ·`` | |
1668 |
|
1668 | |||
1669 | Works only on valid python 3 identifier, or on combining characters that |
|
1669 | Works only on valid python 3 identifier, or on combining characters that | |
1670 | will combine to form a valid identifier. |
|
1670 | will combine to form a valid identifier. | |
1671 |
|
1671 | |||
1672 | Used on Python 3 only. |
|
1672 | Used on Python 3 only. | |
1673 | """ |
|
1673 | """ | |
1674 | slashpos = text.rfind('\\') |
|
1674 | slashpos = text.rfind('\\') | |
1675 | if slashpos > -1: |
|
1675 | if slashpos > -1: | |
1676 | s = text[slashpos+1:] |
|
1676 | s = text[slashpos+1:] | |
1677 | try : |
|
1677 | try : | |
1678 | unic = unicodedata.lookup(s) |
|
1678 | unic = unicodedata.lookup(s) | |
1679 | # allow combining chars |
|
1679 | # allow combining chars | |
1680 | if ('a'+unic).isidentifier(): |
|
1680 | if ('a'+unic).isidentifier(): | |
1681 | return '\\'+s,[unic] |
|
1681 | return '\\'+s,[unic] | |
1682 | except KeyError: |
|
1682 | except KeyError: | |
1683 | pass |
|
1683 | pass | |
1684 | return u'', [] |
|
1684 | return u'', [] | |
1685 |
|
1685 | |||
1686 |
|
1686 | |||
1687 | def latex_matches(self, text): |
|
1687 | def latex_matches(self, text): | |
1688 | u"""Match Latex syntax for unicode characters. |
|
1688 | u"""Match Latex syntax for unicode characters. | |
1689 |
|
1689 | |||
1690 | This does both ``\\alp`` -> ``\\alpha`` and ``\\alpha`` -> ``Ξ±`` |
|
1690 | This does both ``\\alp`` -> ``\\alpha`` and ``\\alpha`` -> ``Ξ±`` | |
1691 |
|
1691 | |||
1692 | Used on Python 3 only. |
|
1692 | Used on Python 3 only. | |
1693 | """ |
|
1693 | """ | |
1694 | slashpos = text.rfind('\\') |
|
1694 | slashpos = text.rfind('\\') | |
1695 | if slashpos > -1: |
|
1695 | if slashpos > -1: | |
1696 | s = text[slashpos:] |
|
1696 | s = text[slashpos:] | |
1697 | if s in latex_symbols: |
|
1697 | if s in latex_symbols: | |
1698 | # Try to complete a full latex symbol to unicode |
|
1698 | # Try to complete a full latex symbol to unicode | |
1699 | # \\alpha -> Ξ± |
|
1699 | # \\alpha -> Ξ± | |
1700 | return s, [latex_symbols[s]] |
|
1700 | return s, [latex_symbols[s]] | |
1701 | else: |
|
1701 | else: | |
1702 | # If a user has partially typed a latex symbol, give them |
|
1702 | # If a user has partially typed a latex symbol, give them | |
1703 | # a full list of options \al -> [\aleph, \alpha] |
|
1703 | # a full list of options \al -> [\aleph, \alpha] | |
1704 | matches = [k for k in latex_symbols if k.startswith(s)] |
|
1704 | matches = [k for k in latex_symbols if k.startswith(s)] | |
1705 | return s, matches |
|
1705 | return s, matches | |
1706 | return u'', [] |
|
1706 | return u'', [] | |
1707 |
|
1707 | |||
1708 | def dispatch_custom_completer(self, text): |
|
1708 | def dispatch_custom_completer(self, text): | |
1709 | if not self.custom_completers: |
|
1709 | if not self.custom_completers: | |
1710 | return |
|
1710 | return | |
1711 |
|
1711 | |||
1712 | line = self.line_buffer |
|
1712 | line = self.line_buffer | |
1713 | if not line.strip(): |
|
1713 | if not line.strip(): | |
1714 | return None |
|
1714 | return None | |
1715 |
|
1715 | |||
1716 | # Create a little structure to pass all the relevant information about |
|
1716 | # Create a little structure to pass all the relevant information about | |
1717 | # the current completion to any custom completer. |
|
1717 | # the current completion to any custom completer. | |
1718 | event = SimpleNamespace() |
|
1718 | event = SimpleNamespace() | |
1719 | event.line = line |
|
1719 | event.line = line | |
1720 | event.symbol = text |
|
1720 | event.symbol = text | |
1721 | cmd = line.split(None,1)[0] |
|
1721 | cmd = line.split(None,1)[0] | |
1722 | event.command = cmd |
|
1722 | event.command = cmd | |
1723 | event.text_until_cursor = self.text_until_cursor |
|
1723 | event.text_until_cursor = self.text_until_cursor | |
1724 |
|
1724 | |||
1725 | # for foo etc, try also to find completer for %foo |
|
1725 | # for foo etc, try also to find completer for %foo | |
1726 | if not cmd.startswith(self.magic_escape): |
|
1726 | if not cmd.startswith(self.magic_escape): | |
1727 | try_magic = self.custom_completers.s_matches( |
|
1727 | try_magic = self.custom_completers.s_matches( | |
1728 | self.magic_escape + cmd) |
|
1728 | self.magic_escape + cmd) | |
1729 | else: |
|
1729 | else: | |
1730 | try_magic = [] |
|
1730 | try_magic = [] | |
1731 |
|
1731 | |||
1732 | for c in itertools.chain(self.custom_completers.s_matches(cmd), |
|
1732 | for c in itertools.chain(self.custom_completers.s_matches(cmd), | |
1733 | try_magic, |
|
1733 | try_magic, | |
1734 | self.custom_completers.flat_matches(self.text_until_cursor)): |
|
1734 | self.custom_completers.flat_matches(self.text_until_cursor)): | |
1735 | try: |
|
1735 | try: | |
1736 | res = c(event) |
|
1736 | res = c(event) | |
1737 | if res: |
|
1737 | if res: | |
1738 | # first, try case sensitive match |
|
1738 | # first, try case sensitive match | |
1739 | withcase = [r for r in res if r.startswith(text)] |
|
1739 | withcase = [r for r in res if r.startswith(text)] | |
1740 | if withcase: |
|
1740 | if withcase: | |
1741 | return withcase |
|
1741 | return withcase | |
1742 | # if none, then case insensitive ones are ok too |
|
1742 | # if none, then case insensitive ones are ok too | |
1743 | text_low = text.lower() |
|
1743 | text_low = text.lower() | |
1744 | return [r for r in res if r.lower().startswith(text_low)] |
|
1744 | return [r for r in res if r.lower().startswith(text_low)] | |
1745 | except TryNext: |
|
1745 | except TryNext: | |
1746 | pass |
|
1746 | pass | |
1747 | except KeyboardInterrupt: |
|
1747 | except KeyboardInterrupt: | |
1748 | """ |
|
1748 | """ | |
1749 | If custom completer take too long, |
|
1749 | If custom completer take too long, | |
1750 | let keyboard interrupt abort and return nothing. |
|
1750 | let keyboard interrupt abort and return nothing. | |
1751 | """ |
|
1751 | """ | |
1752 | break |
|
1752 | break | |
1753 |
|
1753 | |||
1754 | return None |
|
1754 | return None | |
1755 |
|
1755 | |||
1756 | def completions(self, text: str, offset: int)->Iterator[Completion]: |
|
1756 | def completions(self, text: str, offset: int)->Iterator[Completion]: | |
1757 | """ |
|
1757 | """ | |
1758 | Returns an iterator over the possible completions |
|
1758 | Returns an iterator over the possible completions | |
1759 |
|
1759 | |||
1760 | .. warning:: Unstable |
|
1760 | .. warning:: Unstable | |
1761 |
|
1761 | |||
1762 | This function is unstable, API may change without warning. |
|
1762 | This function is unstable, API may change without warning. | |
1763 | It will also raise unless use in proper context manager. |
|
1763 | It will also raise unless use in proper context manager. | |
1764 |
|
1764 | |||
1765 | Parameters |
|
1765 | Parameters | |
1766 | ---------- |
|
1766 | ---------- | |
1767 |
|
1767 | |||
1768 | text:str |
|
1768 | text:str | |
1769 | Full text of the current input, multi line string. |
|
1769 | Full text of the current input, multi line string. | |
1770 | offset:int |
|
1770 | offset:int | |
1771 | Integer representing the position of the cursor in ``text``. Offset |
|
1771 | Integer representing the position of the cursor in ``text``. Offset | |
1772 | is 0-based indexed. |
|
1772 | is 0-based indexed. | |
1773 |
|
1773 | |||
1774 | Yields |
|
1774 | Yields | |
1775 | ------ |
|
1775 | ------ | |
1776 | :any:`Completion` object |
|
1776 | :any:`Completion` object | |
1777 |
|
1777 | |||
1778 |
|
1778 | |||
1779 | The cursor on a text can either be seen as being "in between" |
|
1779 | The cursor on a text can either be seen as being "in between" | |
1780 | characters or "On" a character depending on the interface visible to |
|
1780 | characters or "On" a character depending on the interface visible to | |
1781 | the user. For consistency the cursor being on "in between" characters X |
|
1781 | the user. For consistency the cursor being on "in between" characters X | |
1782 | and Y is equivalent to the cursor being "on" character Y, that is to say |
|
1782 | and Y is equivalent to the cursor being "on" character Y, that is to say | |
1783 | the character the cursor is on is considered as being after the cursor. |
|
1783 | the character the cursor is on is considered as being after the cursor. | |
1784 |
|
1784 | |||
1785 | Combining characters may span more that one position in the |
|
1785 | Combining characters may span more that one position in the | |
1786 | text. |
|
1786 | text. | |
1787 |
|
1787 | |||
1788 |
|
1788 | |||
1789 | .. note:: |
|
1789 | .. note:: | |
1790 |
|
1790 | |||
1791 | If ``IPCompleter.debug`` is :any:`True` will yield a ``--jedi/ipython--`` |
|
1791 | If ``IPCompleter.debug`` is :any:`True` will yield a ``--jedi/ipython--`` | |
1792 | fake Completion token to distinguish completion returned by Jedi |
|
1792 | fake Completion token to distinguish completion returned by Jedi | |
1793 | and usual IPython completion. |
|
1793 | and usual IPython completion. | |
1794 |
|
1794 | |||
1795 | .. note:: |
|
1795 | .. note:: | |
1796 |
|
1796 | |||
1797 | Completions are not completely deduplicated yet. If identical |
|
1797 | Completions are not completely deduplicated yet. If identical | |
1798 | completions are coming from different sources this function does not |
|
1798 | completions are coming from different sources this function does not | |
1799 | ensure that each completion object will only be present once. |
|
1799 | ensure that each completion object will only be present once. | |
1800 | """ |
|
1800 | """ | |
1801 | warnings.warn("_complete is a provisional API (as of IPython 6.0). " |
|
1801 | warnings.warn("_complete is a provisional API (as of IPython 6.0). " | |
1802 | "It may change without warnings. " |
|
1802 | "It may change without warnings. " | |
1803 | "Use in corresponding context manager.", |
|
1803 | "Use in corresponding context manager.", | |
1804 | category=ProvisionalCompleterWarning, stacklevel=2) |
|
1804 | category=ProvisionalCompleterWarning, stacklevel=2) | |
1805 |
|
1805 | |||
1806 | seen = set() |
|
1806 | seen = set() | |
1807 | try: |
|
1807 | try: | |
1808 | for c in self._completions(text, offset, _timeout=self.jedi_compute_type_timeout/1000): |
|
1808 | for c in self._completions(text, offset, _timeout=self.jedi_compute_type_timeout/1000): | |
1809 | if c and (c in seen): |
|
1809 | if c and (c in seen): | |
1810 | continue |
|
1810 | continue | |
1811 | yield c |
|
1811 | yield c | |
1812 | seen.add(c) |
|
1812 | seen.add(c) | |
1813 | except KeyboardInterrupt: |
|
1813 | except KeyboardInterrupt: | |
1814 | """if completions take too long and users send keyboard interrupt, |
|
1814 | """if completions take too long and users send keyboard interrupt, | |
1815 | do not crash and return ASAP. """ |
|
1815 | do not crash and return ASAP. """ | |
1816 | pass |
|
1816 | pass | |
1817 |
|
1817 | |||
1818 | def _completions(self, full_text: str, offset: int, *, _timeout)->Iterator[Completion]: |
|
1818 | def _completions(self, full_text: str, offset: int, *, _timeout)->Iterator[Completion]: | |
1819 | """ |
|
1819 | """ | |
1820 | Core completion module.Same signature as :any:`completions`, with the |
|
1820 | Core completion module.Same signature as :any:`completions`, with the | |
1821 | extra `timeout` parameter (in seconds). |
|
1821 | extra `timeout` parameter (in seconds). | |
1822 |
|
1822 | |||
1823 |
|
1823 | |||
1824 | Computing jedi's completion ``.type`` can be quite expensive (it is a |
|
1824 | Computing jedi's completion ``.type`` can be quite expensive (it is a | |
1825 | lazy property) and can require some warm-up, more warm up than just |
|
1825 | lazy property) and can require some warm-up, more warm up than just | |
1826 | computing the ``name`` of a completion. The warm-up can be : |
|
1826 | computing the ``name`` of a completion. The warm-up can be : | |
1827 |
|
1827 | |||
1828 | - Long warm-up the first time a module is encountered after |
|
1828 | - Long warm-up the first time a module is encountered after | |
1829 | install/update: actually build parse/inference tree. |
|
1829 | install/update: actually build parse/inference tree. | |
1830 |
|
1830 | |||
1831 | - first time the module is encountered in a session: load tree from |
|
1831 | - first time the module is encountered in a session: load tree from | |
1832 | disk. |
|
1832 | disk. | |
1833 |
|
1833 | |||
1834 | We don't want to block completions for tens of seconds so we give the |
|
1834 | We don't want to block completions for tens of seconds so we give the | |
1835 | completer a "budget" of ``_timeout`` seconds per invocation to compute |
|
1835 | completer a "budget" of ``_timeout`` seconds per invocation to compute | |
1836 | completions types, the completions that have not yet been computed will |
|
1836 | completions types, the completions that have not yet been computed will | |
1837 | be marked as "unknown" an will have a chance to be computed next round |
|
1837 | be marked as "unknown" an will have a chance to be computed next round | |
1838 | are things get cached. |
|
1838 | are things get cached. | |
1839 |
|
1839 | |||
1840 | Keep in mind that Jedi is not the only thing treating the completion so |
|
1840 | Keep in mind that Jedi is not the only thing treating the completion so | |
1841 | keep the timeout short-ish as if we take more than 0.3 second we still |
|
1841 | keep the timeout short-ish as if we take more than 0.3 second we still | |
1842 | have lots of processing to do. |
|
1842 | have lots of processing to do. | |
1843 |
|
1843 | |||
1844 | """ |
|
1844 | """ | |
1845 | deadline = time.monotonic() + _timeout |
|
1845 | deadline = time.monotonic() + _timeout | |
1846 |
|
1846 | |||
1847 |
|
1847 | |||
1848 | before = full_text[:offset] |
|
1848 | before = full_text[:offset] | |
1849 | cursor_line, cursor_column = position_to_cursor(full_text, offset) |
|
1849 | cursor_line, cursor_column = position_to_cursor(full_text, offset) | |
1850 |
|
1850 | |||
1851 | matched_text, matches, matches_origin, jedi_matches = self._complete( |
|
1851 | matched_text, matches, matches_origin, jedi_matches = self._complete( | |
1852 | full_text=full_text, cursor_line=cursor_line, cursor_pos=cursor_column) |
|
1852 | full_text=full_text, cursor_line=cursor_line, cursor_pos=cursor_column) | |
1853 |
|
1853 | |||
1854 | iter_jm = iter(jedi_matches) |
|
1854 | iter_jm = iter(jedi_matches) | |
1855 | if _timeout: |
|
1855 | if _timeout: | |
1856 | for jm in iter_jm: |
|
1856 | for jm in iter_jm: | |
1857 | try: |
|
1857 | try: | |
1858 | type_ = jm.type |
|
1858 | type_ = jm.type | |
1859 | except Exception: |
|
1859 | except Exception: | |
1860 | if self.debug: |
|
1860 | if self.debug: | |
1861 | print("Error in Jedi getting type of ", jm) |
|
1861 | print("Error in Jedi getting type of ", jm) | |
1862 | type_ = None |
|
1862 | type_ = None | |
1863 | delta = len(jm.name_with_symbols) - len(jm.complete) |
|
1863 | delta = len(jm.name_with_symbols) - len(jm.complete) | |
1864 | if type_ == 'function': |
|
1864 | if type_ == 'function': | |
1865 | signature = _make_signature(jm) |
|
1865 | signature = _make_signature(jm) | |
1866 | else: |
|
1866 | else: | |
1867 | signature = '' |
|
1867 | signature = '' | |
1868 | yield Completion(start=offset - delta, |
|
1868 | yield Completion(start=offset - delta, | |
1869 | end=offset, |
|
1869 | end=offset, | |
1870 | text=jm.name_with_symbols, |
|
1870 | text=jm.name_with_symbols, | |
1871 | type=type_, |
|
1871 | type=type_, | |
1872 | signature=signature, |
|
1872 | signature=signature, | |
1873 | _origin='jedi') |
|
1873 | _origin='jedi') | |
1874 |
|
1874 | |||
1875 | if time.monotonic() > deadline: |
|
1875 | if time.monotonic() > deadline: | |
1876 | break |
|
1876 | break | |
1877 |
|
1877 | |||
1878 | for jm in iter_jm: |
|
1878 | for jm in iter_jm: | |
1879 | delta = len(jm.name_with_symbols) - len(jm.complete) |
|
1879 | delta = len(jm.name_with_symbols) - len(jm.complete) | |
1880 | yield Completion(start=offset - delta, |
|
1880 | yield Completion(start=offset - delta, | |
1881 | end=offset, |
|
1881 | end=offset, | |
1882 | text=jm.name_with_symbols, |
|
1882 | text=jm.name_with_symbols, | |
1883 | type='<unknown>', # don't compute type for speed |
|
1883 | type='<unknown>', # don't compute type for speed | |
1884 | _origin='jedi', |
|
1884 | _origin='jedi', | |
1885 | signature='') |
|
1885 | signature='') | |
1886 |
|
1886 | |||
1887 |
|
1887 | |||
1888 | start_offset = before.rfind(matched_text) |
|
1888 | start_offset = before.rfind(matched_text) | |
1889 |
|
1889 | |||
1890 | # TODO: |
|
1890 | # TODO: | |
1891 | # Suppress this, right now just for debug. |
|
1891 | # Suppress this, right now just for debug. | |
1892 | if jedi_matches and matches and self.debug: |
|
1892 | if jedi_matches and matches and self.debug: | |
1893 | yield Completion(start=start_offset, end=offset, text='--jedi/ipython--', |
|
1893 | yield Completion(start=start_offset, end=offset, text='--jedi/ipython--', | |
1894 | _origin='debug', type='none', signature='') |
|
1894 | _origin='debug', type='none', signature='') | |
1895 |
|
1895 | |||
1896 | # I'm unsure if this is always true, so let's assert and see if it |
|
1896 | # I'm unsure if this is always true, so let's assert and see if it | |
1897 | # crash |
|
1897 | # crash | |
1898 | assert before.endswith(matched_text) |
|
1898 | assert before.endswith(matched_text) | |
1899 | for m, t in zip(matches, matches_origin): |
|
1899 | for m, t in zip(matches, matches_origin): | |
1900 | yield Completion(start=start_offset, end=offset, text=m, _origin=t, signature='', type='<unknown>') |
|
1900 | yield Completion(start=start_offset, end=offset, text=m, _origin=t, signature='', type='<unknown>') | |
1901 |
|
1901 | |||
1902 |
|
1902 | |||
1903 | def complete(self, text=None, line_buffer=None, cursor_pos=None): |
|
1903 | def complete(self, text=None, line_buffer=None, cursor_pos=None): | |
1904 | """Find completions for the given text and line context. |
|
1904 | """Find completions for the given text and line context. | |
1905 |
|
1905 | |||
1906 | Note that both the text and the line_buffer are optional, but at least |
|
1906 | Note that both the text and the line_buffer are optional, but at least | |
1907 | one of them must be given. |
|
1907 | one of them must be given. | |
1908 |
|
1908 | |||
1909 | Parameters |
|
1909 | Parameters | |
1910 | ---------- |
|
1910 | ---------- | |
1911 | text : string, optional |
|
1911 | text : string, optional | |
1912 | Text to perform the completion on. If not given, the line buffer |
|
1912 | Text to perform the completion on. If not given, the line buffer | |
1913 | is split using the instance's CompletionSplitter object. |
|
1913 | is split using the instance's CompletionSplitter object. | |
1914 |
|
1914 | |||
1915 | line_buffer : string, optional |
|
1915 | line_buffer : string, optional | |
1916 | If not given, the completer attempts to obtain the current line |
|
1916 | If not given, the completer attempts to obtain the current line | |
1917 | buffer via readline. This keyword allows clients which are |
|
1917 | buffer via readline. This keyword allows clients which are | |
1918 | requesting for text completions in non-readline contexts to inform |
|
1918 | requesting for text completions in non-readline contexts to inform | |
1919 | the completer of the entire text. |
|
1919 | the completer of the entire text. | |
1920 |
|
1920 | |||
1921 | cursor_pos : int, optional |
|
1921 | cursor_pos : int, optional | |
1922 | Index of the cursor in the full line buffer. Should be provided by |
|
1922 | Index of the cursor in the full line buffer. Should be provided by | |
1923 | remote frontends where kernel has no access to frontend state. |
|
1923 | remote frontends where kernel has no access to frontend state. | |
1924 |
|
1924 | |||
1925 | Returns |
|
1925 | Returns | |
1926 | ------- |
|
1926 | ------- | |
1927 | text : str |
|
1927 | text : str | |
1928 | Text that was actually used in the completion. |
|
1928 | Text that was actually used in the completion. | |
1929 |
|
1929 | |||
1930 | matches : list |
|
1930 | matches : list | |
1931 | A list of completion matches. |
|
1931 | A list of completion matches. | |
1932 |
|
1932 | |||
1933 |
|
1933 | |||
1934 | .. note:: |
|
1934 | .. note:: | |
1935 |
|
1935 | |||
1936 | This API is likely to be deprecated and replaced by |
|
1936 | This API is likely to be deprecated and replaced by | |
1937 | :any:`IPCompleter.completions` in the future. |
|
1937 | :any:`IPCompleter.completions` in the future. | |
1938 |
|
1938 | |||
1939 |
|
1939 | |||
1940 | """ |
|
1940 | """ | |
1941 | warnings.warn('`Completer.complete` is pending deprecation since ' |
|
1941 | warnings.warn('`Completer.complete` is pending deprecation since ' | |
1942 | 'IPython 6.0 and will be replaced by `Completer.completions`.', |
|
1942 | 'IPython 6.0 and will be replaced by `Completer.completions`.', | |
1943 | PendingDeprecationWarning) |
|
1943 | PendingDeprecationWarning) | |
1944 | # potential todo, FOLD the 3rd throw away argument of _complete |
|
1944 | # potential todo, FOLD the 3rd throw away argument of _complete | |
1945 | # into the first 2 one. |
|
1945 | # into the first 2 one. | |
1946 | return self._complete(line_buffer=line_buffer, cursor_pos=cursor_pos, text=text, cursor_line=0)[:2] |
|
1946 | return self._complete(line_buffer=line_buffer, cursor_pos=cursor_pos, text=text, cursor_line=0)[:2] | |
1947 |
|
1947 | |||
1948 | def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None, |
|
1948 | def _complete(self, *, cursor_line, cursor_pos, line_buffer=None, text=None, | |
1949 | full_text=None) -> Tuple[str, List[str], List[str], Iterable[_FakeJediCompletion]]: |
|
1949 | full_text=None) -> Tuple[str, List[str], List[str], Iterable[_FakeJediCompletion]]: | |
1950 | """ |
|
1950 | """ | |
1951 |
|
1951 | |||
1952 | Like complete but can also returns raw jedi completions as well as the |
|
1952 | Like complete but can also returns raw jedi completions as well as the | |
1953 | origin of the completion text. This could (and should) be made much |
|
1953 | origin of the completion text. This could (and should) be made much | |
1954 | cleaner but that will be simpler once we drop the old (and stateful) |
|
1954 | cleaner but that will be simpler once we drop the old (and stateful) | |
1955 | :any:`complete` API. |
|
1955 | :any:`complete` API. | |
1956 |
|
1956 | |||
1957 |
|
1957 | |||
1958 | With current provisional API, cursor_pos act both (depending on the |
|
1958 | With current provisional API, cursor_pos act both (depending on the | |
1959 | caller) as the offset in the ``text`` or ``line_buffer``, or as the |
|
1959 | caller) as the offset in the ``text`` or ``line_buffer``, or as the | |
1960 | ``column`` when passing multiline strings this could/should be renamed |
|
1960 | ``column`` when passing multiline strings this could/should be renamed | |
1961 | but would add extra noise. |
|
1961 | but would add extra noise. | |
1962 | """ |
|
1962 | """ | |
1963 |
|
1963 | |||
1964 | # if the cursor position isn't given, the only sane assumption we can |
|
1964 | # if the cursor position isn't given, the only sane assumption we can | |
1965 | # make is that it's at the end of the line (the common case) |
|
1965 | # make is that it's at the end of the line (the common case) | |
1966 | if cursor_pos is None: |
|
1966 | if cursor_pos is None: | |
1967 | cursor_pos = len(line_buffer) if text is None else len(text) |
|
1967 | cursor_pos = len(line_buffer) if text is None else len(text) | |
1968 |
|
1968 | |||
1969 | if self.use_main_ns: |
|
1969 | if self.use_main_ns: | |
1970 | self.namespace = __main__.__dict__ |
|
1970 | self.namespace = __main__.__dict__ | |
1971 |
|
1971 | |||
1972 | # if text is either None or an empty string, rely on the line buffer |
|
1972 | # if text is either None or an empty string, rely on the line buffer | |
1973 | if (not line_buffer) and full_text: |
|
1973 | if (not line_buffer) and full_text: | |
1974 | line_buffer = full_text.split('\n')[cursor_line] |
|
1974 | line_buffer = full_text.split('\n')[cursor_line] | |
1975 | if not text: |
|
1975 | if not text: | |
1976 | text = self.splitter.split_line(line_buffer, cursor_pos) |
|
1976 | text = self.splitter.split_line(line_buffer, cursor_pos) | |
1977 |
|
1977 | |||
1978 | if self.backslash_combining_completions: |
|
1978 | if self.backslash_combining_completions: | |
1979 | # allow deactivation of these on windows. |
|
1979 | # allow deactivation of these on windows. | |
1980 | base_text = text if not line_buffer else line_buffer[:cursor_pos] |
|
1980 | base_text = text if not line_buffer else line_buffer[:cursor_pos] | |
1981 | latex_text, latex_matches = self.latex_matches(base_text) |
|
1981 | latex_text, latex_matches = self.latex_matches(base_text) | |
1982 | if latex_matches: |
|
1982 | if latex_matches: | |
1983 | return latex_text, latex_matches, ['latex_matches']*len(latex_matches), () |
|
1983 | return latex_text, latex_matches, ['latex_matches']*len(latex_matches), () | |
1984 | name_text = '' |
|
1984 | name_text = '' | |
1985 | name_matches = [] |
|
1985 | name_matches = [] | |
1986 | for meth in (self.unicode_name_matches, back_latex_name_matches, back_unicode_name_matches): |
|
1986 | for meth in (self.unicode_name_matches, back_latex_name_matches, back_unicode_name_matches): | |
1987 | name_text, name_matches = meth(base_text) |
|
1987 | name_text, name_matches = meth(base_text) | |
1988 | if name_text: |
|
1988 | if name_text: | |
1989 | return name_text, name_matches[:MATCHES_LIMIT], \ |
|
1989 | return name_text, name_matches[:MATCHES_LIMIT], \ | |
1990 | [meth.__qualname__]*min(len(name_matches), MATCHES_LIMIT), () |
|
1990 | [meth.__qualname__]*min(len(name_matches), MATCHES_LIMIT), () | |
1991 |
|
1991 | |||
1992 |
|
1992 | |||
1993 | # If no line buffer is given, assume the input text is all there was |
|
1993 | # If no line buffer is given, assume the input text is all there was | |
1994 | if line_buffer is None: |
|
1994 | if line_buffer is None: | |
1995 | line_buffer = text |
|
1995 | line_buffer = text | |
1996 |
|
1996 | |||
1997 | self.line_buffer = line_buffer |
|
1997 | self.line_buffer = line_buffer | |
1998 | self.text_until_cursor = self.line_buffer[:cursor_pos] |
|
1998 | self.text_until_cursor = self.line_buffer[:cursor_pos] | |
1999 |
|
1999 | |||
2000 | # Do magic arg matches |
|
2000 | # Do magic arg matches | |
2001 | for matcher in self.magic_arg_matchers: |
|
2001 | for matcher in self.magic_arg_matchers: | |
2002 | matches = list(matcher(line_buffer))[:MATCHES_LIMIT] |
|
2002 | matches = list(matcher(line_buffer))[:MATCHES_LIMIT] | |
2003 | if matches: |
|
2003 | if matches: | |
2004 | origins = [matcher.__qualname__] * len(matches) |
|
2004 | origins = [matcher.__qualname__] * len(matches) | |
2005 | return text, matches, origins, () |
|
2005 | return text, matches, origins, () | |
2006 |
|
2006 | |||
2007 | # Start with a clean slate of completions |
|
2007 | # Start with a clean slate of completions | |
2008 | matches = [] |
|
2008 | matches = [] | |
2009 | custom_res = self.dispatch_custom_completer(text) |
|
2009 | custom_res = self.dispatch_custom_completer(text) | |
2010 | # FIXME: we should extend our api to return a dict with completions for |
|
2010 | # FIXME: we should extend our api to return a dict with completions for | |
2011 | # different types of objects. The rlcomplete() method could then |
|
2011 | # different types of objects. The rlcomplete() method could then | |
2012 | # simply collapse the dict into a list for readline, but we'd have |
|
2012 | # simply collapse the dict into a list for readline, but we'd have | |
2013 | # richer completion semantics in other environments. |
|
2013 | # richer completion semantics in other environments. | |
2014 | completions = () |
|
2014 | completions = () | |
2015 | if self.use_jedi: |
|
2015 | if self.use_jedi: | |
2016 | if not full_text: |
|
2016 | if not full_text: | |
2017 | full_text = line_buffer |
|
2017 | full_text = line_buffer | |
2018 | completions = self._jedi_matches( |
|
2018 | completions = self._jedi_matches( | |
2019 | cursor_pos, cursor_line, full_text) |
|
2019 | cursor_pos, cursor_line, full_text) | |
2020 | if custom_res is not None: |
|
2020 | if custom_res is not None: | |
2021 | # did custom completers produce something? |
|
2021 | # did custom completers produce something? | |
2022 | matches = [(m, 'custom') for m in custom_res] |
|
2022 | matches = [(m, 'custom') for m in custom_res] | |
2023 | else: |
|
2023 | else: | |
2024 | # Extend the list of completions with the results of each |
|
2024 | # Extend the list of completions with the results of each | |
2025 | # matcher, so we return results to the user from all |
|
2025 | # matcher, so we return results to the user from all | |
2026 | # namespaces. |
|
2026 | # namespaces. | |
2027 | if self.merge_completions: |
|
2027 | if self.merge_completions: | |
2028 | matches = [] |
|
2028 | matches = [] | |
2029 | for matcher in self.matchers: |
|
2029 | for matcher in self.matchers: | |
2030 | try: |
|
2030 | try: | |
2031 | matches.extend([(m, matcher.__qualname__) |
|
2031 | matches.extend([(m, matcher.__qualname__) | |
2032 | for m in matcher(text)]) |
|
2032 | for m in matcher(text)]) | |
2033 | except: |
|
2033 | except: | |
2034 | # Show the ugly traceback if the matcher causes an |
|
2034 | # Show the ugly traceback if the matcher causes an | |
2035 | # exception, but do NOT crash the kernel! |
|
2035 | # exception, but do NOT crash the kernel! | |
2036 | sys.excepthook(*sys.exc_info()) |
|
2036 | sys.excepthook(*sys.exc_info()) | |
2037 | else: |
|
2037 | else: | |
2038 | for matcher in self.matchers: |
|
2038 | for matcher in self.matchers: | |
2039 | matches = [(m, matcher.__qualname__) |
|
2039 | matches = [(m, matcher.__qualname__) | |
2040 | for m in matcher(text)] |
|
2040 | for m in matcher(text)] | |
2041 | if matches: |
|
2041 | if matches: | |
2042 | break |
|
2042 | break | |
2043 | seen = set() |
|
2043 | seen = set() | |
2044 | filtered_matches = set() |
|
2044 | filtered_matches = set() | |
2045 | for m in matches: |
|
2045 | for m in matches: | |
2046 | t, c = m |
|
2046 | t, c = m | |
2047 | if t not in seen: |
|
2047 | if t not in seen: | |
2048 | filtered_matches.add(m) |
|
2048 | filtered_matches.add(m) | |
2049 | seen.add(t) |
|
2049 | seen.add(t) | |
2050 |
|
2050 | |||
2051 | _filtered_matches = sorted( |
|
2051 | _filtered_matches = sorted( | |
2052 | set(filtered_matches), key=lambda x: completions_sorting_key(x[0]))\ |
|
2052 | set(filtered_matches), key=lambda x: completions_sorting_key(x[0]))\ | |
2053 | [:MATCHES_LIMIT] |
|
2053 | [:MATCHES_LIMIT] | |
2054 |
|
2054 | |||
2055 | _matches = [m[0] for m in _filtered_matches] |
|
2055 | _matches = [m[0] for m in _filtered_matches] | |
2056 | origins = [m[1] for m in _filtered_matches] |
|
2056 | origins = [m[1] for m in _filtered_matches] | |
2057 |
|
2057 | |||
2058 | self.matches = _matches |
|
2058 | self.matches = _matches | |
2059 |
|
2059 | |||
2060 | return text, _matches, origins, completions |
|
2060 | return text, _matches, origins, completions |
@@ -1,1021 +1,1029 | |||||
1 | # encoding: utf-8 |
|
1 | # encoding: utf-8 | |
2 | """Tests for the IPython tab-completion machinery.""" |
|
2 | """Tests for the IPython tab-completion machinery.""" | |
3 |
|
3 | |||
4 | # Copyright (c) IPython Development Team. |
|
4 | # Copyright (c) IPython Development Team. | |
5 | # Distributed under the terms of the Modified BSD License. |
|
5 | # Distributed under the terms of the Modified BSD License. | |
6 |
|
6 | |||
7 | import os |
|
7 | import os | |
8 | import sys |
|
8 | import sys | |
9 | import textwrap |
|
9 | import textwrap | |
10 | import unittest |
|
10 | import unittest | |
11 |
|
11 | |||
12 | from contextlib import contextmanager |
|
12 | from contextlib import contextmanager | |
13 |
|
13 | |||
14 | import nose.tools as nt |
|
14 | import nose.tools as nt | |
15 |
|
15 | |||
16 | from traitlets.config.loader import Config |
|
16 | from traitlets.config.loader import Config | |
17 | from IPython import get_ipython |
|
17 | from IPython import get_ipython | |
18 | from IPython.core import completer |
|
18 | from IPython.core import completer | |
19 | from IPython.external.decorators import knownfailureif |
|
19 | from IPython.external.decorators import knownfailureif | |
20 | from IPython.utils.tempdir import TemporaryDirectory, TemporaryWorkingDirectory |
|
20 | from IPython.utils.tempdir import TemporaryDirectory, TemporaryWorkingDirectory | |
21 | from IPython.utils.generics import complete_object |
|
21 | from IPython.utils.generics import complete_object | |
22 | from IPython.testing import decorators as dec |
|
22 | from IPython.testing import decorators as dec | |
23 |
|
23 | |||
24 | from IPython.core.completer import ( |
|
24 | from IPython.core.completer import ( | |
25 | Completion, provisionalcompleter, match_dict_keys, _deduplicate_completions) |
|
25 | Completion, provisionalcompleter, match_dict_keys, _deduplicate_completions) | |
26 | from nose.tools import assert_in, assert_not_in |
|
26 | from nose.tools import assert_in, assert_not_in | |
27 |
|
27 | |||
28 | #----------------------------------------------------------------------------- |
|
28 | #----------------------------------------------------------------------------- | |
29 | # Test functions |
|
29 | # Test functions | |
30 | #----------------------------------------------------------------------------- |
|
30 | #----------------------------------------------------------------------------- | |
31 |
|
31 | |||
32 | @contextmanager |
|
32 | @contextmanager | |
33 | def greedy_completion(): |
|
33 | def greedy_completion(): | |
34 | ip = get_ipython() |
|
34 | ip = get_ipython() | |
35 | greedy_original = ip.Completer.greedy |
|
35 | greedy_original = ip.Completer.greedy | |
36 | try: |
|
36 | try: | |
37 | ip.Completer.greedy = True |
|
37 | ip.Completer.greedy = True | |
38 | yield |
|
38 | yield | |
39 | finally: |
|
39 | finally: | |
40 | ip.Completer.greedy = greedy_original |
|
40 | ip.Completer.greedy = greedy_original | |
41 |
|
41 | |||
42 | def test_protect_filename(): |
|
42 | def test_protect_filename(): | |
43 | if sys.platform == 'win32': |
|
43 | if sys.platform == 'win32': | |
44 | pairs = [('abc','abc'), |
|
44 | pairs = [('abc','abc'), | |
45 | (' abc','" abc"'), |
|
45 | (' abc','" abc"'), | |
46 | ('a bc','"a bc"'), |
|
46 | ('a bc','"a bc"'), | |
47 | ('a bc','"a bc"'), |
|
47 | ('a bc','"a bc"'), | |
48 | (' bc','" bc"'), |
|
48 | (' bc','" bc"'), | |
49 | ] |
|
49 | ] | |
50 | else: |
|
50 | else: | |
51 | pairs = [('abc','abc'), |
|
51 | pairs = [('abc','abc'), | |
52 | (' abc',r'\ abc'), |
|
52 | (' abc',r'\ abc'), | |
53 | ('a bc',r'a\ bc'), |
|
53 | ('a bc',r'a\ bc'), | |
54 | ('a bc',r'a\ \ bc'), |
|
54 | ('a bc',r'a\ \ bc'), | |
55 | (' bc',r'\ \ bc'), |
|
55 | (' bc',r'\ \ bc'), | |
56 | # On posix, we also protect parens and other special characters. |
|
56 | # On posix, we also protect parens and other special characters. | |
57 | ('a(bc',r'a\(bc'), |
|
57 | ('a(bc',r'a\(bc'), | |
58 | ('a)bc',r'a\)bc'), |
|
58 | ('a)bc',r'a\)bc'), | |
59 | ('a( )bc',r'a\(\ \)bc'), |
|
59 | ('a( )bc',r'a\(\ \)bc'), | |
60 | ('a[1]bc', r'a\[1\]bc'), |
|
60 | ('a[1]bc', r'a\[1\]bc'), | |
61 | ('a{1}bc', r'a\{1\}bc'), |
|
61 | ('a{1}bc', r'a\{1\}bc'), | |
62 | ('a#bc', r'a\#bc'), |
|
62 | ('a#bc', r'a\#bc'), | |
63 | ('a?bc', r'a\?bc'), |
|
63 | ('a?bc', r'a\?bc'), | |
64 | ('a=bc', r'a\=bc'), |
|
64 | ('a=bc', r'a\=bc'), | |
65 | ('a\\bc', r'a\\bc'), |
|
65 | ('a\\bc', r'a\\bc'), | |
66 | ('a|bc', r'a\|bc'), |
|
66 | ('a|bc', r'a\|bc'), | |
67 | ('a;bc', r'a\;bc'), |
|
67 | ('a;bc', r'a\;bc'), | |
68 | ('a:bc', r'a\:bc'), |
|
68 | ('a:bc', r'a\:bc'), | |
69 | ("a'bc", r"a\'bc"), |
|
69 | ("a'bc", r"a\'bc"), | |
70 | ('a*bc', r'a\*bc'), |
|
70 | ('a*bc', r'a\*bc'), | |
71 | ('a"bc', r'a\"bc'), |
|
71 | ('a"bc', r'a\"bc'), | |
72 | ('a^bc', r'a\^bc'), |
|
72 | ('a^bc', r'a\^bc'), | |
73 | ('a&bc', r'a\&bc'), |
|
73 | ('a&bc', r'a\&bc'), | |
74 | ] |
|
74 | ] | |
75 | # run the actual tests |
|
75 | # run the actual tests | |
76 | for s1, s2 in pairs: |
|
76 | for s1, s2 in pairs: | |
77 | s1p = completer.protect_filename(s1) |
|
77 | s1p = completer.protect_filename(s1) | |
78 | nt.assert_equal(s1p, s2) |
|
78 | nt.assert_equal(s1p, s2) | |
79 |
|
79 | |||
80 |
|
80 | |||
81 | def check_line_split(splitter, test_specs): |
|
81 | def check_line_split(splitter, test_specs): | |
82 | for part1, part2, split in test_specs: |
|
82 | for part1, part2, split in test_specs: | |
83 | cursor_pos = len(part1) |
|
83 | cursor_pos = len(part1) | |
84 | line = part1+part2 |
|
84 | line = part1+part2 | |
85 | out = splitter.split_line(line, cursor_pos) |
|
85 | out = splitter.split_line(line, cursor_pos) | |
86 | nt.assert_equal(out, split) |
|
86 | nt.assert_equal(out, split) | |
87 |
|
87 | |||
88 |
|
88 | |||
89 | def test_line_split(): |
|
89 | def test_line_split(): | |
90 | """Basic line splitter test with default specs.""" |
|
90 | """Basic line splitter test with default specs.""" | |
91 | sp = completer.CompletionSplitter() |
|
91 | sp = completer.CompletionSplitter() | |
92 | # The format of the test specs is: part1, part2, expected answer. Parts 1 |
|
92 | # The format of the test specs is: part1, part2, expected answer. Parts 1 | |
93 | # and 2 are joined into the 'line' sent to the splitter, as if the cursor |
|
93 | # and 2 are joined into the 'line' sent to the splitter, as if the cursor | |
94 | # was at the end of part1. So an empty part2 represents someone hitting |
|
94 | # was at the end of part1. So an empty part2 represents someone hitting | |
95 | # tab at the end of the line, the most common case. |
|
95 | # tab at the end of the line, the most common case. | |
96 | t = [('run some/scrip', '', 'some/scrip'), |
|
96 | t = [('run some/scrip', '', 'some/scrip'), | |
97 | ('run scripts/er', 'ror.py foo', 'scripts/er'), |
|
97 | ('run scripts/er', 'ror.py foo', 'scripts/er'), | |
98 | ('echo $HOM', '', 'HOM'), |
|
98 | ('echo $HOM', '', 'HOM'), | |
99 | ('print sys.pa', '', 'sys.pa'), |
|
99 | ('print sys.pa', '', 'sys.pa'), | |
100 | ('print(sys.pa', '', 'sys.pa'), |
|
100 | ('print(sys.pa', '', 'sys.pa'), | |
101 | ("execfile('scripts/er", '', 'scripts/er'), |
|
101 | ("execfile('scripts/er", '', 'scripts/er'), | |
102 | ('a[x.', '', 'x.'), |
|
102 | ('a[x.', '', 'x.'), | |
103 | ('a[x.', 'y', 'x.'), |
|
103 | ('a[x.', 'y', 'x.'), | |
104 | ('cd "some_file/', '', 'some_file/'), |
|
104 | ('cd "some_file/', '', 'some_file/'), | |
105 | ] |
|
105 | ] | |
106 | check_line_split(sp, t) |
|
106 | check_line_split(sp, t) | |
107 | # Ensure splitting works OK with unicode by re-running the tests with |
|
107 | # Ensure splitting works OK with unicode by re-running the tests with | |
108 | # all inputs turned into unicode |
|
108 | # all inputs turned into unicode | |
109 | check_line_split(sp, [ map(str, p) for p in t] ) |
|
109 | check_line_split(sp, [ map(str, p) for p in t] ) | |
110 |
|
110 | |||
111 |
|
111 | |||
112 | def test_custom_completion_error(): |
|
112 | def test_custom_completion_error(): | |
113 | """Test that errors from custom attribute completers are silenced.""" |
|
113 | """Test that errors from custom attribute completers are silenced.""" | |
114 | ip = get_ipython() |
|
114 | ip = get_ipython() | |
115 | class A(object): pass |
|
115 | class A(object): pass | |
116 | ip.user_ns['a'] = A() |
|
116 | ip.user_ns['a'] = A() | |
117 |
|
117 | |||
118 | @complete_object.when_type(A) |
|
118 | @complete_object.when_type(A) | |
119 | def complete_A(a, existing_completions): |
|
119 | def complete_A(a, existing_completions): | |
120 | raise TypeError("this should be silenced") |
|
120 | raise TypeError("this should be silenced") | |
121 |
|
121 | |||
122 | ip.complete("a.") |
|
122 | ip.complete("a.") | |
123 |
|
123 | |||
124 |
|
124 | |||
125 | def test_unicode_completions(): |
|
125 | def test_unicode_completions(): | |
126 | ip = get_ipython() |
|
126 | ip = get_ipython() | |
127 | # Some strings that trigger different types of completion. Check them both |
|
127 | # Some strings that trigger different types of completion. Check them both | |
128 | # in str and unicode forms |
|
128 | # in str and unicode forms | |
129 | s = ['ru', '%ru', 'cd /', 'floa', 'float(x)/'] |
|
129 | s = ['ru', '%ru', 'cd /', 'floa', 'float(x)/'] | |
130 | for t in s + list(map(str, s)): |
|
130 | for t in s + list(map(str, s)): | |
131 | # We don't need to check exact completion values (they may change |
|
131 | # We don't need to check exact completion values (they may change | |
132 | # depending on the state of the namespace, but at least no exceptions |
|
132 | # depending on the state of the namespace, but at least no exceptions | |
133 | # should be thrown and the return value should be a pair of text, list |
|
133 | # should be thrown and the return value should be a pair of text, list | |
134 | # values. |
|
134 | # values. | |
135 | text, matches = ip.complete(t) |
|
135 | text, matches = ip.complete(t) | |
136 | nt.assert_true(isinstance(text, str)) |
|
136 | nt.assert_true(isinstance(text, str)) | |
137 | nt.assert_true(isinstance(matches, list)) |
|
137 | nt.assert_true(isinstance(matches, list)) | |
138 |
|
138 | |||
139 | def test_latex_completions(): |
|
139 | def test_latex_completions(): | |
140 | from IPython.core.latex_symbols import latex_symbols |
|
140 | from IPython.core.latex_symbols import latex_symbols | |
141 | import random |
|
141 | import random | |
142 | ip = get_ipython() |
|
142 | ip = get_ipython() | |
143 | # Test some random unicode symbols |
|
143 | # Test some random unicode symbols | |
144 | keys = random.sample(latex_symbols.keys(), 10) |
|
144 | keys = random.sample(latex_symbols.keys(), 10) | |
145 | for k in keys: |
|
145 | for k in keys: | |
146 | text, matches = ip.complete(k) |
|
146 | text, matches = ip.complete(k) | |
147 | nt.assert_equal(len(matches),1) |
|
147 | nt.assert_equal(len(matches),1) | |
148 | nt.assert_equal(text, k) |
|
148 | nt.assert_equal(text, k) | |
149 | nt.assert_equal(matches[0], latex_symbols[k]) |
|
149 | nt.assert_equal(matches[0], latex_symbols[k]) | |
150 | # Test a more complex line |
|
150 | # Test a more complex line | |
151 | text, matches = ip.complete(u'print(\\alpha') |
|
151 | text, matches = ip.complete(u'print(\\alpha') | |
152 | nt.assert_equal(text, u'\\alpha') |
|
152 | nt.assert_equal(text, u'\\alpha') | |
153 | nt.assert_equal(matches[0], latex_symbols['\\alpha']) |
|
153 | nt.assert_equal(matches[0], latex_symbols['\\alpha']) | |
154 | # Test multiple matching latex symbols |
|
154 | # Test multiple matching latex symbols | |
155 | text, matches = ip.complete(u'\\al') |
|
155 | text, matches = ip.complete(u'\\al') | |
156 | nt.assert_in('\\alpha', matches) |
|
156 | nt.assert_in('\\alpha', matches) | |
157 | nt.assert_in('\\aleph', matches) |
|
157 | nt.assert_in('\\aleph', matches) | |
158 |
|
158 | |||
159 |
|
159 | |||
160 |
|
160 | |||
161 |
|
161 | |||
162 | def test_back_latex_completion(): |
|
162 | def test_back_latex_completion(): | |
163 | ip = get_ipython() |
|
163 | ip = get_ipython() | |
164 |
|
164 | |||
165 | # do not return more than 1 matches fro \beta, only the latex one. |
|
165 | # do not return more than 1 matches fro \beta, only the latex one. | |
166 | name, matches = ip.complete('\\Ξ²') |
|
166 | name, matches = ip.complete('\\Ξ²') | |
167 | nt.assert_equal(len(matches), 1) |
|
167 | nt.assert_equal(len(matches), 1) | |
168 | nt.assert_equal(matches[0], '\\beta') |
|
168 | nt.assert_equal(matches[0], '\\beta') | |
169 |
|
169 | |||
170 | def test_back_unicode_completion(): |
|
170 | def test_back_unicode_completion(): | |
171 | ip = get_ipython() |
|
171 | ip = get_ipython() | |
172 |
|
172 | |||
173 | name, matches = ip.complete('\\β €') |
|
173 | name, matches = ip.complete('\\β €') | |
174 | nt.assert_equal(len(matches), 1) |
|
174 | nt.assert_equal(len(matches), 1) | |
175 | nt.assert_equal(matches[0], '\\ROMAN NUMERAL FIVE') |
|
175 | nt.assert_equal(matches[0], '\\ROMAN NUMERAL FIVE') | |
176 |
|
176 | |||
177 |
|
177 | |||
178 | def test_forward_unicode_completion(): |
|
178 | def test_forward_unicode_completion(): | |
179 | ip = get_ipython() |
|
179 | ip = get_ipython() | |
180 |
|
180 | |||
181 | name, matches = ip.complete('\\ROMAN NUMERAL FIVE') |
|
181 | name, matches = ip.complete('\\ROMAN NUMERAL FIVE') | |
182 | nt.assert_equal(len(matches), 1) |
|
182 | nt.assert_equal(len(matches), 1) | |
183 | nt.assert_equal(matches[0], 'β €') |
|
183 | nt.assert_equal(matches[0], 'β €') | |
184 |
|
184 | |||
185 | @dec.knownfailureif(sys.platform == 'win32', 'Fails if there is a C:\\j... path') |
|
185 | @dec.knownfailureif(sys.platform == 'win32', 'Fails if there is a C:\\j... path') | |
186 | def test_no_ascii_back_completion(): |
|
186 | def test_no_ascii_back_completion(): | |
187 | ip = get_ipython() |
|
187 | ip = get_ipython() | |
188 | with TemporaryWorkingDirectory(): # Avoid any filename completions |
|
188 | with TemporaryWorkingDirectory(): # Avoid any filename completions | |
189 | # single ascii letter that don't have yet completions |
|
189 | # single ascii letter that don't have yet completions | |
190 | for letter in 'jJ' : |
|
190 | for letter in 'jJ' : | |
191 | name, matches = ip.complete('\\'+letter) |
|
191 | name, matches = ip.complete('\\'+letter) | |
192 | nt.assert_equal(matches, []) |
|
192 | nt.assert_equal(matches, []) | |
193 |
|
193 | |||
194 |
|
194 | |||
195 |
|
195 | |||
196 |
|
196 | |||
197 | class CompletionSplitterTestCase(unittest.TestCase): |
|
197 | class CompletionSplitterTestCase(unittest.TestCase): | |
198 | def setUp(self): |
|
198 | def setUp(self): | |
199 | self.sp = completer.CompletionSplitter() |
|
199 | self.sp = completer.CompletionSplitter() | |
200 |
|
200 | |||
201 | def test_delim_setting(self): |
|
201 | def test_delim_setting(self): | |
202 | self.sp.delims = ' ' |
|
202 | self.sp.delims = ' ' | |
203 | nt.assert_equal(self.sp.delims, ' ') |
|
203 | nt.assert_equal(self.sp.delims, ' ') | |
204 | nt.assert_equal(self.sp._delim_expr, '[\ ]') |
|
204 | nt.assert_equal(self.sp._delim_expr, '[\ ]') | |
205 |
|
205 | |||
206 | def test_spaces(self): |
|
206 | def test_spaces(self): | |
207 | """Test with only spaces as split chars.""" |
|
207 | """Test with only spaces as split chars.""" | |
208 | self.sp.delims = ' ' |
|
208 | self.sp.delims = ' ' | |
209 | t = [('foo', '', 'foo'), |
|
209 | t = [('foo', '', 'foo'), | |
210 | ('run foo', '', 'foo'), |
|
210 | ('run foo', '', 'foo'), | |
211 | ('run foo', 'bar', 'foo'), |
|
211 | ('run foo', 'bar', 'foo'), | |
212 | ] |
|
212 | ] | |
213 | check_line_split(self.sp, t) |
|
213 | check_line_split(self.sp, t) | |
214 |
|
214 | |||
215 |
|
215 | |||
216 | def test_has_open_quotes1(): |
|
216 | def test_has_open_quotes1(): | |
217 | for s in ["'", "'''", "'hi' '"]: |
|
217 | for s in ["'", "'''", "'hi' '"]: | |
218 | nt.assert_equal(completer.has_open_quotes(s), "'") |
|
218 | nt.assert_equal(completer.has_open_quotes(s), "'") | |
219 |
|
219 | |||
220 |
|
220 | |||
221 | def test_has_open_quotes2(): |
|
221 | def test_has_open_quotes2(): | |
222 | for s in ['"', '"""', '"hi" "']: |
|
222 | for s in ['"', '"""', '"hi" "']: | |
223 | nt.assert_equal(completer.has_open_quotes(s), '"') |
|
223 | nt.assert_equal(completer.has_open_quotes(s), '"') | |
224 |
|
224 | |||
225 |
|
225 | |||
226 | def test_has_open_quotes3(): |
|
226 | def test_has_open_quotes3(): | |
227 | for s in ["''", "''' '''", "'hi' 'ipython'"]: |
|
227 | for s in ["''", "''' '''", "'hi' 'ipython'"]: | |
228 | nt.assert_false(completer.has_open_quotes(s)) |
|
228 | nt.assert_false(completer.has_open_quotes(s)) | |
229 |
|
229 | |||
230 |
|
230 | |||
231 | def test_has_open_quotes4(): |
|
231 | def test_has_open_quotes4(): | |
232 | for s in ['""', '""" """', '"hi" "ipython"']: |
|
232 | for s in ['""', '""" """', '"hi" "ipython"']: | |
233 | nt.assert_false(completer.has_open_quotes(s)) |
|
233 | nt.assert_false(completer.has_open_quotes(s)) | |
234 |
|
234 | |||
235 |
|
235 | |||
236 | @knownfailureif(sys.platform == 'win32', "abspath completions fail on Windows") |
|
236 | @knownfailureif(sys.platform == 'win32', "abspath completions fail on Windows") | |
237 | def test_abspath_file_completions(): |
|
237 | def test_abspath_file_completions(): | |
238 | ip = get_ipython() |
|
238 | ip = get_ipython() | |
239 | with TemporaryDirectory() as tmpdir: |
|
239 | with TemporaryDirectory() as tmpdir: | |
240 | prefix = os.path.join(tmpdir, 'foo') |
|
240 | prefix = os.path.join(tmpdir, 'foo') | |
241 | suffixes = ['1', '2'] |
|
241 | suffixes = ['1', '2'] | |
242 | names = [prefix+s for s in suffixes] |
|
242 | names = [prefix+s for s in suffixes] | |
243 | for n in names: |
|
243 | for n in names: | |
244 | open(n, 'w').close() |
|
244 | open(n, 'w').close() | |
245 |
|
245 | |||
246 | # Check simple completion |
|
246 | # Check simple completion | |
247 | c = ip.complete(prefix)[1] |
|
247 | c = ip.complete(prefix)[1] | |
248 | nt.assert_equal(c, names) |
|
248 | nt.assert_equal(c, names) | |
249 |
|
249 | |||
250 | # Now check with a function call |
|
250 | # Now check with a function call | |
251 | cmd = 'a = f("%s' % prefix |
|
251 | cmd = 'a = f("%s' % prefix | |
252 | c = ip.complete(prefix, cmd)[1] |
|
252 | c = ip.complete(prefix, cmd)[1] | |
253 | comp = [prefix+s for s in suffixes] |
|
253 | comp = [prefix+s for s in suffixes] | |
254 | nt.assert_equal(c, comp) |
|
254 | nt.assert_equal(c, comp) | |
255 |
|
255 | |||
256 |
|
256 | |||
257 | def test_local_file_completions(): |
|
257 | def test_local_file_completions(): | |
258 | ip = get_ipython() |
|
258 | ip = get_ipython() | |
259 | with TemporaryWorkingDirectory(): |
|
259 | with TemporaryWorkingDirectory(): | |
260 | prefix = './foo' |
|
260 | prefix = './foo' | |
261 | suffixes = ['1', '2'] |
|
261 | suffixes = ['1', '2'] | |
262 | names = [prefix+s for s in suffixes] |
|
262 | names = [prefix+s for s in suffixes] | |
263 | for n in names: |
|
263 | for n in names: | |
264 | open(n, 'w').close() |
|
264 | open(n, 'w').close() | |
265 |
|
265 | |||
266 | # Check simple completion |
|
266 | # Check simple completion | |
267 | c = ip.complete(prefix)[1] |
|
267 | c = ip.complete(prefix)[1] | |
268 | nt.assert_equal(c, names) |
|
268 | nt.assert_equal(c, names) | |
269 |
|
269 | |||
270 | # Now check with a function call |
|
270 | # Now check with a function call | |
271 | cmd = 'a = f("%s' % prefix |
|
271 | cmd = 'a = f("%s' % prefix | |
272 | c = ip.complete(prefix, cmd)[1] |
|
272 | c = ip.complete(prefix, cmd)[1] | |
273 | comp = set(prefix+s for s in suffixes) |
|
273 | comp = set(prefix+s for s in suffixes) | |
274 | nt.assert_true(comp.issubset(set(c))) |
|
274 | nt.assert_true(comp.issubset(set(c))) | |
275 |
|
275 | |||
276 |
|
276 | |||
277 | def test_quoted_file_completions(): |
|
277 | def test_quoted_file_completions(): | |
278 | ip = get_ipython() |
|
278 | ip = get_ipython() | |
279 | with TemporaryWorkingDirectory(): |
|
279 | with TemporaryWorkingDirectory(): | |
280 | name = "foo'bar" |
|
280 | name = "foo'bar" | |
281 | open(name, 'w').close() |
|
281 | open(name, 'w').close() | |
282 |
|
282 | |||
283 | # Don't escape Windows |
|
283 | # Don't escape Windows | |
284 | escaped = name if sys.platform == "win32" else "foo\\'bar" |
|
284 | escaped = name if sys.platform == "win32" else "foo\\'bar" | |
285 |
|
285 | |||
286 | # Single quote matches embedded single quote |
|
286 | # Single quote matches embedded single quote | |
287 | text = "open('foo" |
|
287 | text = "open('foo" | |
288 | c = ip.Completer._complete(cursor_line=0, |
|
288 | c = ip.Completer._complete(cursor_line=0, | |
289 | cursor_pos=len(text), |
|
289 | cursor_pos=len(text), | |
290 | full_text=text)[1] |
|
290 | full_text=text)[1] | |
291 | nt.assert_equal(c, [escaped]) |
|
291 | nt.assert_equal(c, [escaped]) | |
292 |
|
292 | |||
293 | # Double quote requires no escape |
|
293 | # Double quote requires no escape | |
294 | text = 'open("foo' |
|
294 | text = 'open("foo' | |
295 | c = ip.Completer._complete(cursor_line=0, |
|
295 | c = ip.Completer._complete(cursor_line=0, | |
296 | cursor_pos=len(text), |
|
296 | cursor_pos=len(text), | |
297 | full_text=text)[1] |
|
297 | full_text=text)[1] | |
298 | nt.assert_equal(c, [name]) |
|
298 | nt.assert_equal(c, [name]) | |
299 |
|
299 | |||
300 | # No quote requires an escape |
|
300 | # No quote requires an escape | |
301 | text = '%ls foo' |
|
301 | text = '%ls foo' | |
302 | c = ip.Completer._complete(cursor_line=0, |
|
302 | c = ip.Completer._complete(cursor_line=0, | |
303 | cursor_pos=len(text), |
|
303 | cursor_pos=len(text), | |
304 | full_text=text)[1] |
|
304 | full_text=text)[1] | |
305 | nt.assert_equal(c, [escaped]) |
|
305 | nt.assert_equal(c, [escaped]) | |
306 |
|
306 | |||
307 |
|
307 | |||
308 | def test_jedi(): |
|
308 | def test_jedi(): | |
309 | """ |
|
309 | """ | |
310 | A couple of issue we had with Jedi |
|
310 | A couple of issue we had with Jedi | |
311 | """ |
|
311 | """ | |
312 | ip = get_ipython() |
|
312 | ip = get_ipython() | |
313 |
|
313 | |||
314 | def _test_complete(reason, s, comp, start=None, end=None): |
|
314 | def _test_complete(reason, s, comp, start=None, end=None): | |
315 | l = len(s) |
|
315 | l = len(s) | |
316 | start = start if start is not None else l |
|
316 | start = start if start is not None else l | |
317 | end = end if end is not None else l |
|
317 | end = end if end is not None else l | |
318 | with provisionalcompleter(): |
|
318 | with provisionalcompleter(): | |
|
319 | ip.Completer.use_jedi = True | |||
319 | completions = set(ip.Completer.completions(s, l)) |
|
320 | completions = set(ip.Completer.completions(s, l)) | |
|
321 | ip.Completer.use_jedi = False | |||
320 | assert_in(Completion(start, end, comp), completions, reason) |
|
322 | assert_in(Completion(start, end, comp), completions, reason) | |
321 |
|
323 | |||
322 | def _test_not_complete(reason, s, comp): |
|
324 | def _test_not_complete(reason, s, comp): | |
323 | l = len(s) |
|
325 | l = len(s) | |
324 | with provisionalcompleter(): |
|
326 | with provisionalcompleter(): | |
|
327 | ip.Completer.use_jedi = True | |||
325 | completions = set(ip.Completer.completions(s, l)) |
|
328 | completions = set(ip.Completer.completions(s, l)) | |
|
329 | ip.Completer.use_jedi = False | |||
326 | assert_not_in(Completion(l, l, comp), completions, reason) |
|
330 | assert_not_in(Completion(l, l, comp), completions, reason) | |
327 |
|
331 | |||
328 | import jedi |
|
332 | import jedi | |
329 | jedi_version = tuple(int(i) for i in jedi.__version__.split('.')[:3]) |
|
333 | jedi_version = tuple(int(i) for i in jedi.__version__.split('.')[:3]) | |
330 | if jedi_version > (0, 10): |
|
334 | if jedi_version > (0, 10): | |
331 | yield _test_complete, 'jedi >0.9 should complete and not crash', 'a=1;a.', 'real' |
|
335 | yield _test_complete, 'jedi >0.9 should complete and not crash', 'a=1;a.', 'real' | |
332 | yield _test_complete, 'can infer first argument', 'a=(1,"foo");a[0].', 'real' |
|
336 | yield _test_complete, 'can infer first argument', 'a=(1,"foo");a[0].', 'real' | |
333 | yield _test_complete, 'can infer second argument', 'a=(1,"foo");a[1].', 'capitalize' |
|
337 | yield _test_complete, 'can infer second argument', 'a=(1,"foo");a[1].', 'capitalize' | |
334 | yield _test_complete, 'cover duplicate completions', 'im', 'import', 0, 2 |
|
338 | yield _test_complete, 'cover duplicate completions', 'im', 'import', 0, 2 | |
335 |
|
339 | |||
336 | yield _test_not_complete, 'does not mix types', 'a=(1,"foo");a[0].', 'capitalize' |
|
340 | yield _test_not_complete, 'does not mix types', 'a=(1,"foo");a[0].', 'capitalize' | |
337 |
|
341 | |||
338 | def test_completion_have_signature(): |
|
342 | def test_completion_have_signature(): | |
339 | """ |
|
343 | """ | |
340 | Lets make sure jedi is capable of pulling out the signature of the function we are completing. |
|
344 | Lets make sure jedi is capable of pulling out the signature of the function we are completing. | |
341 | """ |
|
345 | """ | |
342 | ip = get_ipython() |
|
346 | ip = get_ipython() | |
343 | with provisionalcompleter(): |
|
347 | with provisionalcompleter(): | |
|
348 | ip.Completer.use_jedi = True | |||
344 | completions = ip.Completer.completions('ope', 3) |
|
349 | completions = ip.Completer.completions('ope', 3) | |
345 | c = next(completions) # should be `open` |
|
350 | c = next(completions) # should be `open` | |
|
351 | ip.Completer.use_jedi = False | |||
346 | assert 'file' in c.signature, "Signature of function was not found by completer" |
|
352 | assert 'file' in c.signature, "Signature of function was not found by completer" | |
347 | assert 'encoding' in c.signature, "Signature of function was not found by completer" |
|
353 | assert 'encoding' in c.signature, "Signature of function was not found by completer" | |
348 |
|
354 | |||
349 |
|
355 | |||
350 | def test_deduplicate_completions(): |
|
356 | def test_deduplicate_completions(): | |
351 | """ |
|
357 | """ | |
352 | Test that completions are correctly deduplicated (even if ranges are not the same) |
|
358 | Test that completions are correctly deduplicated (even if ranges are not the same) | |
353 | """ |
|
359 | """ | |
354 | ip = get_ipython() |
|
360 | ip = get_ipython() | |
355 | ip.ex(textwrap.dedent(''' |
|
361 | ip.ex(textwrap.dedent(''' | |
356 | class Z: |
|
362 | class Z: | |
357 | zoo = 1 |
|
363 | zoo = 1 | |
358 | ''')) |
|
364 | ''')) | |
359 | with provisionalcompleter(): |
|
365 | with provisionalcompleter(): | |
|
366 | ip.Completer.use_jedi = True | |||
360 | l = list(_deduplicate_completions('Z.z', ip.Completer.completions('Z.z', 3))) |
|
367 | l = list(_deduplicate_completions('Z.z', ip.Completer.completions('Z.z', 3))) | |
|
368 | ip.Completer.use_jedi = False | |||
361 |
|
369 | |||
362 | assert len(l) == 1, 'Completions (Z.z<tab>) correctly deduplicate: %s ' % l |
|
370 | assert len(l) == 1, 'Completions (Z.z<tab>) correctly deduplicate: %s ' % l | |
363 | assert l[0].text == 'zoo' # and not `it.accumulate` |
|
371 | assert l[0].text == 'zoo' # and not `it.accumulate` | |
364 |
|
372 | |||
365 |
|
373 | |||
366 | def test_greedy_completions(): |
|
374 | def test_greedy_completions(): | |
367 | """ |
|
375 | """ | |
368 | Test the capability of the Greedy completer. |
|
376 | Test the capability of the Greedy completer. | |
369 |
|
377 | |||
370 | Most of the test here does not really show off the greedy completer, for proof |
|
378 | Most of the test here does not really show off the greedy completer, for proof | |
371 | each of the text below now pass with Jedi. The greedy completer is capable of more. |
|
379 | each of the text below now pass with Jedi. The greedy completer is capable of more. | |
372 |
|
380 | |||
373 | See the :any:`test_dict_key_completion_contexts` |
|
381 | See the :any:`test_dict_key_completion_contexts` | |
374 |
|
382 | |||
375 | """ |
|
383 | """ | |
376 | ip = get_ipython() |
|
384 | ip = get_ipython() | |
377 | ip.ex('a=list(range(5))') |
|
385 | ip.ex('a=list(range(5))') | |
378 | _,c = ip.complete('.',line='a[0].') |
|
386 | _,c = ip.complete('.',line='a[0].') | |
379 | nt.assert_false('.real' in c, |
|
387 | nt.assert_false('.real' in c, | |
380 | "Shouldn't have completed on a[0]: %s"%c) |
|
388 | "Shouldn't have completed on a[0]: %s"%c) | |
381 | with greedy_completion(), provisionalcompleter(): |
|
389 | with greedy_completion(), provisionalcompleter(): | |
382 | def _(line, cursor_pos, expect, message, completion): |
|
390 | def _(line, cursor_pos, expect, message, completion): | |
383 | ip.Completer.use_jedi = False |
|
391 | ip.Completer.use_jedi = False | |
384 | _,c = ip.complete('.', line=line, cursor_pos=cursor_pos) |
|
392 | _,c = ip.complete('.', line=line, cursor_pos=cursor_pos) | |
385 | nt.assert_in(expect, c, message % c) |
|
393 | nt.assert_in(expect, c, message % c) | |
386 |
|
394 | |||
387 | ip.Completer.use_jedi = True |
|
395 | ip.Completer.use_jedi = True | |
388 | with provisionalcompleter(): |
|
396 | with provisionalcompleter(): | |
389 | completions = ip.Completer.completions(line, cursor_pos) |
|
397 | completions = ip.Completer.completions(line, cursor_pos) | |
390 | nt.assert_in(completion, completions) |
|
398 | nt.assert_in(completion, completions) | |
391 |
|
399 | |||
392 | yield _, 'a[0].', 5, 'a[0].real', "Should have completed on a[0].: %s", Completion(5,5, 'real') |
|
400 | yield _, 'a[0].', 5, 'a[0].real', "Should have completed on a[0].: %s", Completion(5,5, 'real') | |
393 | yield _, 'a[0].r', 6, 'a[0].real', "Should have completed on a[0].r: %s", Completion(5,6, 'real') |
|
401 | yield _, 'a[0].r', 6, 'a[0].real', "Should have completed on a[0].r: %s", Completion(5,6, 'real') | |
394 |
|
402 | |||
395 | if sys.version_info > (3, 4): |
|
403 | if sys.version_info > (3, 4): | |
396 | yield _, 'a[0].from_', 10, 'a[0].from_bytes', "Should have completed on a[0].from_: %s", Completion(5, 10, 'from_bytes') |
|
404 | yield _, 'a[0].from_', 10, 'a[0].from_bytes', "Should have completed on a[0].from_: %s", Completion(5, 10, 'from_bytes') | |
397 |
|
405 | |||
398 |
|
406 | |||
399 | def test_omit__names(): |
|
407 | def test_omit__names(): | |
400 | # also happens to test IPCompleter as a configurable |
|
408 | # also happens to test IPCompleter as a configurable | |
401 | ip = get_ipython() |
|
409 | ip = get_ipython() | |
402 | ip._hidden_attr = 1 |
|
410 | ip._hidden_attr = 1 | |
403 | ip._x = {} |
|
411 | ip._x = {} | |
404 | c = ip.Completer |
|
412 | c = ip.Completer | |
405 | ip.ex('ip=get_ipython()') |
|
413 | ip.ex('ip=get_ipython()') | |
406 | cfg = Config() |
|
414 | cfg = Config() | |
407 | cfg.IPCompleter.omit__names = 0 |
|
415 | cfg.IPCompleter.omit__names = 0 | |
408 | c.update_config(cfg) |
|
416 | c.update_config(cfg) | |
409 | with provisionalcompleter(): |
|
417 | with provisionalcompleter(): | |
410 | c.use_jedi = False |
|
418 | c.use_jedi = False | |
411 | s,matches = c.complete('ip.') |
|
419 | s,matches = c.complete('ip.') | |
412 | nt.assert_in('ip.__str__', matches) |
|
420 | nt.assert_in('ip.__str__', matches) | |
413 | nt.assert_in('ip._hidden_attr', matches) |
|
421 | nt.assert_in('ip._hidden_attr', matches) | |
414 |
|
422 | |||
415 | c.use_jedi = True |
|
423 | c.use_jedi = True | |
416 | completions = set(c.completions('ip.', 3)) |
|
424 | completions = set(c.completions('ip.', 3)) | |
417 | nt.assert_in(Completion(3, 3, '__str__'), completions) |
|
425 | nt.assert_in(Completion(3, 3, '__str__'), completions) | |
418 | nt.assert_in(Completion(3,3, "_hidden_attr"), completions) |
|
426 | nt.assert_in(Completion(3,3, "_hidden_attr"), completions) | |
419 |
|
427 | |||
420 |
|
428 | |||
421 | cfg = Config() |
|
429 | cfg = Config() | |
422 | cfg.IPCompleter.omit__names = 1 |
|
430 | cfg.IPCompleter.omit__names = 1 | |
423 | c.update_config(cfg) |
|
431 | c.update_config(cfg) | |
424 | with provisionalcompleter(): |
|
432 | with provisionalcompleter(): | |
425 | c.use_jedi = False |
|
433 | c.use_jedi = False | |
426 | s,matches = c.complete('ip.') |
|
434 | s,matches = c.complete('ip.') | |
427 | nt.assert_not_in('ip.__str__', matches) |
|
435 | nt.assert_not_in('ip.__str__', matches) | |
428 | # nt.assert_in('ip._hidden_attr', matches) |
|
436 | # nt.assert_in('ip._hidden_attr', matches) | |
429 |
|
437 | |||
430 | c.use_jedi = True |
|
438 | c.use_jedi = True | |
431 | completions = set(c.completions('ip.', 3)) |
|
439 | completions = set(c.completions('ip.', 3)) | |
432 | nt.assert_not_in(Completion(3,3,'__str__'), completions) |
|
440 | nt.assert_not_in(Completion(3,3,'__str__'), completions) | |
433 | nt.assert_in(Completion(3,3, "_hidden_attr"), completions) |
|
441 | nt.assert_in(Completion(3,3, "_hidden_attr"), completions) | |
434 |
|
442 | |||
435 | cfg = Config() |
|
443 | cfg = Config() | |
436 | cfg.IPCompleter.omit__names = 2 |
|
444 | cfg.IPCompleter.omit__names = 2 | |
437 | c.update_config(cfg) |
|
445 | c.update_config(cfg) | |
438 | with provisionalcompleter(): |
|
446 | with provisionalcompleter(): | |
439 | c.use_jedi = False |
|
447 | c.use_jedi = False | |
440 | s,matches = c.complete('ip.') |
|
448 | s,matches = c.complete('ip.') | |
441 | nt.assert_not_in('ip.__str__', matches) |
|
449 | nt.assert_not_in('ip.__str__', matches) | |
442 | nt.assert_not_in('ip._hidden_attr', matches) |
|
450 | nt.assert_not_in('ip._hidden_attr', matches) | |
443 |
|
451 | |||
444 | c.use_jedi = True |
|
452 | c.use_jedi = True | |
445 | completions = set(c.completions('ip.', 3)) |
|
453 | completions = set(c.completions('ip.', 3)) | |
446 | nt.assert_not_in(Completion(3,3,'__str__'), completions) |
|
454 | nt.assert_not_in(Completion(3,3,'__str__'), completions) | |
447 | nt.assert_not_in(Completion(3,3, "_hidden_attr"), completions) |
|
455 | nt.assert_not_in(Completion(3,3, "_hidden_attr"), completions) | |
448 |
|
456 | |||
449 | with provisionalcompleter(): |
|
457 | with provisionalcompleter(): | |
450 | c.use_jedi = False |
|
458 | c.use_jedi = False | |
451 | s,matches = c.complete('ip._x.') |
|
459 | s,matches = c.complete('ip._x.') | |
452 | nt.assert_in('ip._x.keys', matches) |
|
460 | nt.assert_in('ip._x.keys', matches) | |
453 |
|
461 | |||
454 | c.use_jedi = True |
|
462 | c.use_jedi = True | |
455 | completions = set(c.completions('ip._x.', 6)) |
|
463 | completions = set(c.completions('ip._x.', 6)) | |
456 | nt.assert_in(Completion(6,6, "keys"), completions) |
|
464 | nt.assert_in(Completion(6,6, "keys"), completions) | |
457 |
|
465 | |||
458 | del ip._hidden_attr |
|
466 | del ip._hidden_attr | |
459 | del ip._x |
|
467 | del ip._x | |
460 |
|
468 | |||
461 |
|
469 | |||
462 | def test_limit_to__all__False_ok(): |
|
470 | def test_limit_to__all__False_ok(): | |
463 | """ |
|
471 | """ | |
464 | Limit to all is deprecated, once we remove it this test can go away. |
|
472 | Limit to all is deprecated, once we remove it this test can go away. | |
465 | """ |
|
473 | """ | |
466 | ip = get_ipython() |
|
474 | ip = get_ipython() | |
467 | c = ip.Completer |
|
475 | c = ip.Completer | |
468 | c.use_jedi = False |
|
476 | c.use_jedi = False | |
469 | ip.ex('class D: x=24') |
|
477 | ip.ex('class D: x=24') | |
470 | ip.ex('d=D()') |
|
478 | ip.ex('d=D()') | |
471 | cfg = Config() |
|
479 | cfg = Config() | |
472 | cfg.IPCompleter.limit_to__all__ = False |
|
480 | cfg.IPCompleter.limit_to__all__ = False | |
473 | c.update_config(cfg) |
|
481 | c.update_config(cfg) | |
474 | s, matches = c.complete('d.') |
|
482 | s, matches = c.complete('d.') | |
475 | nt.assert_in('d.x', matches) |
|
483 | nt.assert_in('d.x', matches) | |
476 |
|
484 | |||
477 |
|
485 | |||
478 | def test_get__all__entries_ok(): |
|
486 | def test_get__all__entries_ok(): | |
479 | class A(object): |
|
487 | class A(object): | |
480 | __all__ = ['x', 1] |
|
488 | __all__ = ['x', 1] | |
481 | words = completer.get__all__entries(A()) |
|
489 | words = completer.get__all__entries(A()) | |
482 | nt.assert_equal(words, ['x']) |
|
490 | nt.assert_equal(words, ['x']) | |
483 |
|
491 | |||
484 |
|
492 | |||
485 | def test_get__all__entries_no__all__ok(): |
|
493 | def test_get__all__entries_no__all__ok(): | |
486 | class A(object): |
|
494 | class A(object): | |
487 | pass |
|
495 | pass | |
488 | words = completer.get__all__entries(A()) |
|
496 | words = completer.get__all__entries(A()) | |
489 | nt.assert_equal(words, []) |
|
497 | nt.assert_equal(words, []) | |
490 |
|
498 | |||
491 |
|
499 | |||
492 | def test_func_kw_completions(): |
|
500 | def test_func_kw_completions(): | |
493 | ip = get_ipython() |
|
501 | ip = get_ipython() | |
494 | c = ip.Completer |
|
502 | c = ip.Completer | |
495 | c.use_jedi = False |
|
503 | c.use_jedi = False | |
496 | ip.ex('def myfunc(a=1,b=2): return a+b') |
|
504 | ip.ex('def myfunc(a=1,b=2): return a+b') | |
497 | s, matches = c.complete(None, 'myfunc(1,b') |
|
505 | s, matches = c.complete(None, 'myfunc(1,b') | |
498 | nt.assert_in('b=', matches) |
|
506 | nt.assert_in('b=', matches) | |
499 | # Simulate completing with cursor right after b (pos==10): |
|
507 | # Simulate completing with cursor right after b (pos==10): | |
500 | s, matches = c.complete(None, 'myfunc(1,b)', 10) |
|
508 | s, matches = c.complete(None, 'myfunc(1,b)', 10) | |
501 | nt.assert_in('b=', matches) |
|
509 | nt.assert_in('b=', matches) | |
502 | s, matches = c.complete(None, 'myfunc(a="escaped\\")string",b') |
|
510 | s, matches = c.complete(None, 'myfunc(a="escaped\\")string",b') | |
503 | nt.assert_in('b=', matches) |
|
511 | nt.assert_in('b=', matches) | |
504 | #builtin function |
|
512 | #builtin function | |
505 | s, matches = c.complete(None, 'min(k, k') |
|
513 | s, matches = c.complete(None, 'min(k, k') | |
506 | nt.assert_in('key=', matches) |
|
514 | nt.assert_in('key=', matches) | |
507 |
|
515 | |||
508 |
|
516 | |||
509 | def test_default_arguments_from_docstring(): |
|
517 | def test_default_arguments_from_docstring(): | |
510 | ip = get_ipython() |
|
518 | ip = get_ipython() | |
511 | c = ip.Completer |
|
519 | c = ip.Completer | |
512 | kwd = c._default_arguments_from_docstring( |
|
520 | kwd = c._default_arguments_from_docstring( | |
513 | 'min(iterable[, key=func]) -> value') |
|
521 | 'min(iterable[, key=func]) -> value') | |
514 | nt.assert_equal(kwd, ['key']) |
|
522 | nt.assert_equal(kwd, ['key']) | |
515 | #with cython type etc |
|
523 | #with cython type etc | |
516 | kwd = c._default_arguments_from_docstring( |
|
524 | kwd = c._default_arguments_from_docstring( | |
517 | 'Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)\n') |
|
525 | 'Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)\n') | |
518 | nt.assert_equal(kwd, ['ncall', 'resume', 'nsplit']) |
|
526 | nt.assert_equal(kwd, ['ncall', 'resume', 'nsplit']) | |
519 | #white spaces |
|
527 | #white spaces | |
520 | kwd = c._default_arguments_from_docstring( |
|
528 | kwd = c._default_arguments_from_docstring( | |
521 | '\n Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)\n') |
|
529 | '\n Minuit.migrad(self, int ncall=10000, resume=True, int nsplit=1)\n') | |
522 | nt.assert_equal(kwd, ['ncall', 'resume', 'nsplit']) |
|
530 | nt.assert_equal(kwd, ['ncall', 'resume', 'nsplit']) | |
523 |
|
531 | |||
524 | def test_line_magics(): |
|
532 | def test_line_magics(): | |
525 | ip = get_ipython() |
|
533 | ip = get_ipython() | |
526 | c = ip.Completer |
|
534 | c = ip.Completer | |
527 | s, matches = c.complete(None, 'lsmag') |
|
535 | s, matches = c.complete(None, 'lsmag') | |
528 | nt.assert_in('%lsmagic', matches) |
|
536 | nt.assert_in('%lsmagic', matches) | |
529 | s, matches = c.complete(None, '%lsmag') |
|
537 | s, matches = c.complete(None, '%lsmag') | |
530 | nt.assert_in('%lsmagic', matches) |
|
538 | nt.assert_in('%lsmagic', matches) | |
531 |
|
539 | |||
532 |
|
540 | |||
533 | def test_cell_magics(): |
|
541 | def test_cell_magics(): | |
534 | from IPython.core.magic import register_cell_magic |
|
542 | from IPython.core.magic import register_cell_magic | |
535 |
|
543 | |||
536 | @register_cell_magic |
|
544 | @register_cell_magic | |
537 | def _foo_cellm(line, cell): |
|
545 | def _foo_cellm(line, cell): | |
538 | pass |
|
546 | pass | |
539 |
|
547 | |||
540 | ip = get_ipython() |
|
548 | ip = get_ipython() | |
541 | c = ip.Completer |
|
549 | c = ip.Completer | |
542 |
|
550 | |||
543 | s, matches = c.complete(None, '_foo_ce') |
|
551 | s, matches = c.complete(None, '_foo_ce') | |
544 | nt.assert_in('%%_foo_cellm', matches) |
|
552 | nt.assert_in('%%_foo_cellm', matches) | |
545 | s, matches = c.complete(None, '%%_foo_ce') |
|
553 | s, matches = c.complete(None, '%%_foo_ce') | |
546 | nt.assert_in('%%_foo_cellm', matches) |
|
554 | nt.assert_in('%%_foo_cellm', matches) | |
547 |
|
555 | |||
548 |
|
556 | |||
549 | def test_line_cell_magics(): |
|
557 | def test_line_cell_magics(): | |
550 | from IPython.core.magic import register_line_cell_magic |
|
558 | from IPython.core.magic import register_line_cell_magic | |
551 |
|
559 | |||
552 | @register_line_cell_magic |
|
560 | @register_line_cell_magic | |
553 | def _bar_cellm(line, cell): |
|
561 | def _bar_cellm(line, cell): | |
554 | pass |
|
562 | pass | |
555 |
|
563 | |||
556 | ip = get_ipython() |
|
564 | ip = get_ipython() | |
557 | c = ip.Completer |
|
565 | c = ip.Completer | |
558 |
|
566 | |||
559 | # The policy here is trickier, see comments in completion code. The |
|
567 | # The policy here is trickier, see comments in completion code. The | |
560 | # returned values depend on whether the user passes %% or not explicitly, |
|
568 | # returned values depend on whether the user passes %% or not explicitly, | |
561 | # and this will show a difference if the same name is both a line and cell |
|
569 | # and this will show a difference if the same name is both a line and cell | |
562 | # magic. |
|
570 | # magic. | |
563 | s, matches = c.complete(None, '_bar_ce') |
|
571 | s, matches = c.complete(None, '_bar_ce') | |
564 | nt.assert_in('%_bar_cellm', matches) |
|
572 | nt.assert_in('%_bar_cellm', matches) | |
565 | nt.assert_in('%%_bar_cellm', matches) |
|
573 | nt.assert_in('%%_bar_cellm', matches) | |
566 | s, matches = c.complete(None, '%_bar_ce') |
|
574 | s, matches = c.complete(None, '%_bar_ce') | |
567 | nt.assert_in('%_bar_cellm', matches) |
|
575 | nt.assert_in('%_bar_cellm', matches) | |
568 | nt.assert_in('%%_bar_cellm', matches) |
|
576 | nt.assert_in('%%_bar_cellm', matches) | |
569 | s, matches = c.complete(None, '%%_bar_ce') |
|
577 | s, matches = c.complete(None, '%%_bar_ce') | |
570 | nt.assert_not_in('%_bar_cellm', matches) |
|
578 | nt.assert_not_in('%_bar_cellm', matches) | |
571 | nt.assert_in('%%_bar_cellm', matches) |
|
579 | nt.assert_in('%%_bar_cellm', matches) | |
572 |
|
580 | |||
573 |
|
581 | |||
574 | def test_magic_completion_order(): |
|
582 | def test_magic_completion_order(): | |
575 | ip = get_ipython() |
|
583 | ip = get_ipython() | |
576 | c = ip.Completer |
|
584 | c = ip.Completer | |
577 |
|
585 | |||
578 | # Test ordering of line and cell magics. |
|
586 | # Test ordering of line and cell magics. | |
579 | text, matches = c.complete("timeit") |
|
587 | text, matches = c.complete("timeit") | |
580 | nt.assert_equal(matches, ["%timeit", "%%timeit"]) |
|
588 | nt.assert_equal(matches, ["%timeit", "%%timeit"]) | |
581 |
|
589 | |||
582 |
|
590 | |||
583 | def test_magic_completion_shadowing(): |
|
591 | def test_magic_completion_shadowing(): | |
584 | ip = get_ipython() |
|
592 | ip = get_ipython() | |
585 | c = ip.Completer |
|
593 | c = ip.Completer | |
586 | c.use_jedi = False |
|
594 | c.use_jedi = False | |
587 |
|
595 | |||
588 | # Before importing matplotlib, %matplotlib magic should be the only option. |
|
596 | # Before importing matplotlib, %matplotlib magic should be the only option. | |
589 | text, matches = c.complete("mat") |
|
597 | text, matches = c.complete("mat") | |
590 | nt.assert_equal(matches, ["%matplotlib"]) |
|
598 | nt.assert_equal(matches, ["%matplotlib"]) | |
591 |
|
599 | |||
592 | # The newly introduced name should shadow the magic. |
|
600 | # The newly introduced name should shadow the magic. | |
593 | ip.run_cell("matplotlib = 1") |
|
601 | ip.run_cell("matplotlib = 1") | |
594 | text, matches = c.complete("mat") |
|
602 | text, matches = c.complete("mat") | |
595 | nt.assert_equal(matches, ["matplotlib"]) |
|
603 | nt.assert_equal(matches, ["matplotlib"]) | |
596 |
|
604 | |||
597 | # After removing matplotlib from namespace, the magic should again be |
|
605 | # After removing matplotlib from namespace, the magic should again be | |
598 | # the only option. |
|
606 | # the only option. | |
599 | del ip.user_ns["matplotlib"] |
|
607 | del ip.user_ns["matplotlib"] | |
600 | text, matches = c.complete("mat") |
|
608 | text, matches = c.complete("mat") | |
601 | nt.assert_equal(matches, ["%matplotlib"]) |
|
609 | nt.assert_equal(matches, ["%matplotlib"]) | |
602 |
|
610 | |||
603 | def test_magic_completion_shadowing_explicit(): |
|
611 | def test_magic_completion_shadowing_explicit(): | |
604 | """ |
|
612 | """ | |
605 | If the user try to complete a shadowed magic, and explicit % start should |
|
613 | If the user try to complete a shadowed magic, and explicit % start should | |
606 | still return the completions. |
|
614 | still return the completions. | |
607 | """ |
|
615 | """ | |
608 | ip = get_ipython() |
|
616 | ip = get_ipython() | |
609 | c = ip.Completer |
|
617 | c = ip.Completer | |
610 |
|
618 | |||
611 | # Before importing matplotlib, %matplotlib magic should be the only option. |
|
619 | # Before importing matplotlib, %matplotlib magic should be the only option. | |
612 | text, matches = c.complete("%mat") |
|
620 | text, matches = c.complete("%mat") | |
613 | nt.assert_equal(matches, ["%matplotlib"]) |
|
621 | nt.assert_equal(matches, ["%matplotlib"]) | |
614 |
|
622 | |||
615 | ip.run_cell("matplotlib = 1") |
|
623 | ip.run_cell("matplotlib = 1") | |
616 |
|
624 | |||
617 | # After removing matplotlib from namespace, the magic should still be |
|
625 | # After removing matplotlib from namespace, the magic should still be | |
618 | # the only option. |
|
626 | # the only option. | |
619 | text, matches = c.complete("%mat") |
|
627 | text, matches = c.complete("%mat") | |
620 | nt.assert_equal(matches, ["%matplotlib"]) |
|
628 | nt.assert_equal(matches, ["%matplotlib"]) | |
621 |
|
629 | |||
622 | def test_magic_config(): |
|
630 | def test_magic_config(): | |
623 | ip = get_ipython() |
|
631 | ip = get_ipython() | |
624 | c = ip.Completer |
|
632 | c = ip.Completer | |
625 |
|
633 | |||
626 | s, matches = c.complete(None, 'conf') |
|
634 | s, matches = c.complete(None, 'conf') | |
627 | nt.assert_in('%config', matches) |
|
635 | nt.assert_in('%config', matches) | |
628 | s, matches = c.complete(None, 'conf') |
|
636 | s, matches = c.complete(None, 'conf') | |
629 | nt.assert_not_in('AliasManager', matches) |
|
637 | nt.assert_not_in('AliasManager', matches) | |
630 | s, matches = c.complete(None, 'config ') |
|
638 | s, matches = c.complete(None, 'config ') | |
631 | nt.assert_in('AliasManager', matches) |
|
639 | nt.assert_in('AliasManager', matches) | |
632 | s, matches = c.complete(None, '%config ') |
|
640 | s, matches = c.complete(None, '%config ') | |
633 | nt.assert_in('AliasManager', matches) |
|
641 | nt.assert_in('AliasManager', matches) | |
634 | s, matches = c.complete(None, 'config Ali') |
|
642 | s, matches = c.complete(None, 'config Ali') | |
635 | nt.assert_list_equal(['AliasManager'], matches) |
|
643 | nt.assert_list_equal(['AliasManager'], matches) | |
636 | s, matches = c.complete(None, '%config Ali') |
|
644 | s, matches = c.complete(None, '%config Ali') | |
637 | nt.assert_list_equal(['AliasManager'], matches) |
|
645 | nt.assert_list_equal(['AliasManager'], matches) | |
638 | s, matches = c.complete(None, 'config AliasManager') |
|
646 | s, matches = c.complete(None, 'config AliasManager') | |
639 | nt.assert_list_equal(['AliasManager'], matches) |
|
647 | nt.assert_list_equal(['AliasManager'], matches) | |
640 | s, matches = c.complete(None, '%config AliasManager') |
|
648 | s, matches = c.complete(None, '%config AliasManager') | |
641 | nt.assert_list_equal(['AliasManager'], matches) |
|
649 | nt.assert_list_equal(['AliasManager'], matches) | |
642 | s, matches = c.complete(None, 'config AliasManager.') |
|
650 | s, matches = c.complete(None, 'config AliasManager.') | |
643 | nt.assert_in('AliasManager.default_aliases', matches) |
|
651 | nt.assert_in('AliasManager.default_aliases', matches) | |
644 | s, matches = c.complete(None, '%config AliasManager.') |
|
652 | s, matches = c.complete(None, '%config AliasManager.') | |
645 | nt.assert_in('AliasManager.default_aliases', matches) |
|
653 | nt.assert_in('AliasManager.default_aliases', matches) | |
646 | s, matches = c.complete(None, 'config AliasManager.de') |
|
654 | s, matches = c.complete(None, 'config AliasManager.de') | |
647 | nt.assert_list_equal(['AliasManager.default_aliases'], matches) |
|
655 | nt.assert_list_equal(['AliasManager.default_aliases'], matches) | |
648 | s, matches = c.complete(None, 'config AliasManager.de') |
|
656 | s, matches = c.complete(None, 'config AliasManager.de') | |
649 | nt.assert_list_equal(['AliasManager.default_aliases'], matches) |
|
657 | nt.assert_list_equal(['AliasManager.default_aliases'], matches) | |
650 |
|
658 | |||
651 |
|
659 | |||
652 | def test_magic_color(): |
|
660 | def test_magic_color(): | |
653 | ip = get_ipython() |
|
661 | ip = get_ipython() | |
654 | c = ip.Completer |
|
662 | c = ip.Completer | |
655 |
|
663 | |||
656 | s, matches = c.complete(None, 'colo') |
|
664 | s, matches = c.complete(None, 'colo') | |
657 | nt.assert_in('%colors', matches) |
|
665 | nt.assert_in('%colors', matches) | |
658 | s, matches = c.complete(None, 'colo') |
|
666 | s, matches = c.complete(None, 'colo') | |
659 | nt.assert_not_in('NoColor', matches) |
|
667 | nt.assert_not_in('NoColor', matches) | |
660 | s, matches = c.complete(None, '%colors') # No trailing space |
|
668 | s, matches = c.complete(None, '%colors') # No trailing space | |
661 | nt.assert_not_in('NoColor', matches) |
|
669 | nt.assert_not_in('NoColor', matches) | |
662 | s, matches = c.complete(None, 'colors ') |
|
670 | s, matches = c.complete(None, 'colors ') | |
663 | nt.assert_in('NoColor', matches) |
|
671 | nt.assert_in('NoColor', matches) | |
664 | s, matches = c.complete(None, '%colors ') |
|
672 | s, matches = c.complete(None, '%colors ') | |
665 | nt.assert_in('NoColor', matches) |
|
673 | nt.assert_in('NoColor', matches) | |
666 | s, matches = c.complete(None, 'colors NoCo') |
|
674 | s, matches = c.complete(None, 'colors NoCo') | |
667 | nt.assert_list_equal(['NoColor'], matches) |
|
675 | nt.assert_list_equal(['NoColor'], matches) | |
668 | s, matches = c.complete(None, '%colors NoCo') |
|
676 | s, matches = c.complete(None, '%colors NoCo') | |
669 | nt.assert_list_equal(['NoColor'], matches) |
|
677 | nt.assert_list_equal(['NoColor'], matches) | |
670 |
|
678 | |||
671 |
|
679 | |||
672 | def test_match_dict_keys(): |
|
680 | def test_match_dict_keys(): | |
673 | """ |
|
681 | """ | |
674 | Test that match_dict_keys works on a couple of use case does return what |
|
682 | Test that match_dict_keys works on a couple of use case does return what | |
675 | expected, and does not crash |
|
683 | expected, and does not crash | |
676 | """ |
|
684 | """ | |
677 | delims = ' \t\n`!@#$^&*()=+[{]}\\|;:\'",<>?' |
|
685 | delims = ' \t\n`!@#$^&*()=+[{]}\\|;:\'",<>?' | |
678 |
|
686 | |||
679 |
|
687 | |||
680 | keys = ['foo', b'far'] |
|
688 | keys = ['foo', b'far'] | |
681 | assert match_dict_keys(keys, "b'", delims=delims) == ("'", 2 ,['far']) |
|
689 | assert match_dict_keys(keys, "b'", delims=delims) == ("'", 2 ,['far']) | |
682 | assert match_dict_keys(keys, "b'f", delims=delims) == ("'", 2 ,['far']) |
|
690 | assert match_dict_keys(keys, "b'f", delims=delims) == ("'", 2 ,['far']) | |
683 | assert match_dict_keys(keys, 'b"', delims=delims) == ('"', 2 ,['far']) |
|
691 | assert match_dict_keys(keys, 'b"', delims=delims) == ('"', 2 ,['far']) | |
684 | assert match_dict_keys(keys, 'b"f', delims=delims) == ('"', 2 ,['far']) |
|
692 | assert match_dict_keys(keys, 'b"f', delims=delims) == ('"', 2 ,['far']) | |
685 |
|
693 | |||
686 | assert match_dict_keys(keys, "'", delims=delims) == ("'", 1 ,['foo']) |
|
694 | assert match_dict_keys(keys, "'", delims=delims) == ("'", 1 ,['foo']) | |
687 | assert match_dict_keys(keys, "'f", delims=delims) == ("'", 1 ,['foo']) |
|
695 | assert match_dict_keys(keys, "'f", delims=delims) == ("'", 1 ,['foo']) | |
688 | assert match_dict_keys(keys, '"', delims=delims) == ('"', 1 ,['foo']) |
|
696 | assert match_dict_keys(keys, '"', delims=delims) == ('"', 1 ,['foo']) | |
689 | assert match_dict_keys(keys, '"f', delims=delims) == ('"', 1 ,['foo']) |
|
697 | assert match_dict_keys(keys, '"f', delims=delims) == ('"', 1 ,['foo']) | |
690 |
|
698 | |||
691 | match_dict_keys |
|
699 | match_dict_keys | |
692 |
|
700 | |||
693 |
|
701 | |||
694 | def test_dict_key_completion_string(): |
|
702 | def test_dict_key_completion_string(): | |
695 | """Test dictionary key completion for string keys""" |
|
703 | """Test dictionary key completion for string keys""" | |
696 | ip = get_ipython() |
|
704 | ip = get_ipython() | |
697 | complete = ip.Completer.complete |
|
705 | complete = ip.Completer.complete | |
698 |
|
706 | |||
699 | ip.user_ns['d'] = {'abc': None} |
|
707 | ip.user_ns['d'] = {'abc': None} | |
700 |
|
708 | |||
701 | # check completion at different stages |
|
709 | # check completion at different stages | |
702 | _, matches = complete(line_buffer="d[") |
|
710 | _, matches = complete(line_buffer="d[") | |
703 | nt.assert_in("'abc'", matches) |
|
711 | nt.assert_in("'abc'", matches) | |
704 | nt.assert_not_in("'abc']", matches) |
|
712 | nt.assert_not_in("'abc']", matches) | |
705 |
|
713 | |||
706 | _, matches = complete(line_buffer="d['") |
|
714 | _, matches = complete(line_buffer="d['") | |
707 | nt.assert_in("abc", matches) |
|
715 | nt.assert_in("abc", matches) | |
708 | nt.assert_not_in("abc']", matches) |
|
716 | nt.assert_not_in("abc']", matches) | |
709 |
|
717 | |||
710 | _, matches = complete(line_buffer="d['a") |
|
718 | _, matches = complete(line_buffer="d['a") | |
711 | nt.assert_in("abc", matches) |
|
719 | nt.assert_in("abc", matches) | |
712 | nt.assert_not_in("abc']", matches) |
|
720 | nt.assert_not_in("abc']", matches) | |
713 |
|
721 | |||
714 | # check use of different quoting |
|
722 | # check use of different quoting | |
715 | _, matches = complete(line_buffer="d[\"") |
|
723 | _, matches = complete(line_buffer="d[\"") | |
716 | nt.assert_in("abc", matches) |
|
724 | nt.assert_in("abc", matches) | |
717 | nt.assert_not_in('abc\"]', matches) |
|
725 | nt.assert_not_in('abc\"]', matches) | |
718 |
|
726 | |||
719 | _, matches = complete(line_buffer="d[\"a") |
|
727 | _, matches = complete(line_buffer="d[\"a") | |
720 | nt.assert_in("abc", matches) |
|
728 | nt.assert_in("abc", matches) | |
721 | nt.assert_not_in('abc\"]', matches) |
|
729 | nt.assert_not_in('abc\"]', matches) | |
722 |
|
730 | |||
723 | # check sensitivity to following context |
|
731 | # check sensitivity to following context | |
724 | _, matches = complete(line_buffer="d[]", cursor_pos=2) |
|
732 | _, matches = complete(line_buffer="d[]", cursor_pos=2) | |
725 | nt.assert_in("'abc'", matches) |
|
733 | nt.assert_in("'abc'", matches) | |
726 |
|
734 | |||
727 | _, matches = complete(line_buffer="d['']", cursor_pos=3) |
|
735 | _, matches = complete(line_buffer="d['']", cursor_pos=3) | |
728 | nt.assert_in("abc", matches) |
|
736 | nt.assert_in("abc", matches) | |
729 | nt.assert_not_in("abc'", matches) |
|
737 | nt.assert_not_in("abc'", matches) | |
730 | nt.assert_not_in("abc']", matches) |
|
738 | nt.assert_not_in("abc']", matches) | |
731 |
|
739 | |||
732 | # check multiple solutions are correctly returned and that noise is not |
|
740 | # check multiple solutions are correctly returned and that noise is not | |
733 | ip.user_ns['d'] = {'abc': None, 'abd': None, 'bad': None, object(): None, |
|
741 | ip.user_ns['d'] = {'abc': None, 'abd': None, 'bad': None, object(): None, | |
734 | 5: None} |
|
742 | 5: None} | |
735 |
|
743 | |||
736 | _, matches = complete(line_buffer="d['a") |
|
744 | _, matches = complete(line_buffer="d['a") | |
737 | nt.assert_in("abc", matches) |
|
745 | nt.assert_in("abc", matches) | |
738 | nt.assert_in("abd", matches) |
|
746 | nt.assert_in("abd", matches) | |
739 | nt.assert_not_in("bad", matches) |
|
747 | nt.assert_not_in("bad", matches) | |
740 | assert not any(m.endswith((']', '"', "'")) for m in matches), matches |
|
748 | assert not any(m.endswith((']', '"', "'")) for m in matches), matches | |
741 |
|
749 | |||
742 | # check escaping and whitespace |
|
750 | # check escaping and whitespace | |
743 | ip.user_ns['d'] = {'a\nb': None, 'a\'b': None, 'a"b': None, 'a word': None} |
|
751 | ip.user_ns['d'] = {'a\nb': None, 'a\'b': None, 'a"b': None, 'a word': None} | |
744 | _, matches = complete(line_buffer="d['a") |
|
752 | _, matches = complete(line_buffer="d['a") | |
745 | nt.assert_in("a\\nb", matches) |
|
753 | nt.assert_in("a\\nb", matches) | |
746 | nt.assert_in("a\\'b", matches) |
|
754 | nt.assert_in("a\\'b", matches) | |
747 | nt.assert_in("a\"b", matches) |
|
755 | nt.assert_in("a\"b", matches) | |
748 | nt.assert_in("a word", matches) |
|
756 | nt.assert_in("a word", matches) | |
749 | assert not any(m.endswith((']', '"', "'")) for m in matches), matches |
|
757 | assert not any(m.endswith((']', '"', "'")) for m in matches), matches | |
750 |
|
758 | |||
751 | # - can complete on non-initial word of the string |
|
759 | # - can complete on non-initial word of the string | |
752 | _, matches = complete(line_buffer="d['a w") |
|
760 | _, matches = complete(line_buffer="d['a w") | |
753 | nt.assert_in("word", matches) |
|
761 | nt.assert_in("word", matches) | |
754 |
|
762 | |||
755 | # - understands quote escaping |
|
763 | # - understands quote escaping | |
756 | _, matches = complete(line_buffer="d['a\\'") |
|
764 | _, matches = complete(line_buffer="d['a\\'") | |
757 | nt.assert_in("b", matches) |
|
765 | nt.assert_in("b", matches) | |
758 |
|
766 | |||
759 | # - default quoting should work like repr |
|
767 | # - default quoting should work like repr | |
760 | _, matches = complete(line_buffer="d[") |
|
768 | _, matches = complete(line_buffer="d[") | |
761 | nt.assert_in("\"a'b\"", matches) |
|
769 | nt.assert_in("\"a'b\"", matches) | |
762 |
|
770 | |||
763 | # - when opening quote with ", possible to match with unescaped apostrophe |
|
771 | # - when opening quote with ", possible to match with unescaped apostrophe | |
764 | _, matches = complete(line_buffer="d[\"a'") |
|
772 | _, matches = complete(line_buffer="d[\"a'") | |
765 | nt.assert_in("b", matches) |
|
773 | nt.assert_in("b", matches) | |
766 |
|
774 | |||
767 | # need to not split at delims that readline won't split at |
|
775 | # need to not split at delims that readline won't split at | |
768 | if '-' not in ip.Completer.splitter.delims: |
|
776 | if '-' not in ip.Completer.splitter.delims: | |
769 | ip.user_ns['d'] = {'before-after': None} |
|
777 | ip.user_ns['d'] = {'before-after': None} | |
770 | _, matches = complete(line_buffer="d['before-af") |
|
778 | _, matches = complete(line_buffer="d['before-af") | |
771 | nt.assert_in('before-after', matches) |
|
779 | nt.assert_in('before-after', matches) | |
772 |
|
780 | |||
773 | def test_dict_key_completion_contexts(): |
|
781 | def test_dict_key_completion_contexts(): | |
774 | """Test expression contexts in which dict key completion occurs""" |
|
782 | """Test expression contexts in which dict key completion occurs""" | |
775 | ip = get_ipython() |
|
783 | ip = get_ipython() | |
776 | complete = ip.Completer.complete |
|
784 | complete = ip.Completer.complete | |
777 | d = {'abc': None} |
|
785 | d = {'abc': None} | |
778 | ip.user_ns['d'] = d |
|
786 | ip.user_ns['d'] = d | |
779 |
|
787 | |||
780 | class C: |
|
788 | class C: | |
781 | data = d |
|
789 | data = d | |
782 | ip.user_ns['C'] = C |
|
790 | ip.user_ns['C'] = C | |
783 | ip.user_ns['get'] = lambda: d |
|
791 | ip.user_ns['get'] = lambda: d | |
784 |
|
792 | |||
785 | def assert_no_completion(**kwargs): |
|
793 | def assert_no_completion(**kwargs): | |
786 | _, matches = complete(**kwargs) |
|
794 | _, matches = complete(**kwargs) | |
787 | nt.assert_not_in('abc', matches) |
|
795 | nt.assert_not_in('abc', matches) | |
788 | nt.assert_not_in('abc\'', matches) |
|
796 | nt.assert_not_in('abc\'', matches) | |
789 | nt.assert_not_in('abc\']', matches) |
|
797 | nt.assert_not_in('abc\']', matches) | |
790 | nt.assert_not_in('\'abc\'', matches) |
|
798 | nt.assert_not_in('\'abc\'', matches) | |
791 | nt.assert_not_in('\'abc\']', matches) |
|
799 | nt.assert_not_in('\'abc\']', matches) | |
792 |
|
800 | |||
793 | def assert_completion(**kwargs): |
|
801 | def assert_completion(**kwargs): | |
794 | _, matches = complete(**kwargs) |
|
802 | _, matches = complete(**kwargs) | |
795 | nt.assert_in("'abc'", matches) |
|
803 | nt.assert_in("'abc'", matches) | |
796 | nt.assert_not_in("'abc']", matches) |
|
804 | nt.assert_not_in("'abc']", matches) | |
797 |
|
805 | |||
798 | # no completion after string closed, even if reopened |
|
806 | # no completion after string closed, even if reopened | |
799 | assert_no_completion(line_buffer="d['a'") |
|
807 | assert_no_completion(line_buffer="d['a'") | |
800 | assert_no_completion(line_buffer="d[\"a\"") |
|
808 | assert_no_completion(line_buffer="d[\"a\"") | |
801 | assert_no_completion(line_buffer="d['a' + ") |
|
809 | assert_no_completion(line_buffer="d['a' + ") | |
802 | assert_no_completion(line_buffer="d['a' + '") |
|
810 | assert_no_completion(line_buffer="d['a' + '") | |
803 |
|
811 | |||
804 | # completion in non-trivial expressions |
|
812 | # completion in non-trivial expressions | |
805 | assert_completion(line_buffer="+ d[") |
|
813 | assert_completion(line_buffer="+ d[") | |
806 | assert_completion(line_buffer="(d[") |
|
814 | assert_completion(line_buffer="(d[") | |
807 | assert_completion(line_buffer="C.data[") |
|
815 | assert_completion(line_buffer="C.data[") | |
808 |
|
816 | |||
809 | # greedy flag |
|
817 | # greedy flag | |
810 | def assert_completion(**kwargs): |
|
818 | def assert_completion(**kwargs): | |
811 | _, matches = complete(**kwargs) |
|
819 | _, matches = complete(**kwargs) | |
812 | nt.assert_in("get()['abc']", matches) |
|
820 | nt.assert_in("get()['abc']", matches) | |
813 |
|
821 | |||
814 | assert_no_completion(line_buffer="get()[") |
|
822 | assert_no_completion(line_buffer="get()[") | |
815 | with greedy_completion(): |
|
823 | with greedy_completion(): | |
816 | assert_completion(line_buffer="get()[") |
|
824 | assert_completion(line_buffer="get()[") | |
817 | assert_completion(line_buffer="get()['") |
|
825 | assert_completion(line_buffer="get()['") | |
818 | assert_completion(line_buffer="get()['a") |
|
826 | assert_completion(line_buffer="get()['a") | |
819 | assert_completion(line_buffer="get()['ab") |
|
827 | assert_completion(line_buffer="get()['ab") | |
820 | assert_completion(line_buffer="get()['abc") |
|
828 | assert_completion(line_buffer="get()['abc") | |
821 |
|
829 | |||
822 |
|
830 | |||
823 |
|
831 | |||
824 | def test_dict_key_completion_bytes(): |
|
832 | def test_dict_key_completion_bytes(): | |
825 | """Test handling of bytes in dict key completion""" |
|
833 | """Test handling of bytes in dict key completion""" | |
826 | ip = get_ipython() |
|
834 | ip = get_ipython() | |
827 | complete = ip.Completer.complete |
|
835 | complete = ip.Completer.complete | |
828 |
|
836 | |||
829 | ip.user_ns['d'] = {'abc': None, b'abd': None} |
|
837 | ip.user_ns['d'] = {'abc': None, b'abd': None} | |
830 |
|
838 | |||
831 | _, matches = complete(line_buffer="d[") |
|
839 | _, matches = complete(line_buffer="d[") | |
832 | nt.assert_in("'abc'", matches) |
|
840 | nt.assert_in("'abc'", matches) | |
833 | nt.assert_in("b'abd'", matches) |
|
841 | nt.assert_in("b'abd'", matches) | |
834 |
|
842 | |||
835 | if False: # not currently implemented |
|
843 | if False: # not currently implemented | |
836 | _, matches = complete(line_buffer="d[b") |
|
844 | _, matches = complete(line_buffer="d[b") | |
837 | nt.assert_in("b'abd'", matches) |
|
845 | nt.assert_in("b'abd'", matches) | |
838 | nt.assert_not_in("b'abc'", matches) |
|
846 | nt.assert_not_in("b'abc'", matches) | |
839 |
|
847 | |||
840 | _, matches = complete(line_buffer="d[b'") |
|
848 | _, matches = complete(line_buffer="d[b'") | |
841 | nt.assert_in("abd", matches) |
|
849 | nt.assert_in("abd", matches) | |
842 | nt.assert_not_in("abc", matches) |
|
850 | nt.assert_not_in("abc", matches) | |
843 |
|
851 | |||
844 | _, matches = complete(line_buffer="d[B'") |
|
852 | _, matches = complete(line_buffer="d[B'") | |
845 | nt.assert_in("abd", matches) |
|
853 | nt.assert_in("abd", matches) | |
846 | nt.assert_not_in("abc", matches) |
|
854 | nt.assert_not_in("abc", matches) | |
847 |
|
855 | |||
848 | _, matches = complete(line_buffer="d['") |
|
856 | _, matches = complete(line_buffer="d['") | |
849 | nt.assert_in("abc", matches) |
|
857 | nt.assert_in("abc", matches) | |
850 | nt.assert_not_in("abd", matches) |
|
858 | nt.assert_not_in("abd", matches) | |
851 |
|
859 | |||
852 |
|
860 | |||
853 | def test_dict_key_completion_unicode_py3(): |
|
861 | def test_dict_key_completion_unicode_py3(): | |
854 | """Test handling of unicode in dict key completion""" |
|
862 | """Test handling of unicode in dict key completion""" | |
855 | ip = get_ipython() |
|
863 | ip = get_ipython() | |
856 | complete = ip.Completer.complete |
|
864 | complete = ip.Completer.complete | |
857 |
|
865 | |||
858 | ip.user_ns['d'] = {u'a\u05d0': None} |
|
866 | ip.user_ns['d'] = {u'a\u05d0': None} | |
859 |
|
867 | |||
860 | # query using escape |
|
868 | # query using escape | |
861 | if sys.platform != 'win32': |
|
869 | if sys.platform != 'win32': | |
862 | # Known failure on Windows |
|
870 | # Known failure on Windows | |
863 | _, matches = complete(line_buffer="d['a\\u05d0") |
|
871 | _, matches = complete(line_buffer="d['a\\u05d0") | |
864 | nt.assert_in("u05d0", matches) # tokenized after \\ |
|
872 | nt.assert_in("u05d0", matches) # tokenized after \\ | |
865 |
|
873 | |||
866 | # query using character |
|
874 | # query using character | |
867 | _, matches = complete(line_buffer="d['a\u05d0") |
|
875 | _, matches = complete(line_buffer="d['a\u05d0") | |
868 | nt.assert_in(u"a\u05d0", matches) |
|
876 | nt.assert_in(u"a\u05d0", matches) | |
869 |
|
877 | |||
870 | with greedy_completion(): |
|
878 | with greedy_completion(): | |
871 | # query using escape |
|
879 | # query using escape | |
872 | _, matches = complete(line_buffer="d['a\\u05d0") |
|
880 | _, matches = complete(line_buffer="d['a\\u05d0") | |
873 | nt.assert_in("d['a\\u05d0']", matches) # tokenized after \\ |
|
881 | nt.assert_in("d['a\\u05d0']", matches) # tokenized after \\ | |
874 |
|
882 | |||
875 | # query using character |
|
883 | # query using character | |
876 | _, matches = complete(line_buffer="d['a\u05d0") |
|
884 | _, matches = complete(line_buffer="d['a\u05d0") | |
877 | nt.assert_in(u"d['a\u05d0']", matches) |
|
885 | nt.assert_in(u"d['a\u05d0']", matches) | |
878 |
|
886 | |||
879 |
|
887 | |||
880 |
|
888 | |||
881 | @dec.skip_without('numpy') |
|
889 | @dec.skip_without('numpy') | |
882 | def test_struct_array_key_completion(): |
|
890 | def test_struct_array_key_completion(): | |
883 | """Test dict key completion applies to numpy struct arrays""" |
|
891 | """Test dict key completion applies to numpy struct arrays""" | |
884 | import numpy |
|
892 | import numpy | |
885 | ip = get_ipython() |
|
893 | ip = get_ipython() | |
886 | complete = ip.Completer.complete |
|
894 | complete = ip.Completer.complete | |
887 | ip.user_ns['d'] = numpy.array([], dtype=[('hello', 'f'), ('world', 'f')]) |
|
895 | ip.user_ns['d'] = numpy.array([], dtype=[('hello', 'f'), ('world', 'f')]) | |
888 | _, matches = complete(line_buffer="d['") |
|
896 | _, matches = complete(line_buffer="d['") | |
889 | nt.assert_in("hello", matches) |
|
897 | nt.assert_in("hello", matches) | |
890 | nt.assert_in("world", matches) |
|
898 | nt.assert_in("world", matches) | |
891 | # complete on the numpy struct itself |
|
899 | # complete on the numpy struct itself | |
892 | dt = numpy.dtype([('my_head', [('my_dt', '>u4'), ('my_df', '>u4')]), |
|
900 | dt = numpy.dtype([('my_head', [('my_dt', '>u4'), ('my_df', '>u4')]), | |
893 | ('my_data', '>f4', 5)]) |
|
901 | ('my_data', '>f4', 5)]) | |
894 | x = numpy.zeros(2, dtype=dt) |
|
902 | x = numpy.zeros(2, dtype=dt) | |
895 | ip.user_ns['d'] = x[1] |
|
903 | ip.user_ns['d'] = x[1] | |
896 | _, matches = complete(line_buffer="d['") |
|
904 | _, matches = complete(line_buffer="d['") | |
897 | nt.assert_in("my_head", matches) |
|
905 | nt.assert_in("my_head", matches) | |
898 | nt.assert_in("my_data", matches) |
|
906 | nt.assert_in("my_data", matches) | |
899 | # complete on a nested level |
|
907 | # complete on a nested level | |
900 | with greedy_completion(): |
|
908 | with greedy_completion(): | |
901 | ip.user_ns['d'] = numpy.zeros(2, dtype=dt) |
|
909 | ip.user_ns['d'] = numpy.zeros(2, dtype=dt) | |
902 | _, matches = complete(line_buffer="d[1]['my_head']['") |
|
910 | _, matches = complete(line_buffer="d[1]['my_head']['") | |
903 | nt.assert_true(any(["my_dt" in m for m in matches])) |
|
911 | nt.assert_true(any(["my_dt" in m for m in matches])) | |
904 | nt.assert_true(any(["my_df" in m for m in matches])) |
|
912 | nt.assert_true(any(["my_df" in m for m in matches])) | |
905 |
|
913 | |||
906 |
|
914 | |||
907 | @dec.skip_without('pandas') |
|
915 | @dec.skip_without('pandas') | |
908 | def test_dataframe_key_completion(): |
|
916 | def test_dataframe_key_completion(): | |
909 | """Test dict key completion applies to pandas DataFrames""" |
|
917 | """Test dict key completion applies to pandas DataFrames""" | |
910 | import pandas |
|
918 | import pandas | |
911 | ip = get_ipython() |
|
919 | ip = get_ipython() | |
912 | complete = ip.Completer.complete |
|
920 | complete = ip.Completer.complete | |
913 | ip.user_ns['d'] = pandas.DataFrame({'hello': [1], 'world': [2]}) |
|
921 | ip.user_ns['d'] = pandas.DataFrame({'hello': [1], 'world': [2]}) | |
914 | _, matches = complete(line_buffer="d['") |
|
922 | _, matches = complete(line_buffer="d['") | |
915 | nt.assert_in("hello", matches) |
|
923 | nt.assert_in("hello", matches) | |
916 | nt.assert_in("world", matches) |
|
924 | nt.assert_in("world", matches) | |
917 |
|
925 | |||
918 |
|
926 | |||
919 | def test_dict_key_completion_invalids(): |
|
927 | def test_dict_key_completion_invalids(): | |
920 | """Smoke test cases dict key completion can't handle""" |
|
928 | """Smoke test cases dict key completion can't handle""" | |
921 | ip = get_ipython() |
|
929 | ip = get_ipython() | |
922 | complete = ip.Completer.complete |
|
930 | complete = ip.Completer.complete | |
923 |
|
931 | |||
924 | ip.user_ns['no_getitem'] = None |
|
932 | ip.user_ns['no_getitem'] = None | |
925 | ip.user_ns['no_keys'] = [] |
|
933 | ip.user_ns['no_keys'] = [] | |
926 | ip.user_ns['cant_call_keys'] = dict |
|
934 | ip.user_ns['cant_call_keys'] = dict | |
927 | ip.user_ns['empty'] = {} |
|
935 | ip.user_ns['empty'] = {} | |
928 | ip.user_ns['d'] = {'abc': 5} |
|
936 | ip.user_ns['d'] = {'abc': 5} | |
929 |
|
937 | |||
930 | _, matches = complete(line_buffer="no_getitem['") |
|
938 | _, matches = complete(line_buffer="no_getitem['") | |
931 | _, matches = complete(line_buffer="no_keys['") |
|
939 | _, matches = complete(line_buffer="no_keys['") | |
932 | _, matches = complete(line_buffer="cant_call_keys['") |
|
940 | _, matches = complete(line_buffer="cant_call_keys['") | |
933 | _, matches = complete(line_buffer="empty['") |
|
941 | _, matches = complete(line_buffer="empty['") | |
934 | _, matches = complete(line_buffer="name_error['") |
|
942 | _, matches = complete(line_buffer="name_error['") | |
935 | _, matches = complete(line_buffer="d['\\") # incomplete escape |
|
943 | _, matches = complete(line_buffer="d['\\") # incomplete escape | |
936 |
|
944 | |||
937 | class KeyCompletable(object): |
|
945 | class KeyCompletable(object): | |
938 | def __init__(self, things=()): |
|
946 | def __init__(self, things=()): | |
939 | self.things = things |
|
947 | self.things = things | |
940 |
|
948 | |||
941 | def _ipython_key_completions_(self): |
|
949 | def _ipython_key_completions_(self): | |
942 | return list(self.things) |
|
950 | return list(self.things) | |
943 |
|
951 | |||
944 | def test_object_key_completion(): |
|
952 | def test_object_key_completion(): | |
945 | ip = get_ipython() |
|
953 | ip = get_ipython() | |
946 | ip.user_ns['key_completable'] = KeyCompletable(['qwerty', 'qwick']) |
|
954 | ip.user_ns['key_completable'] = KeyCompletable(['qwerty', 'qwick']) | |
947 |
|
955 | |||
948 | _, matches = ip.Completer.complete(line_buffer="key_completable['qw") |
|
956 | _, matches = ip.Completer.complete(line_buffer="key_completable['qw") | |
949 | nt.assert_in('qwerty', matches) |
|
957 | nt.assert_in('qwerty', matches) | |
950 | nt.assert_in('qwick', matches) |
|
958 | nt.assert_in('qwick', matches) | |
951 |
|
959 | |||
952 |
|
960 | |||
953 | class NamedInstanceMetaclass(type): |
|
961 | class NamedInstanceMetaclass(type): | |
954 | def __getitem__(cls, item): |
|
962 | def __getitem__(cls, item): | |
955 | return cls.get_instance(item) |
|
963 | return cls.get_instance(item) | |
956 |
|
964 | |||
957 | class NamedInstanceClass(object, metaclass=NamedInstanceMetaclass): |
|
965 | class NamedInstanceClass(object, metaclass=NamedInstanceMetaclass): | |
958 | def __init__(self, name): |
|
966 | def __init__(self, name): | |
959 | if not hasattr(self.__class__, 'instances'): |
|
967 | if not hasattr(self.__class__, 'instances'): | |
960 | self.__class__.instances = {} |
|
968 | self.__class__.instances = {} | |
961 | self.__class__.instances[name] = self |
|
969 | self.__class__.instances[name] = self | |
962 |
|
970 | |||
963 | @classmethod |
|
971 | @classmethod | |
964 | def _ipython_key_completions_(cls): |
|
972 | def _ipython_key_completions_(cls): | |
965 | return cls.instances.keys() |
|
973 | return cls.instances.keys() | |
966 |
|
974 | |||
967 | @classmethod |
|
975 | @classmethod | |
968 | def get_instance(cls, name): |
|
976 | def get_instance(cls, name): | |
969 | return cls.instances[name] |
|
977 | return cls.instances[name] | |
970 |
|
978 | |||
971 | def test_class_key_completion(): |
|
979 | def test_class_key_completion(): | |
972 | ip = get_ipython() |
|
980 | ip = get_ipython() | |
973 | NamedInstanceClass('qwerty') |
|
981 | NamedInstanceClass('qwerty') | |
974 | NamedInstanceClass('qwick') |
|
982 | NamedInstanceClass('qwick') | |
975 | ip.user_ns['named_instance_class'] = NamedInstanceClass |
|
983 | ip.user_ns['named_instance_class'] = NamedInstanceClass | |
976 |
|
984 | |||
977 | _, matches = ip.Completer.complete(line_buffer="named_instance_class['qw") |
|
985 | _, matches = ip.Completer.complete(line_buffer="named_instance_class['qw") | |
978 | nt.assert_in('qwerty', matches) |
|
986 | nt.assert_in('qwerty', matches) | |
979 | nt.assert_in('qwick', matches) |
|
987 | nt.assert_in('qwick', matches) | |
980 |
|
988 | |||
981 | def test_tryimport(): |
|
989 | def test_tryimport(): | |
982 | """ |
|
990 | """ | |
983 | Test that try-import don't crash on trailing dot, and import modules before |
|
991 | Test that try-import don't crash on trailing dot, and import modules before | |
984 | """ |
|
992 | """ | |
985 | from IPython.core.completerlib import try_import |
|
993 | from IPython.core.completerlib import try_import | |
986 | assert(try_import("IPython.")) |
|
994 | assert(try_import("IPython.")) | |
987 |
|
995 | |||
988 |
|
996 | |||
989 | def test_aimport_module_completer(): |
|
997 | def test_aimport_module_completer(): | |
990 | ip = get_ipython() |
|
998 | ip = get_ipython() | |
991 | _, matches = ip.complete('i', '%aimport i') |
|
999 | _, matches = ip.complete('i', '%aimport i') | |
992 | nt.assert_in('io', matches) |
|
1000 | nt.assert_in('io', matches) | |
993 | nt.assert_not_in('int', matches) |
|
1001 | nt.assert_not_in('int', matches) | |
994 |
|
1002 | |||
995 | def test_nested_import_module_completer(): |
|
1003 | def test_nested_import_module_completer(): | |
996 | ip = get_ipython() |
|
1004 | ip = get_ipython() | |
997 | _, matches = ip.complete(None, 'import IPython.co', 17) |
|
1005 | _, matches = ip.complete(None, 'import IPython.co', 17) | |
998 | nt.assert_in('IPython.core', matches) |
|
1006 | nt.assert_in('IPython.core', matches) | |
999 | nt.assert_not_in('import IPython.core', matches) |
|
1007 | nt.assert_not_in('import IPython.core', matches) | |
1000 | nt.assert_not_in('IPython.display', matches) |
|
1008 | nt.assert_not_in('IPython.display', matches) | |
1001 |
|
1009 | |||
1002 | def test_import_module_completer(): |
|
1010 | def test_import_module_completer(): | |
1003 | ip = get_ipython() |
|
1011 | ip = get_ipython() | |
1004 | _, matches = ip.complete('i', 'import i') |
|
1012 | _, matches = ip.complete('i', 'import i') | |
1005 | nt.assert_in('io', matches) |
|
1013 | nt.assert_in('io', matches) | |
1006 | nt.assert_not_in('int', matches) |
|
1014 | nt.assert_not_in('int', matches) | |
1007 |
|
1015 | |||
1008 | def test_from_module_completer(): |
|
1016 | def test_from_module_completer(): | |
1009 | ip = get_ipython() |
|
1017 | ip = get_ipython() | |
1010 | _, matches = ip.complete('B', 'from io import B', 16) |
|
1018 | _, matches = ip.complete('B', 'from io import B', 16) | |
1011 | nt.assert_in('BytesIO', matches) |
|
1019 | nt.assert_in('BytesIO', matches) | |
1012 | nt.assert_not_in('BaseException', matches) |
|
1020 | nt.assert_not_in('BaseException', matches) | |
1013 |
|
1021 | |||
1014 | def test_snake_case_completion(): |
|
1022 | def test_snake_case_completion(): | |
1015 | ip = get_ipython() |
|
1023 | ip = get_ipython() | |
1016 | ip.Completer.use_jedi = False |
|
1024 | ip.Completer.use_jedi = False | |
1017 | ip.user_ns['some_three'] = 3 |
|
1025 | ip.user_ns['some_three'] = 3 | |
1018 | ip.user_ns['some_four'] = 4 |
|
1026 | ip.user_ns['some_four'] = 4 | |
1019 | _, matches = ip.complete("s_", "print(s_f") |
|
1027 | _, matches = ip.complete("s_", "print(s_f") | |
1020 | nt.assert_in('some_three', matches) |
|
1028 | nt.assert_in('some_three', matches) | |
1021 | nt.assert_in('some_four', matches) |
|
1029 | nt.assert_in('some_four', matches) |
@@ -1,330 +1,342 | |||||
1 | ============ |
|
1 | ============ | |
2 | 6.x Series |
|
2 | 6.x Series | |
3 | ============ |
|
3 | ============ | |
4 |
|
4 | |||
5 |
|
5 | |||
|
6 | .. _whatsnew631: | |||
|
7 | ||||
|
8 | IPython 6.3.1 | |||
|
9 | ============= | |||
|
10 | ||||
|
11 | This is a bugfix release to switch the default completions back to IPython's | |||
|
12 | own completion machinery. We discovered some problems with the completions | |||
|
13 | from Jedi, including completing column names on pandas data frames. | |||
|
14 | ||||
|
15 | You can switch the completions source with the config option | |||
|
16 | :configtrait:`Completer.use_jedi`. | |||
|
17 | ||||
6 | .. _whatsnew630: |
|
18 | .. _whatsnew630: | |
7 |
|
19 | |||
8 | IPython 6.3 |
|
20 | IPython 6.3 | |
9 | =========== |
|
21 | =========== | |
10 |
|
22 | |||
11 | IPython 6.3 contains all the bug fixes and features in |
|
23 | IPython 6.3 contains all the bug fixes and features in | |
12 | :ref:`IPython 5.6 <whatsnew560>`. In addition: |
|
24 | :ref:`IPython 5.6 <whatsnew560>`. In addition: | |
13 |
|
25 | |||
14 | * A new display class :class:`IPython.display.Code` can be used to display |
|
26 | * A new display class :class:`IPython.display.Code` can be used to display | |
15 | syntax highlighted code in a notebook (:ghpull:`10978`). |
|
27 | syntax highlighted code in a notebook (:ghpull:`10978`). | |
16 | * The :cellmagic:`html` magic now takes a ``--isolated`` option to put the |
|
28 | * The :cellmagic:`html` magic now takes a ``--isolated`` option to put the | |
17 | content in an iframe (:ghpull:`10962`). |
|
29 | content in an iframe (:ghpull:`10962`). | |
18 | * The code to find completions using the Jedi library has had various |
|
30 | * The code to find completions using the Jedi library has had various | |
19 | adjustments. This is still a work in progress, but we hope this version has |
|
31 | adjustments. This is still a work in progress, but we hope this version has | |
20 | fewer annoyances (:ghpull:`10956`, :ghpull:`10969`, :ghpull:`10999`, |
|
32 | fewer annoyances (:ghpull:`10956`, :ghpull:`10969`, :ghpull:`10999`, | |
21 | :ghpull:`11035`, :ghpull:`11063`, :ghpull:`11065`). |
|
33 | :ghpull:`11035`, :ghpull:`11063`, :ghpull:`11065`). | |
22 | * The *post* event callbacks are now always called, even when the execution failed |
|
34 | * The *post* event callbacks are now always called, even when the execution failed | |
23 | (for example because of a ``SyntaxError``). |
|
35 | (for example because of a ``SyntaxError``). | |
24 | * The execution info and result objects are now made available in the |
|
36 | * The execution info and result objects are now made available in the | |
25 | corresponding *pre* or *post* ``*_run_cell`` :doc:`event callbacks </config/callbacks>` |
|
37 | corresponding *pre* or *post* ``*_run_cell`` :doc:`event callbacks </config/callbacks>` | |
26 | in a backward compatible manner (:ghissue:`10774` and :ghpull:`10795`). |
|
38 | in a backward compatible manner (:ghissue:`10774` and :ghpull:`10795`). | |
27 | * Performance with very long code cells (hundreds of lines) is greatly improved |
|
39 | * Performance with very long code cells (hundreds of lines) is greatly improved | |
28 | (:ghpull:`10898`). Further improvements are planned for IPython 7. |
|
40 | (:ghpull:`10898`). Further improvements are planned for IPython 7. | |
29 |
|
41 | |||
30 | You can see all `pull requests for the 6.3 milestone |
|
42 | You can see all `pull requests for the 6.3 milestone | |
31 | <https://github.com/ipython/ipython/pulls?utf8=%E2%9C%93&q=is%3Apr+milestone%3A6.3+is%3Aclosed>`__. |
|
43 | <https://github.com/ipython/ipython/pulls?utf8=%E2%9C%93&q=is%3Apr+milestone%3A6.3+is%3Aclosed>`__. | |
32 |
|
44 | |||
33 | .. _whatsnew620: |
|
45 | .. _whatsnew620: | |
34 |
|
46 | |||
35 | IPython 6.2 |
|
47 | IPython 6.2 | |
36 | =========== |
|
48 | =========== | |
37 |
|
49 | |||
38 | IPython 6.2 contains all the bugs fixes and features :ref:`available in IPython 5.5 <whatsnew550>`, |
|
50 | IPython 6.2 contains all the bugs fixes and features :ref:`available in IPython 5.5 <whatsnew550>`, | |
39 | like built in progress bar support, and system-wide configuration |
|
51 | like built in progress bar support, and system-wide configuration | |
40 |
|
52 | |||
41 | The following features are specific to IPython 6.2: |
|
53 | The following features are specific to IPython 6.2: | |
42 |
|
54 | |||
43 | Function signature in completions |
|
55 | Function signature in completions | |
44 | --------------------------------- |
|
56 | --------------------------------- | |
45 |
|
57 | |||
46 | Terminal IPython will now show the signature of the function while completing. |
|
58 | Terminal IPython will now show the signature of the function while completing. | |
47 | Only the currently highlighted function will show its signature on the line |
|
59 | Only the currently highlighted function will show its signature on the line | |
48 | below the completer by default. This functionality is recent, so it might be |
|
60 | below the completer by default. This functionality is recent, so it might be | |
49 | limited; we welcome bug reports and requests for enhancements. :ghpull:`10507` |
|
61 | limited; we welcome bug reports and requests for enhancements. :ghpull:`10507` | |
50 |
|
62 | |||
51 | Assignments return values |
|
63 | Assignments return values | |
52 | ------------------------- |
|
64 | ------------------------- | |
53 |
|
65 | |||
54 | IPython can now trigger the display hook on the last assignment of cells. |
|
66 | IPython can now trigger the display hook on the last assignment of cells. | |
55 | Up until 6.2 the following code wouldn't show the value of the assigned |
|
67 | Up until 6.2 the following code wouldn't show the value of the assigned | |
56 | variable:: |
|
68 | variable:: | |
57 |
|
69 | |||
58 | In[1]: xyz = "something" |
|
70 | In[1]: xyz = "something" | |
59 | # nothing shown |
|
71 | # nothing shown | |
60 |
|
72 | |||
61 | You would have to actually make it the last statement:: |
|
73 | You would have to actually make it the last statement:: | |
62 |
|
74 | |||
63 | In [2]: xyz = "something else" |
|
75 | In [2]: xyz = "something else" | |
64 | ... : xyz |
|
76 | ... : xyz | |
65 | Out[2]: "something else" |
|
77 | Out[2]: "something else" | |
66 |
|
78 | |||
67 | With the option ``InteractiveShell.ast_node_interactivity='last_expr_or_assign'`` |
|
79 | With the option ``InteractiveShell.ast_node_interactivity='last_expr_or_assign'`` | |
68 | you can now do:: |
|
80 | you can now do:: | |
69 |
|
81 | |||
70 | In [2]: xyz = "something else" |
|
82 | In [2]: xyz = "something else" | |
71 | Out[2]: "something else" |
|
83 | Out[2]: "something else" | |
72 |
|
84 | |||
73 | This option can be toggled at runtime with the ``%config`` magic, and will |
|
85 | This option can be toggled at runtime with the ``%config`` magic, and will | |
74 | trigger on assignment ``a = 1``, augmented assignment ``+=``, ``-=``, ``|=`` ... |
|
86 | trigger on assignment ``a = 1``, augmented assignment ``+=``, ``-=``, ``|=`` ... | |
75 | as well as type annotated assignments: ``a:int = 2``. |
|
87 | as well as type annotated assignments: ``a:int = 2``. | |
76 |
|
88 | |||
77 | See :ghpull:`10598` |
|
89 | See :ghpull:`10598` | |
78 |
|
90 | |||
79 | Recursive Call of ipdb |
|
91 | Recursive Call of ipdb | |
80 | ---------------------- |
|
92 | ---------------------- | |
81 |
|
93 | |||
82 | Advanced users of the debugger can now correctly recursively enter ipdb. This is |
|
94 | Advanced users of the debugger can now correctly recursively enter ipdb. This is | |
83 | thanks to ``@segevfiner`` on :ghpull:`10721`. |
|
95 | thanks to ``@segevfiner`` on :ghpull:`10721`. | |
84 |
|
96 | |||
85 | .. _whatsnew610: |
|
97 | .. _whatsnew610: | |
86 |
|
98 | |||
87 | IPython 6.1 |
|
99 | IPython 6.1 | |
88 | =========== |
|
100 | =========== | |
89 |
|
101 | |||
90 | - Quotes in a filename are always escaped during tab-completion on non-Windows. |
|
102 | - Quotes in a filename are always escaped during tab-completion on non-Windows. | |
91 | :ghpull:`10069` |
|
103 | :ghpull:`10069` | |
92 |
|
104 | |||
93 | - Variables now shadow magics in autocompletion. See :ghissue:`4877` and :ghpull:`10542`. |
|
105 | - Variables now shadow magics in autocompletion. See :ghissue:`4877` and :ghpull:`10542`. | |
94 |
|
106 | |||
95 | - Added the ability to add parameters to alias_magic. For example:: |
|
107 | - Added the ability to add parameters to alias_magic. For example:: | |
96 |
|
108 | |||
97 | In [2]: %alias_magic hist history --params "-l 2" --line |
|
109 | In [2]: %alias_magic hist history --params "-l 2" --line | |
98 | Created `%hist` as an alias for `%history -l 2`. |
|
110 | Created `%hist` as an alias for `%history -l 2`. | |
99 |
|
111 | |||
100 | In [3]: hist |
|
112 | In [3]: hist | |
101 | %alias_magic hist history --params "-l 30" --line |
|
113 | %alias_magic hist history --params "-l 30" --line | |
102 | %alias_magic hist history --params "-l 2" --line |
|
114 | %alias_magic hist history --params "-l 2" --line | |
103 |
|
115 | |||
104 | Previously it was only possible to have an alias attached to a single function, |
|
116 | Previously it was only possible to have an alias attached to a single function, | |
105 | and you would have to pass in the given parameters every time:: |
|
117 | and you would have to pass in the given parameters every time:: | |
106 |
|
118 | |||
107 | In [4]: %alias_magic hist history --line |
|
119 | In [4]: %alias_magic hist history --line | |
108 | Created `%hist` as an alias for `%history`. |
|
120 | Created `%hist` as an alias for `%history`. | |
109 |
|
121 | |||
110 | In [5]: hist -l 2 |
|
122 | In [5]: hist -l 2 | |
111 | hist |
|
123 | hist | |
112 | %alias_magic hist history --line |
|
124 | %alias_magic hist history --line | |
113 |
|
125 | |||
114 | - To suppress log state messages, you can now either use ``%logstart -q``, pass |
|
126 | - To suppress log state messages, you can now either use ``%logstart -q``, pass | |
115 | ``--LoggingMagics.quiet=True`` on the command line, or set |
|
127 | ``--LoggingMagics.quiet=True`` on the command line, or set | |
116 | ``c.LoggingMagics.quiet=True`` in your configuration file. |
|
128 | ``c.LoggingMagics.quiet=True`` in your configuration file. | |
117 |
|
129 | |||
118 | - An additional flag ``--TerminalInteractiveShell.term_title_format`` is |
|
130 | - An additional flag ``--TerminalInteractiveShell.term_title_format`` is | |
119 | introduced to allow the user to control the format of the terminal title. It |
|
131 | introduced to allow the user to control the format of the terminal title. It | |
120 | is specified as a python format string, and currently the only variable it |
|
132 | is specified as a python format string, and currently the only variable it | |
121 | will format is ``{cwd}``. |
|
133 | will format is ``{cwd}``. | |
122 |
|
134 | |||
123 | - ``??``/``%pinfo2`` will now show object docstrings if the source can't be retrieved. :ghpull:`10532` |
|
135 | - ``??``/``%pinfo2`` will now show object docstrings if the source can't be retrieved. :ghpull:`10532` | |
124 | - ``IPython.display`` has gained a ``%markdown`` cell magic. :ghpull:`10563` |
|
136 | - ``IPython.display`` has gained a ``%markdown`` cell magic. :ghpull:`10563` | |
125 | - ``%config`` options can now be tab completed. :ghpull:`10555` |
|
137 | - ``%config`` options can now be tab completed. :ghpull:`10555` | |
126 | - ``%config`` with no arguments are now unique and sorted. :ghpull:`10548` |
|
138 | - ``%config`` with no arguments are now unique and sorted. :ghpull:`10548` | |
127 | - Completion on keyword arguments does not duplicate ``=`` sign if already present. :ghpull:`10547` |
|
139 | - Completion on keyword arguments does not duplicate ``=`` sign if already present. :ghpull:`10547` | |
128 | - ``%run -m <module>`` now ``<module>`` passes extra arguments to ``<module>``. :ghpull:`10546` |
|
140 | - ``%run -m <module>`` now ``<module>`` passes extra arguments to ``<module>``. :ghpull:`10546` | |
129 | - completer now understand "snake case auto complete": if ``foo_bar_kittens`` is |
|
141 | - completer now understand "snake case auto complete": if ``foo_bar_kittens`` is | |
130 | a valid completion, I can type ``f_b<tab>`` will complete to it. :ghpull:`10537` |
|
142 | a valid completion, I can type ``f_b<tab>`` will complete to it. :ghpull:`10537` | |
131 | - tracebacks are better standardized and will compress `/path/to/home` to `~`. :ghpull:`10515` |
|
143 | - tracebacks are better standardized and will compress `/path/to/home` to `~`. :ghpull:`10515` | |
132 |
|
144 | |||
133 | The following changes were also added to IPython 5.4, see :ref:`what's new in IPython 5.4 <whatsnew540>` |
|
145 | The following changes were also added to IPython 5.4, see :ref:`what's new in IPython 5.4 <whatsnew540>` | |
134 | for more detail description: |
|
146 | for more detail description: | |
135 |
|
147 | |||
136 | - ``TerminalInteractiveShell`` is configurable and can be configured to |
|
148 | - ``TerminalInteractiveShell`` is configurable and can be configured to | |
137 | (re)-use the readline interface. |
|
149 | (re)-use the readline interface. | |
138 |
|
150 | |||
139 | - objects can now define a ``_repr_mimebundle_`` |
|
151 | - objects can now define a ``_repr_mimebundle_`` | |
140 |
|
152 | |||
141 | - Execution heuristics improve for single line statements |
|
153 | - Execution heuristics improve for single line statements | |
142 | - ``display()`` can now return a display id to update display areas. |
|
154 | - ``display()`` can now return a display id to update display areas. | |
143 |
|
155 | |||
144 |
|
156 | |||
145 | .. _whatsnew600: |
|
157 | .. _whatsnew600: | |
146 |
|
158 | |||
147 | IPython 6.0 |
|
159 | IPython 6.0 | |
148 | =========== |
|
160 | =========== | |
149 |
|
161 | |||
150 | Released April 19th, 2017 |
|
162 | Released April 19th, 2017 | |
151 |
|
163 | |||
152 | IPython 6 features a major improvement in the completion machinery which is now |
|
164 | IPython 6 features a major improvement in the completion machinery which is now | |
153 | capable of completing non-executed code. It is also the first version of IPython |
|
165 | capable of completing non-executed code. It is also the first version of IPython | |
154 | to stop compatibility with Python 2, which is still supported on the bugfix only |
|
166 | to stop compatibility with Python 2, which is still supported on the bugfix only | |
155 | 5.x branch. Read below for a non-exhaustive list of new features. |
|
167 | 5.x branch. Read below for a non-exhaustive list of new features. | |
156 |
|
168 | |||
157 | Make sure you have pip > 9.0 before upgrading. |
|
169 | Make sure you have pip > 9.0 before upgrading. | |
158 | You should be able to update by using: |
|
170 | You should be able to update by using: | |
159 |
|
171 | |||
160 | .. code:: |
|
172 | .. code:: | |
161 |
|
173 | |||
162 | pip install ipython --upgrade |
|
174 | pip install ipython --upgrade | |
163 |
|
175 | |||
164 |
|
176 | |||
165 | .. note:: |
|
177 | .. note:: | |
166 |
|
178 | |||
167 | If your pip version is greater than or equal to pip 9.0.1 you will automatically get |
|
179 | If your pip version is greater than or equal to pip 9.0.1 you will automatically get | |
168 | the most recent version of IPython compatible with your system: on Python 2 you |
|
180 | the most recent version of IPython compatible with your system: on Python 2 you | |
169 | will get the latest IPython 5.x bugfix, while in Python 3 |
|
181 | will get the latest IPython 5.x bugfix, while in Python 3 | |
170 | you will get the latest 6.x stable version. |
|
182 | you will get the latest 6.x stable version. | |
171 |
|
183 | |||
172 | New completion API and Interface |
|
184 | New completion API and Interface | |
173 | -------------------------------- |
|
185 | -------------------------------- | |
174 |
|
186 | |||
175 | The completer Completion API has seen an overhaul, and the new completer has |
|
187 | The completer Completion API has seen an overhaul, and the new completer has | |
176 | plenty of improvements both from the end users of terminal IPython and for |
|
188 | plenty of improvements both from the end users of terminal IPython and for | |
177 | consumers of the API. |
|
189 | consumers of the API. | |
178 |
|
190 | |||
179 | This new API is capable of pulling completions from :any:`jedi`, thus allowing |
|
191 | This new API is capable of pulling completions from :any:`jedi`, thus allowing | |
180 | type inference on non-executed code. If :any:`jedi` is installed, completions like |
|
192 | type inference on non-executed code. If :any:`jedi` is installed, completions like | |
181 | the following are now possible without code evaluation: |
|
193 | the following are now possible without code evaluation: | |
182 |
|
194 | |||
183 | >>> data = ['Number of users', 123_456] |
|
195 | >>> data = ['Number of users', 123_456] | |
184 | ... data[0].<tab> |
|
196 | ... data[0].<tab> | |
185 |
|
197 | |||
186 | That is to say, IPython is now capable of inferring that `data[0]` is a string, |
|
198 | That is to say, IPython is now capable of inferring that `data[0]` is a string, | |
187 | and will suggest completions like `.capitalize`. The completion power of IPython |
|
199 | and will suggest completions like `.capitalize`. The completion power of IPython | |
188 | will increase with new Jedi releases, and a number of bug-fixes and more completions |
|
200 | will increase with new Jedi releases, and a number of bug-fixes and more completions | |
189 | are already available on the development version of :any:`jedi` if you are curious. |
|
201 | are already available on the development version of :any:`jedi` if you are curious. | |
190 |
|
202 | |||
191 | With the help of prompt toolkit, types of completions can be shown in the |
|
203 | With the help of prompt toolkit, types of completions can be shown in the | |
192 | completer interface: |
|
204 | completer interface: | |
193 |
|
205 | |||
194 | .. image:: ../_images/jedi_type_inference_60.png |
|
206 | .. image:: ../_images/jedi_type_inference_60.png | |
195 | :alt: Jedi showing ability to do type inference |
|
207 | :alt: Jedi showing ability to do type inference | |
196 | :align: center |
|
208 | :align: center | |
197 | :width: 400px |
|
209 | :width: 400px | |
198 | :target: ../_images/jedi_type_inference_60.png |
|
210 | :target: ../_images/jedi_type_inference_60.png | |
199 |
|
211 | |||
200 | The appearance of the completer is controlled by the |
|
212 | The appearance of the completer is controlled by the | |
201 | ``c.TerminalInteractiveShell.display_completions`` option that will show the |
|
213 | ``c.TerminalInteractiveShell.display_completions`` option that will show the | |
202 | type differently depending on the value among ``'column'``, ``'multicolumn'`` |
|
214 | type differently depending on the value among ``'column'``, ``'multicolumn'`` | |
203 | and ``'readlinelike'`` |
|
215 | and ``'readlinelike'`` | |
204 |
|
216 | |||
205 | The use of Jedi also fulfills a number of requests and fixes a number of bugs |
|
217 | The use of Jedi also fulfills a number of requests and fixes a number of bugs | |
206 | like case-insensitive completion and completion after division operator: See |
|
218 | like case-insensitive completion and completion after division operator: See | |
207 | :ghpull:`10182`. |
|
219 | :ghpull:`10182`. | |
208 |
|
220 | |||
209 | Extra patches and updates will be needed to the :mod:`ipykernel` package for |
|
221 | Extra patches and updates will be needed to the :mod:`ipykernel` package for | |
210 | this feature to be available to other clients like Jupyter Notebook, Lab, |
|
222 | this feature to be available to other clients like Jupyter Notebook, Lab, | |
211 | Nteract, Hydrogen... |
|
223 | Nteract, Hydrogen... | |
212 |
|
224 | |||
213 | The use of Jedi should be barely noticeable on recent machines, but |
|
225 | The use of Jedi should be barely noticeable on recent machines, but | |
214 | can be slower on older ones. To tweak the performance, the amount |
|
226 | can be slower on older ones. To tweak the performance, the amount | |
215 | of time given to Jedi to compute type inference can be adjusted with |
|
227 | of time given to Jedi to compute type inference can be adjusted with | |
216 | ``c.IPCompleter.jedi_compute_type_timeout``. The objects whose type were not |
|
228 | ``c.IPCompleter.jedi_compute_type_timeout``. The objects whose type were not | |
217 | inferred will be shown as ``<unknown>``. Jedi can also be completely deactivated |
|
229 | inferred will be shown as ``<unknown>``. Jedi can also be completely deactivated | |
218 | by using the ``c.Completer.use_jedi=False`` option. |
|
230 | by using the ``c.Completer.use_jedi=False`` option. | |
219 |
|
231 | |||
220 |
|
232 | |||
221 | The old ``Completer.complete()`` API is waiting deprecation and should be |
|
233 | The old ``Completer.complete()`` API is waiting deprecation and should be | |
222 | replaced replaced by ``Completer.completions()`` in the near future. Feedback on |
|
234 | replaced replaced by ``Completer.completions()`` in the near future. Feedback on | |
223 | the current state of the API and suggestions are welcome. |
|
235 | the current state of the API and suggestions are welcome. | |
224 |
|
236 | |||
225 | Python 3 only codebase |
|
237 | Python 3 only codebase | |
226 | ---------------------- |
|
238 | ---------------------- | |
227 |
|
239 | |||
228 | One of the large challenges in IPython 6.0 has been the adoption of a pure |
|
240 | One of the large challenges in IPython 6.0 has been the adoption of a pure | |
229 | Python 3 codebase, which has led to upstream patches in pip, |
|
241 | Python 3 codebase, which has led to upstream patches in pip, | |
230 | pypi and warehouse to make sure Python 2 systems still upgrade to the latest |
|
242 | pypi and warehouse to make sure Python 2 systems still upgrade to the latest | |
231 | compatible Python version. |
|
243 | compatible Python version. | |
232 |
|
244 | |||
233 | We remind our Python 2 users that IPython 5 is still compatible with Python 2.7, |
|
245 | We remind our Python 2 users that IPython 5 is still compatible with Python 2.7, | |
234 | still maintained and will get regular releases. Using pip 9+, upgrading IPython will |
|
246 | still maintained and will get regular releases. Using pip 9+, upgrading IPython will | |
235 | automatically upgrade to the latest version compatible with your system. |
|
247 | automatically upgrade to the latest version compatible with your system. | |
236 |
|
248 | |||
237 | .. warning:: |
|
249 | .. warning:: | |
238 |
|
250 | |||
239 | If you are on a system using an older version of pip on Python 2, pip may |
|
251 | If you are on a system using an older version of pip on Python 2, pip may | |
240 | still install IPython 6.0 on your system, and IPython will refuse to start. |
|
252 | still install IPython 6.0 on your system, and IPython will refuse to start. | |
241 | You can fix this by upgrading pip, and reinstalling ipython, or forcing pip to |
|
253 | You can fix this by upgrading pip, and reinstalling ipython, or forcing pip to | |
242 | install an earlier version: ``pip install 'ipython<6'`` |
|
254 | install an earlier version: ``pip install 'ipython<6'`` | |
243 |
|
255 | |||
244 | The ability to use only Python 3 on the code base of IPython brings a number |
|
256 | The ability to use only Python 3 on the code base of IPython brings a number | |
245 | of advantages. Most of the newly written code make use of `optional function type |
|
257 | of advantages. Most of the newly written code make use of `optional function type | |
246 | annotation <https://www.python.org/dev/peps/pep-0484/>`_ leading to clearer code |
|
258 | annotation <https://www.python.org/dev/peps/pep-0484/>`_ leading to clearer code | |
247 | and better documentation. |
|
259 | and better documentation. | |
248 |
|
260 | |||
249 | The total size of the repository has also decreased by about 1500 lines (for the |
|
261 | The total size of the repository has also decreased by about 1500 lines (for the | |
250 | first time excluding the big split for 4.0). The decrease is potentially |
|
262 | first time excluding the big split for 4.0). The decrease is potentially | |
251 | a bit more for the sour as some documents like this one are append only and |
|
263 | a bit more for the sour as some documents like this one are append only and | |
252 | are about 300 lines long. |
|
264 | are about 300 lines long. | |
253 |
|
265 | |||
254 | The removal of the Python2/Python3 shim layer has made the code quite a lot clearer and |
|
266 | The removal of the Python2/Python3 shim layer has made the code quite a lot clearer and | |
255 | more idiomatic in a number of locations, and much friendlier to work with and |
|
267 | more idiomatic in a number of locations, and much friendlier to work with and | |
256 | understand. We hope to further embrace Python 3 capabilities in the next release |
|
268 | understand. We hope to further embrace Python 3 capabilities in the next release | |
257 | cycle and introduce more of the Python 3 only idioms (yield from, kwarg only, |
|
269 | cycle and introduce more of the Python 3 only idioms (yield from, kwarg only, | |
258 | general unpacking) in the IPython code base, and see if we can take advantage |
|
270 | general unpacking) in the IPython code base, and see if we can take advantage | |
259 | of these to improve user experience with better error messages and |
|
271 | of these to improve user experience with better error messages and | |
260 | hints. |
|
272 | hints. | |
261 |
|
273 | |||
262 |
|
274 | |||
263 | Configurable TerminalInteractiveShell, readline interface |
|
275 | Configurable TerminalInteractiveShell, readline interface | |
264 | --------------------------------------------------------- |
|
276 | --------------------------------------------------------- | |
265 |
|
277 | |||
266 | IPython gained a new ``c.TerminalIPythonApp.interactive_shell_class`` option |
|
278 | IPython gained a new ``c.TerminalIPythonApp.interactive_shell_class`` option | |
267 | that allows customizing the class used to start the terminal frontend. This |
|
279 | that allows customizing the class used to start the terminal frontend. This | |
268 | should allow a user to use custom interfaces, like reviving the former readline |
|
280 | should allow a user to use custom interfaces, like reviving the former readline | |
269 | interface which is now a separate package not actively maintained by the core |
|
281 | interface which is now a separate package not actively maintained by the core | |
270 | team. See the project to bring back the readline interface: `rlipython |
|
282 | team. See the project to bring back the readline interface: `rlipython | |
271 | <https://github.com/ipython/rlipython>`_. |
|
283 | <https://github.com/ipython/rlipython>`_. | |
272 |
|
284 | |||
273 | This change will be backported to the IPython 5.x series. |
|
285 | This change will be backported to the IPython 5.x series. | |
274 |
|
286 | |||
275 | Misc improvements |
|
287 | Misc improvements | |
276 | ----------------- |
|
288 | ----------------- | |
277 |
|
289 | |||
278 |
|
290 | |||
279 | - The :cellmagic:`capture` magic can now capture the result of a cell (from |
|
291 | - The :cellmagic:`capture` magic can now capture the result of a cell (from | |
280 | an expression on the last line), as well as printed and displayed output. |
|
292 | an expression on the last line), as well as printed and displayed output. | |
281 | :ghpull:`9851`. |
|
293 | :ghpull:`9851`. | |
282 |
|
294 | |||
283 | - Pressing Ctrl-Z in the terminal debugger now suspends IPython, as it already |
|
295 | - Pressing Ctrl-Z in the terminal debugger now suspends IPython, as it already | |
284 | does in the main terminal prompt. |
|
296 | does in the main terminal prompt. | |
285 |
|
297 | |||
286 | - Autoreload can now reload ``Enum``. See :ghissue:`10232` and :ghpull:`10316` |
|
298 | - Autoreload can now reload ``Enum``. See :ghissue:`10232` and :ghpull:`10316` | |
287 |
|
299 | |||
288 | - IPython.display has gained a :any:`GeoJSON <IPython.display.GeoJSON>` object. |
|
300 | - IPython.display has gained a :any:`GeoJSON <IPython.display.GeoJSON>` object. | |
289 | :ghpull:`10288` and :ghpull:`10253` |
|
301 | :ghpull:`10288` and :ghpull:`10253` | |
290 |
|
302 | |||
291 | Functions Deprecated in 6.x Development cycle |
|
303 | Functions Deprecated in 6.x Development cycle | |
292 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
304 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
293 |
|
305 | |||
294 | - Loading extensions from ``ipython_extension_dir`` prints a warning that this |
|
306 | - Loading extensions from ``ipython_extension_dir`` prints a warning that this | |
295 | location is pending deprecation. This should only affect users still having |
|
307 | location is pending deprecation. This should only affect users still having | |
296 | extensions installed with ``%install_ext`` which has been deprecated since |
|
308 | extensions installed with ``%install_ext`` which has been deprecated since | |
297 | IPython 4.0, and removed in 5.0. Extensions still present in |
|
309 | IPython 4.0, and removed in 5.0. Extensions still present in | |
298 | ``ipython_extension_dir`` may shadow more recently installed versions using |
|
310 | ``ipython_extension_dir`` may shadow more recently installed versions using | |
299 | pip. It is thus recommended to clean ``ipython_extension_dir`` of any |
|
311 | pip. It is thus recommended to clean ``ipython_extension_dir`` of any | |
300 | extension now available as a package. |
|
312 | extension now available as a package. | |
301 |
|
313 | |||
302 |
|
314 | |||
303 | - ``IPython.utils.warn`` was deprecated in IPython 4.0, and has now been removed. |
|
315 | - ``IPython.utils.warn`` was deprecated in IPython 4.0, and has now been removed. | |
304 | instead of ``IPython.utils.warn`` inbuilt :any:`warnings` module is used. |
|
316 | instead of ``IPython.utils.warn`` inbuilt :any:`warnings` module is used. | |
305 |
|
317 | |||
306 |
|
318 | |||
307 | - The function `IPython.core.oinspect.py:call_tip` is unused, was marked as |
|
319 | - The function `IPython.core.oinspect.py:call_tip` is unused, was marked as | |
308 | deprecated (raising a `DeprecationWarning`) and marked for later removal. |
|
320 | deprecated (raising a `DeprecationWarning`) and marked for later removal. | |
309 | :ghpull:`10104` |
|
321 | :ghpull:`10104` | |
310 |
|
322 | |||
311 | Backward incompatible changes |
|
323 | Backward incompatible changes | |
312 | ------------------------------ |
|
324 | ------------------------------ | |
313 |
|
325 | |||
314 | Functions Removed in 6.x Development cycle |
|
326 | Functions Removed in 6.x Development cycle | |
315 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
327 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
316 |
|
328 | |||
317 | The following functions have been removed in the |
|
329 | The following functions have been removed in the | |
318 | development cycle marked for Milestone 6.0. |
|
330 | development cycle marked for Milestone 6.0. | |
319 |
|
331 | |||
320 | - ``IPython/utils/process.py`` - ``is_cmd_found`` |
|
332 | - ``IPython/utils/process.py`` - ``is_cmd_found`` | |
321 | - ``IPython/utils/process.py`` - ``pycmd2argv`` |
|
333 | - ``IPython/utils/process.py`` - ``pycmd2argv`` | |
322 |
|
334 | |||
323 | - The `--deep-reload` flag and the corresponding options to inject `dreload` or |
|
335 | - The `--deep-reload` flag and the corresponding options to inject `dreload` or | |
324 | `reload` into the interactive namespace have been removed. You have to |
|
336 | `reload` into the interactive namespace have been removed. You have to | |
325 | explicitly import `reload` from `IPython.lib.deepreload` to use it. |
|
337 | explicitly import `reload` from `IPython.lib.deepreload` to use it. | |
326 |
|
338 | |||
327 | - The :magic:`profile` used to print the current IPython profile, and which |
|
339 | - The :magic:`profile` used to print the current IPython profile, and which | |
328 | was deprecated in IPython 2.0 does now raise a `DeprecationWarning` error when |
|
340 | was deprecated in IPython 2.0 does now raise a `DeprecationWarning` error when | |
329 | used. It is often confused with the :magic:`prun` and the deprecation removal |
|
341 | used. It is often confused with the :magic:`prun` and the deprecation removal | |
330 | should free up the ``profile`` name in future versions. |
|
342 | should free up the ``profile`` name in future versions. |
General Comments 0
You need to be logged in to leave comments.
Login now