##// END OF EJS Templates
Fix IndexError on a singular slash input
Blazej Michalik -
Show More
@@ -1,748 +1,752 b''
1 """Input transformer machinery to support IPython special syntax.
1 """Input transformer machinery to support IPython special syntax.
2
2
3 This includes the machinery to recognise and transform ``%magic`` commands,
3 This includes the machinery to recognise and transform ``%magic`` commands,
4 ``!system`` commands, ``help?`` querying, prompt stripping, and so forth.
4 ``!system`` commands, ``help?`` querying, prompt stripping, and so forth.
5
5
6 Added: IPython 7.0. Replaces inputsplitter and inputtransformer which were
6 Added: IPython 7.0. Replaces inputsplitter and inputtransformer which were
7 deprecated in 7.0.
7 deprecated in 7.0.
8 """
8 """
9
9
10 # Copyright (c) IPython Development Team.
10 # Copyright (c) IPython Development Team.
11 # Distributed under the terms of the Modified BSD License.
11 # Distributed under the terms of the Modified BSD License.
12
12
13 from codeop import compile_command
13 from codeop import compile_command
14 import re
14 import re
15 import tokenize
15 import tokenize
16 from typing import List, Tuple, Optional, Any
16 from typing import List, Tuple, Optional, Any
17 import warnings
17 import warnings
18
18
19 _indent_re = re.compile(r'^[ \t]+')
19 _indent_re = re.compile(r'^[ \t]+')
20
20
21 def leading_empty_lines(lines):
21 def leading_empty_lines(lines):
22 """Remove leading empty lines
22 """Remove leading empty lines
23
23
24 If the leading lines are empty or contain only whitespace, they will be
24 If the leading lines are empty or contain only whitespace, they will be
25 removed.
25 removed.
26 """
26 """
27 if not lines:
27 if not lines:
28 return lines
28 return lines
29 for i, line in enumerate(lines):
29 for i, line in enumerate(lines):
30 if line and not line.isspace():
30 if line and not line.isspace():
31 return lines[i:]
31 return lines[i:]
32 return lines
32 return lines
33
33
34 def leading_indent(lines):
34 def leading_indent(lines):
35 """Remove leading indentation.
35 """Remove leading indentation.
36
36
37 If the first line starts with a spaces or tabs, the same whitespace will be
37 If the first line starts with a spaces or tabs, the same whitespace will be
38 removed from each following line in the cell.
38 removed from each following line in the cell.
39 """
39 """
40 if not lines:
40 if not lines:
41 return lines
41 return lines
42 m = _indent_re.match(lines[0])
42 m = _indent_re.match(lines[0])
43 if not m:
43 if not m:
44 return lines
44 return lines
45 space = m.group(0)
45 space = m.group(0)
46 n = len(space)
46 n = len(space)
47 return [l[n:] if l.startswith(space) else l
47 return [l[n:] if l.startswith(space) else l
48 for l in lines]
48 for l in lines]
49
49
50 class PromptStripper:
50 class PromptStripper:
51 """Remove matching input prompts from a block of input.
51 """Remove matching input prompts from a block of input.
52
52
53 Parameters
53 Parameters
54 ----------
54 ----------
55 prompt_re : regular expression
55 prompt_re : regular expression
56 A regular expression matching any input prompt (including continuation,
56 A regular expression matching any input prompt (including continuation,
57 e.g. ``...``)
57 e.g. ``...``)
58 initial_re : regular expression, optional
58 initial_re : regular expression, optional
59 A regular expression matching only the initial prompt, but not continuation.
59 A regular expression matching only the initial prompt, but not continuation.
60 If no initial expression is given, prompt_re will be used everywhere.
60 If no initial expression is given, prompt_re will be used everywhere.
61 Used mainly for plain Python prompts (``>>>``), where the continuation prompt
61 Used mainly for plain Python prompts (``>>>``), where the continuation prompt
62 ``...`` is a valid Python expression in Python 3, so shouldn't be stripped.
62 ``...`` is a valid Python expression in Python 3, so shouldn't be stripped.
63
63
64 Notes
64 Notes
65 -----
65 -----
66
66
67 If initial_re and prompt_re differ,
67 If initial_re and prompt_re differ,
68 only initial_re will be tested against the first line.
68 only initial_re will be tested against the first line.
69 If any prompt is found on the first two lines,
69 If any prompt is found on the first two lines,
70 prompts will be stripped from the rest of the block.
70 prompts will be stripped from the rest of the block.
71 """
71 """
72 def __init__(self, prompt_re, initial_re=None):
72 def __init__(self, prompt_re, initial_re=None):
73 self.prompt_re = prompt_re
73 self.prompt_re = prompt_re
74 self.initial_re = initial_re or prompt_re
74 self.initial_re = initial_re or prompt_re
75
75
76 def _strip(self, lines):
76 def _strip(self, lines):
77 return [self.prompt_re.sub('', l, count=1) for l in lines]
77 return [self.prompt_re.sub('', l, count=1) for l in lines]
78
78
79 def __call__(self, lines):
79 def __call__(self, lines):
80 if not lines:
80 if not lines:
81 return lines
81 return lines
82 if self.initial_re.match(lines[0]) or \
82 if self.initial_re.match(lines[0]) or \
83 (len(lines) > 1 and self.prompt_re.match(lines[1])):
83 (len(lines) > 1 and self.prompt_re.match(lines[1])):
84 return self._strip(lines)
84 return self._strip(lines)
85 return lines
85 return lines
86
86
87 classic_prompt = PromptStripper(
87 classic_prompt = PromptStripper(
88 prompt_re=re.compile(r'^(>>>|\.\.\.)( |$)'),
88 prompt_re=re.compile(r'^(>>>|\.\.\.)( |$)'),
89 initial_re=re.compile(r'^>>>( |$)')
89 initial_re=re.compile(r'^>>>( |$)')
90 )
90 )
91
91
92 ipython_prompt = PromptStripper(re.compile(r'^(In \[\d+\]: |\s*\.{3,}: ?)'))
92 ipython_prompt = PromptStripper(re.compile(r'^(In \[\d+\]: |\s*\.{3,}: ?)'))
93
93
94 def cell_magic(lines):
94 def cell_magic(lines):
95 if not lines or not lines[0].startswith('%%'):
95 if not lines or not lines[0].startswith('%%'):
96 return lines
96 return lines
97 if re.match(r'%%\w+\?', lines[0]):
97 if re.match(r'%%\w+\?', lines[0]):
98 # This case will be handled by help_end
98 # This case will be handled by help_end
99 return lines
99 return lines
100 magic_name, _, first_line = lines[0][2:].rstrip().partition(' ')
100 magic_name, _, first_line = lines[0][2:].rstrip().partition(' ')
101 body = ''.join(lines[1:])
101 body = ''.join(lines[1:])
102 return ['get_ipython().run_cell_magic(%r, %r, %r)\n'
102 return ['get_ipython().run_cell_magic(%r, %r, %r)\n'
103 % (magic_name, first_line, body)]
103 % (magic_name, first_line, body)]
104
104
105
105
106 def _find_assign_op(token_line) -> Optional[int]:
106 def _find_assign_op(token_line) -> Optional[int]:
107 """Get the index of the first assignment in the line ('=' not inside brackets)
107 """Get the index of the first assignment in the line ('=' not inside brackets)
108
108
109 Note: We don't try to support multiple special assignment (a = b = %foo)
109 Note: We don't try to support multiple special assignment (a = b = %foo)
110 """
110 """
111 paren_level = 0
111 paren_level = 0
112 for i, ti in enumerate(token_line):
112 for i, ti in enumerate(token_line):
113 s = ti.string
113 s = ti.string
114 if s == '=' and paren_level == 0:
114 if s == '=' and paren_level == 0:
115 return i
115 return i
116 if s in {'(','[','{'}:
116 if s in {'(','[','{'}:
117 paren_level += 1
117 paren_level += 1
118 elif s in {')', ']', '}'}:
118 elif s in {')', ']', '}'}:
119 if paren_level > 0:
119 if paren_level > 0:
120 paren_level -= 1
120 paren_level -= 1
121 return None
121 return None
122
122
123 def find_end_of_continued_line(lines, start_line: int):
123 def find_end_of_continued_line(lines, start_line: int):
124 """Find the last line of a line explicitly extended using backslashes.
124 """Find the last line of a line explicitly extended using backslashes.
125
125
126 Uses 0-indexed line numbers.
126 Uses 0-indexed line numbers.
127 """
127 """
128 end_line = start_line
128 end_line = start_line
129 while lines[end_line].endswith('\\\n'):
129 while lines[end_line].endswith('\\\n'):
130 end_line += 1
130 end_line += 1
131 if end_line >= len(lines):
131 if end_line >= len(lines):
132 break
132 break
133 return end_line
133 return end_line
134
134
135 def assemble_continued_line(lines, start: Tuple[int, int], end_line: int):
135 def assemble_continued_line(lines, start: Tuple[int, int], end_line: int):
136 r"""Assemble a single line from multiple continued line pieces
136 r"""Assemble a single line from multiple continued line pieces
137
137
138 Continued lines are lines ending in ``\``, and the line following the last
138 Continued lines are lines ending in ``\``, and the line following the last
139 ``\`` in the block.
139 ``\`` in the block.
140
140
141 For example, this code continues over multiple lines::
141 For example, this code continues over multiple lines::
142
142
143 if (assign_ix is not None) \
143 if (assign_ix is not None) \
144 and (len(line) >= assign_ix + 2) \
144 and (len(line) >= assign_ix + 2) \
145 and (line[assign_ix+1].string == '%') \
145 and (line[assign_ix+1].string == '%') \
146 and (line[assign_ix+2].type == tokenize.NAME):
146 and (line[assign_ix+2].type == tokenize.NAME):
147
147
148 This statement contains four continued line pieces.
148 This statement contains four continued line pieces.
149 Assembling these pieces into a single line would give::
149 Assembling these pieces into a single line would give::
150
150
151 if (assign_ix is not None) and (len(line) >= assign_ix + 2) and (line[...
151 if (assign_ix is not None) and (len(line) >= assign_ix + 2) and (line[...
152
152
153 This uses 0-indexed line numbers. *start* is (lineno, colno).
153 This uses 0-indexed line numbers. *start* is (lineno, colno).
154
154
155 Used to allow ``%magic`` and ``!system`` commands to be continued over
155 Used to allow ``%magic`` and ``!system`` commands to be continued over
156 multiple lines.
156 multiple lines.
157 """
157 """
158 parts = [lines[start[0]][start[1]:]] + lines[start[0]+1:end_line+1]
158 parts = [lines[start[0]][start[1]:]] + lines[start[0]+1:end_line+1]
159 return ' '.join([p.rstrip()[:-1] for p in parts[:-1]] # Strip backslash+newline
159 return ' '.join([p.rstrip()[:-1] for p in parts[:-1]] # Strip backslash+newline
160 + [parts[-1].rstrip()]) # Strip newline from last line
160 + [parts[-1].rstrip()]) # Strip newline from last line
161
161
162 class TokenTransformBase:
162 class TokenTransformBase:
163 """Base class for transformations which examine tokens.
163 """Base class for transformations which examine tokens.
164
164
165 Special syntax should not be transformed when it occurs inside strings or
165 Special syntax should not be transformed when it occurs inside strings or
166 comments. This is hard to reliably avoid with regexes. The solution is to
166 comments. This is hard to reliably avoid with regexes. The solution is to
167 tokenise the code as Python, and recognise the special syntax in the tokens.
167 tokenise the code as Python, and recognise the special syntax in the tokens.
168
168
169 IPython's special syntax is not valid Python syntax, so tokenising may go
169 IPython's special syntax is not valid Python syntax, so tokenising may go
170 wrong after the special syntax starts. These classes therefore find and
170 wrong after the special syntax starts. These classes therefore find and
171 transform *one* instance of special syntax at a time into regular Python
171 transform *one* instance of special syntax at a time into regular Python
172 syntax. After each transformation, tokens are regenerated to find the next
172 syntax. After each transformation, tokens are regenerated to find the next
173 piece of special syntax.
173 piece of special syntax.
174
174
175 Subclasses need to implement one class method (find)
175 Subclasses need to implement one class method (find)
176 and one regular method (transform).
176 and one regular method (transform).
177
177
178 The priority attribute can select which transformation to apply if multiple
178 The priority attribute can select which transformation to apply if multiple
179 transformers match in the same place. Lower numbers have higher priority.
179 transformers match in the same place. Lower numbers have higher priority.
180 This allows "%magic?" to be turned into a help call rather than a magic call.
180 This allows "%magic?" to be turned into a help call rather than a magic call.
181 """
181 """
182 # Lower numbers -> higher priority (for matches in the same location)
182 # Lower numbers -> higher priority (for matches in the same location)
183 priority = 10
183 priority = 10
184
184
185 def sortby(self):
185 def sortby(self):
186 return self.start_line, self.start_col, self.priority
186 return self.start_line, self.start_col, self.priority
187
187
188 def __init__(self, start):
188 def __init__(self, start):
189 self.start_line = start[0] - 1 # Shift from 1-index to 0-index
189 self.start_line = start[0] - 1 # Shift from 1-index to 0-index
190 self.start_col = start[1]
190 self.start_col = start[1]
191
191
192 @classmethod
192 @classmethod
193 def find(cls, tokens_by_line):
193 def find(cls, tokens_by_line):
194 """Find one instance of special syntax in the provided tokens.
194 """Find one instance of special syntax in the provided tokens.
195
195
196 Tokens are grouped into logical lines for convenience,
196 Tokens are grouped into logical lines for convenience,
197 so it is easy to e.g. look at the first token of each line.
197 so it is easy to e.g. look at the first token of each line.
198 *tokens_by_line* is a list of lists of tokenize.TokenInfo objects.
198 *tokens_by_line* is a list of lists of tokenize.TokenInfo objects.
199
199
200 This should return an instance of its class, pointing to the start
200 This should return an instance of its class, pointing to the start
201 position it has found, or None if it found no match.
201 position it has found, or None if it found no match.
202 """
202 """
203 raise NotImplementedError
203 raise NotImplementedError
204
204
205 def transform(self, lines: List[str]):
205 def transform(self, lines: List[str]):
206 """Transform one instance of special syntax found by ``find()``
206 """Transform one instance of special syntax found by ``find()``
207
207
208 Takes a list of strings representing physical lines,
208 Takes a list of strings representing physical lines,
209 returns a similar list of transformed lines.
209 returns a similar list of transformed lines.
210 """
210 """
211 raise NotImplementedError
211 raise NotImplementedError
212
212
213 class MagicAssign(TokenTransformBase):
213 class MagicAssign(TokenTransformBase):
214 """Transformer for assignments from magics (a = %foo)"""
214 """Transformer for assignments from magics (a = %foo)"""
215 @classmethod
215 @classmethod
216 def find(cls, tokens_by_line):
216 def find(cls, tokens_by_line):
217 """Find the first magic assignment (a = %foo) in the cell.
217 """Find the first magic assignment (a = %foo) in the cell.
218 """
218 """
219 for line in tokens_by_line:
219 for line in tokens_by_line:
220 assign_ix = _find_assign_op(line)
220 assign_ix = _find_assign_op(line)
221 if (assign_ix is not None) \
221 if (assign_ix is not None) \
222 and (len(line) >= assign_ix + 2) \
222 and (len(line) >= assign_ix + 2) \
223 and (line[assign_ix+1].string == '%') \
223 and (line[assign_ix+1].string == '%') \
224 and (line[assign_ix+2].type == tokenize.NAME):
224 and (line[assign_ix+2].type == tokenize.NAME):
225 return cls(line[assign_ix+1].start)
225 return cls(line[assign_ix+1].start)
226
226
227 def transform(self, lines: List[str]):
227 def transform(self, lines: List[str]):
228 """Transform a magic assignment found by the ``find()`` classmethod.
228 """Transform a magic assignment found by the ``find()`` classmethod.
229 """
229 """
230 start_line, start_col = self.start_line, self.start_col
230 start_line, start_col = self.start_line, self.start_col
231 lhs = lines[start_line][:start_col]
231 lhs = lines[start_line][:start_col]
232 end_line = find_end_of_continued_line(lines, start_line)
232 end_line = find_end_of_continued_line(lines, start_line)
233 rhs = assemble_continued_line(lines, (start_line, start_col), end_line)
233 rhs = assemble_continued_line(lines, (start_line, start_col), end_line)
234 assert rhs.startswith('%'), rhs
234 assert rhs.startswith('%'), rhs
235 magic_name, _, args = rhs[1:].partition(' ')
235 magic_name, _, args = rhs[1:].partition(' ')
236
236
237 lines_before = lines[:start_line]
237 lines_before = lines[:start_line]
238 call = "get_ipython().run_line_magic({!r}, {!r})".format(magic_name, args)
238 call = "get_ipython().run_line_magic({!r}, {!r})".format(magic_name, args)
239 new_line = lhs + call + '\n'
239 new_line = lhs + call + '\n'
240 lines_after = lines[end_line+1:]
240 lines_after = lines[end_line+1:]
241
241
242 return lines_before + [new_line] + lines_after
242 return lines_before + [new_line] + lines_after
243
243
244
244
245 class SystemAssign(TokenTransformBase):
245 class SystemAssign(TokenTransformBase):
246 """Transformer for assignments from system commands (a = !foo)"""
246 """Transformer for assignments from system commands (a = !foo)"""
247 @classmethod
247 @classmethod
248 def find(cls, tokens_by_line):
248 def find(cls, tokens_by_line):
249 """Find the first system assignment (a = !foo) in the cell.
249 """Find the first system assignment (a = !foo) in the cell.
250 """
250 """
251 for line in tokens_by_line:
251 for line in tokens_by_line:
252 assign_ix = _find_assign_op(line)
252 assign_ix = _find_assign_op(line)
253 if (assign_ix is not None) \
253 if (assign_ix is not None) \
254 and not line[assign_ix].line.strip().startswith('=') \
254 and not line[assign_ix].line.strip().startswith('=') \
255 and (len(line) >= assign_ix + 2) \
255 and (len(line) >= assign_ix + 2) \
256 and (line[assign_ix + 1].type == tokenize.ERRORTOKEN):
256 and (line[assign_ix + 1].type == tokenize.ERRORTOKEN):
257 ix = assign_ix + 1
257 ix = assign_ix + 1
258
258
259 while ix < len(line) and line[ix].type == tokenize.ERRORTOKEN:
259 while ix < len(line) and line[ix].type == tokenize.ERRORTOKEN:
260 if line[ix].string == '!':
260 if line[ix].string == '!':
261 return cls(line[ix].start)
261 return cls(line[ix].start)
262 elif not line[ix].string.isspace():
262 elif not line[ix].string.isspace():
263 break
263 break
264 ix += 1
264 ix += 1
265
265
266 def transform(self, lines: List[str]):
266 def transform(self, lines: List[str]):
267 """Transform a system assignment found by the ``find()`` classmethod.
267 """Transform a system assignment found by the ``find()`` classmethod.
268 """
268 """
269 start_line, start_col = self.start_line, self.start_col
269 start_line, start_col = self.start_line, self.start_col
270
270
271 lhs = lines[start_line][:start_col]
271 lhs = lines[start_line][:start_col]
272 end_line = find_end_of_continued_line(lines, start_line)
272 end_line = find_end_of_continued_line(lines, start_line)
273 rhs = assemble_continued_line(lines, (start_line, start_col), end_line)
273 rhs = assemble_continued_line(lines, (start_line, start_col), end_line)
274 assert rhs.startswith('!'), rhs
274 assert rhs.startswith('!'), rhs
275 cmd = rhs[1:]
275 cmd = rhs[1:]
276
276
277 lines_before = lines[:start_line]
277 lines_before = lines[:start_line]
278 call = "get_ipython().getoutput({!r})".format(cmd)
278 call = "get_ipython().getoutput({!r})".format(cmd)
279 new_line = lhs + call + '\n'
279 new_line = lhs + call + '\n'
280 lines_after = lines[end_line + 1:]
280 lines_after = lines[end_line + 1:]
281
281
282 return lines_before + [new_line] + lines_after
282 return lines_before + [new_line] + lines_after
283
283
284 # The escape sequences that define the syntax transformations IPython will
284 # The escape sequences that define the syntax transformations IPython will
285 # apply to user input. These can NOT be just changed here: many regular
285 # apply to user input. These can NOT be just changed here: many regular
286 # expressions and other parts of the code may use their hardcoded values, and
286 # expressions and other parts of the code may use their hardcoded values, and
287 # for all intents and purposes they constitute the 'IPython syntax', so they
287 # for all intents and purposes they constitute the 'IPython syntax', so they
288 # should be considered fixed.
288 # should be considered fixed.
289
289
290 ESC_SHELL = '!' # Send line to underlying system shell
290 ESC_SHELL = '!' # Send line to underlying system shell
291 ESC_SH_CAP = '!!' # Send line to system shell and capture output
291 ESC_SH_CAP = '!!' # Send line to system shell and capture output
292 ESC_HELP = '?' # Find information about object
292 ESC_HELP = '?' # Find information about object
293 ESC_HELP2 = '??' # Find extra-detailed information about object
293 ESC_HELP2 = '??' # Find extra-detailed information about object
294 ESC_MAGIC = '%' # Call magic function
294 ESC_MAGIC = '%' # Call magic function
295 ESC_MAGIC2 = '%%' # Call cell-magic function
295 ESC_MAGIC2 = '%%' # Call cell-magic function
296 ESC_QUOTE = ',' # Split args on whitespace, quote each as string and call
296 ESC_QUOTE = ',' # Split args on whitespace, quote each as string and call
297 ESC_QUOTE2 = ';' # Quote all args as a single string, call
297 ESC_QUOTE2 = ';' # Quote all args as a single string, call
298 ESC_PAREN = '/' # Call first argument with rest of line as arguments
298 ESC_PAREN = '/' # Call first argument with rest of line as arguments
299
299
300 ESCAPE_SINGLES = {'!', '?', '%', ',', ';', '/'}
300 ESCAPE_SINGLES = {'!', '?', '%', ',', ';', '/'}
301 ESCAPE_DOUBLES = {'!!', '??'} # %% (cell magic) is handled separately
301 ESCAPE_DOUBLES = {'!!', '??'} # %% (cell magic) is handled separately
302
302
303 def _make_help_call(target, esc, next_input=None):
303 def _make_help_call(target, esc, next_input=None):
304 """Prepares a pinfo(2)/psearch call from a target name and the escape
304 """Prepares a pinfo(2)/psearch call from a target name and the escape
305 (i.e. ? or ??)"""
305 (i.e. ? or ??)"""
306 method = 'pinfo2' if esc == '??' \
306 method = 'pinfo2' if esc == '??' \
307 else 'psearch' if '*' in target \
307 else 'psearch' if '*' in target \
308 else 'pinfo'
308 else 'pinfo'
309 arg = " ".join([method, target])
309 arg = " ".join([method, target])
310 #Prepare arguments for get_ipython().run_line_magic(magic_name, magic_args)
310 #Prepare arguments for get_ipython().run_line_magic(magic_name, magic_args)
311 t_magic_name, _, t_magic_arg_s = arg.partition(' ')
311 t_magic_name, _, t_magic_arg_s = arg.partition(' ')
312 t_magic_name = t_magic_name.lstrip(ESC_MAGIC)
312 t_magic_name = t_magic_name.lstrip(ESC_MAGIC)
313 if next_input is None:
313 if next_input is None:
314 return 'get_ipython().run_line_magic(%r, %r)' % (t_magic_name, t_magic_arg_s)
314 return 'get_ipython().run_line_magic(%r, %r)' % (t_magic_name, t_magic_arg_s)
315 else:
315 else:
316 return 'get_ipython().set_next_input(%r);get_ipython().run_line_magic(%r, %r)' % \
316 return 'get_ipython().set_next_input(%r);get_ipython().run_line_magic(%r, %r)' % \
317 (next_input, t_magic_name, t_magic_arg_s)
317 (next_input, t_magic_name, t_magic_arg_s)
318
318
319 def _tr_help(content):
319 def _tr_help(content):
320 """Translate lines escaped with: ?
320 """Translate lines escaped with: ?
321
321
322 A naked help line should fire the intro help screen (shell.show_usage())
322 A naked help line should fire the intro help screen (shell.show_usage())
323 """
323 """
324 if not content:
324 if not content:
325 return 'get_ipython().show_usage()'
325 return 'get_ipython().show_usage()'
326
326
327 return _make_help_call(content, '?')
327 return _make_help_call(content, '?')
328
328
329 def _tr_help2(content):
329 def _tr_help2(content):
330 """Translate lines escaped with: ??
330 """Translate lines escaped with: ??
331
331
332 A naked help line should fire the intro help screen (shell.show_usage())
332 A naked help line should fire the intro help screen (shell.show_usage())
333 """
333 """
334 if not content:
334 if not content:
335 return 'get_ipython().show_usage()'
335 return 'get_ipython().show_usage()'
336
336
337 return _make_help_call(content, '??')
337 return _make_help_call(content, '??')
338
338
339 def _tr_magic(content):
339 def _tr_magic(content):
340 "Translate lines escaped with a percent sign: %"
340 "Translate lines escaped with a percent sign: %"
341 name, _, args = content.partition(' ')
341 name, _, args = content.partition(' ')
342 return 'get_ipython().run_line_magic(%r, %r)' % (name, args)
342 return 'get_ipython().run_line_magic(%r, %r)' % (name, args)
343
343
344 def _tr_quote(content):
344 def _tr_quote(content):
345 "Translate lines escaped with a comma: ,"
345 "Translate lines escaped with a comma: ,"
346 name, _, args = content.partition(' ')
346 name, _, args = content.partition(' ')
347 return '%s("%s")' % (name, '", "'.join(args.split()) )
347 return '%s("%s")' % (name, '", "'.join(args.split()) )
348
348
349 def _tr_quote2(content):
349 def _tr_quote2(content):
350 "Translate lines escaped with a semicolon: ;"
350 "Translate lines escaped with a semicolon: ;"
351 name, _, args = content.partition(' ')
351 name, _, args = content.partition(' ')
352 return '%s("%s")' % (name, args)
352 return '%s("%s")' % (name, args)
353
353
354 def _tr_paren(content):
354 def _tr_paren(content):
355 "Translate lines escaped with a slash: /"
355 "Translate lines escaped with a slash: /"
356 name, _, args = content.partition(' ')
356 name, _, args = content.partition(' ')
357 return '%s(%s)' % (name, ", ".join(args.split()))
357 return '%s(%s)' % (name, ", ".join(args.split()))
358
358
359 tr = { ESC_SHELL : 'get_ipython().system({!r})'.format,
359 tr = { ESC_SHELL : 'get_ipython().system({!r})'.format,
360 ESC_SH_CAP : 'get_ipython().getoutput({!r})'.format,
360 ESC_SH_CAP : 'get_ipython().getoutput({!r})'.format,
361 ESC_HELP : _tr_help,
361 ESC_HELP : _tr_help,
362 ESC_HELP2 : _tr_help2,
362 ESC_HELP2 : _tr_help2,
363 ESC_MAGIC : _tr_magic,
363 ESC_MAGIC : _tr_magic,
364 ESC_QUOTE : _tr_quote,
364 ESC_QUOTE : _tr_quote,
365 ESC_QUOTE2 : _tr_quote2,
365 ESC_QUOTE2 : _tr_quote2,
366 ESC_PAREN : _tr_paren }
366 ESC_PAREN : _tr_paren }
367
367
368 class EscapedCommand(TokenTransformBase):
368 class EscapedCommand(TokenTransformBase):
369 """Transformer for escaped commands like %foo, !foo, or /foo"""
369 """Transformer for escaped commands like %foo, !foo, or /foo"""
370 @classmethod
370 @classmethod
371 def find(cls, tokens_by_line):
371 def find(cls, tokens_by_line):
372 """Find the first escaped command (%foo, !foo, etc.) in the cell.
372 """Find the first escaped command (%foo, !foo, etc.) in the cell.
373 """
373 """
374 for line in tokens_by_line:
374 for line in tokens_by_line:
375 if not line:
375 if not line:
376 continue
376 continue
377 ix = 0
377 ix = 0
378 ll = len(line)
378 ll = len(line)
379 while ll > ix and line[ix].type in {tokenize.INDENT, tokenize.DEDENT}:
379 while ll > ix and line[ix].type in {tokenize.INDENT, tokenize.DEDENT}:
380 ix += 1
380 ix += 1
381 if ix >= ll:
381 if ix >= ll:
382 continue
382 continue
383 if line[ix].string in ESCAPE_SINGLES:
383 if line[ix].string in ESCAPE_SINGLES:
384 return cls(line[ix].start)
384 return cls(line[ix].start)
385
385
386 def transform(self, lines):
386 def transform(self, lines):
387 """Transform an escaped line found by the ``find()`` classmethod.
387 """Transform an escaped line found by the ``find()`` classmethod.
388 """
388 """
389 start_line, start_col = self.start_line, self.start_col
389 start_line, start_col = self.start_line, self.start_col
390
390
391 indent = lines[start_line][:start_col]
391 indent = lines[start_line][:start_col]
392 end_line = find_end_of_continued_line(lines, start_line)
392 end_line = find_end_of_continued_line(lines, start_line)
393 line = assemble_continued_line(lines, (start_line, start_col), end_line)
393 line = assemble_continued_line(lines, (start_line, start_col), end_line)
394
394
395 if len(line) > 1 and line[:2] in ESCAPE_DOUBLES:
395 if len(line) > 1 and line[:2] in ESCAPE_DOUBLES:
396 escape, content = line[:2], line[2:]
396 escape, content = line[:2], line[2:]
397 else:
397 else:
398 escape, content = line[:1], line[1:]
398 escape, content = line[:1], line[1:]
399
399
400 if escape in tr:
400 if escape in tr:
401 call = tr[escape](content)
401 call = tr[escape](content)
402 else:
402 else:
403 call = ''
403 call = ''
404
404
405 lines_before = lines[:start_line]
405 lines_before = lines[:start_line]
406 new_line = indent + call + '\n'
406 new_line = indent + call + '\n'
407 lines_after = lines[end_line + 1:]
407 lines_after = lines[end_line + 1:]
408
408
409 return lines_before + [new_line] + lines_after
409 return lines_before + [new_line] + lines_after
410
410
411 _help_end_re = re.compile(r"""(%{0,2}
411 _help_end_re = re.compile(r"""(%{0,2}
412 (?!\d)[\w*]+ # Variable name
412 (?!\d)[\w*]+ # Variable name
413 (\.(?!\d)[\w*]+)* # .etc.etc
413 (\.(?!\d)[\w*]+)* # .etc.etc
414 )
414 )
415 (\?\??)$ # ? or ??
415 (\?\??)$ # ? or ??
416 """,
416 """,
417 re.VERBOSE)
417 re.VERBOSE)
418
418
419 class HelpEnd(TokenTransformBase):
419 class HelpEnd(TokenTransformBase):
420 """Transformer for help syntax: obj? and obj??"""
420 """Transformer for help syntax: obj? and obj??"""
421 # This needs to be higher priority (lower number) than EscapedCommand so
421 # This needs to be higher priority (lower number) than EscapedCommand so
422 # that inspecting magics (%foo?) works.
422 # that inspecting magics (%foo?) works.
423 priority = 5
423 priority = 5
424
424
425 def __init__(self, start, q_locn):
425 def __init__(self, start, q_locn):
426 super().__init__(start)
426 super().__init__(start)
427 self.q_line = q_locn[0] - 1 # Shift from 1-indexed to 0-indexed
427 self.q_line = q_locn[0] - 1 # Shift from 1-indexed to 0-indexed
428 self.q_col = q_locn[1]
428 self.q_col = q_locn[1]
429
429
430 @classmethod
430 @classmethod
431 def find(cls, tokens_by_line):
431 def find(cls, tokens_by_line):
432 """Find the first help command (foo?) in the cell.
432 """Find the first help command (foo?) in the cell.
433 """
433 """
434 for line in tokens_by_line:
434 for line in tokens_by_line:
435 # Last token is NEWLINE; look at last but one
435 # Last token is NEWLINE; look at last but one
436 if len(line) > 2 and line[-2].string == '?':
436 if len(line) > 2 and line[-2].string == '?':
437 # Find the first token that's not INDENT/DEDENT
437 # Find the first token that's not INDENT/DEDENT
438 ix = 0
438 ix = 0
439 while line[ix].type in {tokenize.INDENT, tokenize.DEDENT}:
439 while line[ix].type in {tokenize.INDENT, tokenize.DEDENT}:
440 ix += 1
440 ix += 1
441 return cls(line[ix].start, line[-2].start)
441 return cls(line[ix].start, line[-2].start)
442
442
443 def transform(self, lines):
443 def transform(self, lines):
444 """Transform a help command found by the ``find()`` classmethod.
444 """Transform a help command found by the ``find()`` classmethod.
445 """
445 """
446 piece = ''.join(lines[self.start_line:self.q_line+1])
446 piece = ''.join(lines[self.start_line:self.q_line+1])
447 indent, content = piece[:self.start_col], piece[self.start_col:]
447 indent, content = piece[:self.start_col], piece[self.start_col:]
448 lines_before = lines[:self.start_line]
448 lines_before = lines[:self.start_line]
449 lines_after = lines[self.q_line + 1:]
449 lines_after = lines[self.q_line + 1:]
450
450
451 m = _help_end_re.search(content)
451 m = _help_end_re.search(content)
452 if not m:
452 if not m:
453 raise SyntaxError(content)
453 raise SyntaxError(content)
454 assert m is not None, content
454 assert m is not None, content
455 target = m.group(1)
455 target = m.group(1)
456 esc = m.group(3)
456 esc = m.group(3)
457
457
458 # If we're mid-command, put it back on the next prompt for the user.
458 # If we're mid-command, put it back on the next prompt for the user.
459 next_input = None
459 next_input = None
460 if (not lines_before) and (not lines_after) \
460 if (not lines_before) and (not lines_after) \
461 and content.strip() != m.group(0):
461 and content.strip() != m.group(0):
462 next_input = content.rstrip('?\n')
462 next_input = content.rstrip('?\n')
463
463
464 call = _make_help_call(target, esc, next_input=next_input)
464 call = _make_help_call(target, esc, next_input=next_input)
465 new_line = indent + call + '\n'
465 new_line = indent + call + '\n'
466
466
467 return lines_before + [new_line] + lines_after
467 return lines_before + [new_line] + lines_after
468
468
469 def make_tokens_by_line(lines:List[str]):
469 def make_tokens_by_line(lines:List[str]):
470 """Tokenize a series of lines and group tokens by line.
470 """Tokenize a series of lines and group tokens by line.
471
471
472 The tokens for a multiline Python string or expression are grouped as one
472 The tokens for a multiline Python string or expression are grouped as one
473 line. All lines except the last lines should keep their line ending ('\\n',
473 line. All lines except the last lines should keep their line ending ('\\n',
474 '\\r\\n') for this to properly work. Use `.splitlines(keeplineending=True)`
474 '\\r\\n') for this to properly work. Use `.splitlines(keeplineending=True)`
475 for example when passing block of text to this function.
475 for example when passing block of text to this function.
476
476
477 """
477 """
478 # NL tokens are used inside multiline expressions, but also after blank
478 # NL tokens are used inside multiline expressions, but also after blank
479 # lines or comments. This is intentional - see https://bugs.python.org/issue17061
479 # lines or comments. This is intentional - see https://bugs.python.org/issue17061
480 # We want to group the former case together but split the latter, so we
480 # We want to group the former case together but split the latter, so we
481 # track parentheses level, similar to the internals of tokenize.
481 # track parentheses level, similar to the internals of tokenize.
482
482
483 # reexported from token on 3.7+
483 # reexported from token on 3.7+
484 NEWLINE, NL = tokenize.NEWLINE, tokenize.NL # type: ignore
484 NEWLINE, NL = tokenize.NEWLINE, tokenize.NL # type: ignore
485 tokens_by_line:List[List[Any]] = [[]]
485 tokens_by_line:List[List[Any]] = [[]]
486 if len(lines) > 1 and not lines[0].endswith(('\n', '\r', '\r\n', '\x0b', '\x0c')):
486 if len(lines) > 1 and not lines[0].endswith(('\n', '\r', '\r\n', '\x0b', '\x0c')):
487 warnings.warn("`make_tokens_by_line` received a list of lines which do not have lineending markers ('\\n', '\\r', '\\r\\n', '\\x0b', '\\x0c'), behavior will be unspecified")
487 warnings.warn("`make_tokens_by_line` received a list of lines which do not have lineending markers ('\\n', '\\r', '\\r\\n', '\\x0b', '\\x0c'), behavior will be unspecified")
488 parenlev = 0
488 parenlev = 0
489 try:
489 try:
490 for token in tokenize.generate_tokens(iter(lines).__next__):
490 for token in tokenize.generate_tokens(iter(lines).__next__):
491 tokens_by_line[-1].append(token)
491 tokens_by_line[-1].append(token)
492 if (token.type == NEWLINE) \
492 if (token.type == NEWLINE) \
493 or ((token.type == NL) and (parenlev <= 0)):
493 or ((token.type == NL) and (parenlev <= 0)):
494 tokens_by_line.append([])
494 tokens_by_line.append([])
495 elif token.string in {'(', '[', '{'}:
495 elif token.string in {'(', '[', '{'}:
496 parenlev += 1
496 parenlev += 1
497 elif token.string in {')', ']', '}'}:
497 elif token.string in {')', ']', '}'}:
498 if parenlev > 0:
498 if parenlev > 0:
499 parenlev -= 1
499 parenlev -= 1
500 except tokenize.TokenError:
500 except tokenize.TokenError:
501 # Input ended in a multiline string or expression. That's OK for us.
501 # Input ended in a multiline string or expression. That's OK for us.
502 pass
502 pass
503
503
504
504
505 if not tokens_by_line[-1]:
505 if not tokens_by_line[-1]:
506 tokens_by_line.pop()
506 tokens_by_line.pop()
507
507
508
508
509 return tokens_by_line
509 return tokens_by_line
510
510
511
511
512 def has_sunken_brackets(tokens: List[tokenize.TokenInfo]):
512 def has_sunken_brackets(tokens: List[tokenize.TokenInfo]):
513 """Check if the depth of brackets in the list of tokens drops below 0"""
513 """Check if the depth of brackets in the list of tokens drops below 0"""
514 parenlev = 0
514 parenlev = 0
515 for token in tokens:
515 for token in tokens:
516 if token.string in {"(", "[", "{"}:
516 if token.string in {"(", "[", "{"}:
517 parenlev += 1
517 parenlev += 1
518 elif token.string in {")", "]", "}"}:
518 elif token.string in {")", "]", "}"}:
519 parenlev -= 1
519 parenlev -= 1
520 if parenlev < 0:
520 if parenlev < 0:
521 return True
521 return True
522 return False
522 return False
523
523
524
524
525 def show_linewise_tokens(s: str):
525 def show_linewise_tokens(s: str):
526 """For investigation and debugging"""
526 """For investigation and debugging"""
527 if not s.endswith('\n'):
527 if not s.endswith('\n'):
528 s += '\n'
528 s += '\n'
529 lines = s.splitlines(keepends=True)
529 lines = s.splitlines(keepends=True)
530 for line in make_tokens_by_line(lines):
530 for line in make_tokens_by_line(lines):
531 print("Line -------")
531 print("Line -------")
532 for tokinfo in line:
532 for tokinfo in line:
533 print(" ", tokinfo)
533 print(" ", tokinfo)
534
534
535 # Arbitrary limit to prevent getting stuck in infinite loops
535 # Arbitrary limit to prevent getting stuck in infinite loops
536 TRANSFORM_LOOP_LIMIT = 500
536 TRANSFORM_LOOP_LIMIT = 500
537
537
538 class TransformerManager:
538 class TransformerManager:
539 """Applies various transformations to a cell or code block.
539 """Applies various transformations to a cell or code block.
540
540
541 The key methods for external use are ``transform_cell()``
541 The key methods for external use are ``transform_cell()``
542 and ``check_complete()``.
542 and ``check_complete()``.
543 """
543 """
544 def __init__(self):
544 def __init__(self):
545 self.cleanup_transforms = [
545 self.cleanup_transforms = [
546 leading_empty_lines,
546 leading_empty_lines,
547 leading_indent,
547 leading_indent,
548 classic_prompt,
548 classic_prompt,
549 ipython_prompt,
549 ipython_prompt,
550 ]
550 ]
551 self.line_transforms = [
551 self.line_transforms = [
552 cell_magic,
552 cell_magic,
553 ]
553 ]
554 self.token_transformers = [
554 self.token_transformers = [
555 MagicAssign,
555 MagicAssign,
556 SystemAssign,
556 SystemAssign,
557 EscapedCommand,
557 EscapedCommand,
558 HelpEnd,
558 HelpEnd,
559 ]
559 ]
560
560
561 def do_one_token_transform(self, lines):
561 def do_one_token_transform(self, lines):
562 """Find and run the transform earliest in the code.
562 """Find and run the transform earliest in the code.
563
563
564 Returns (changed, lines).
564 Returns (changed, lines).
565
565
566 This method is called repeatedly until changed is False, indicating
566 This method is called repeatedly until changed is False, indicating
567 that all available transformations are complete.
567 that all available transformations are complete.
568
568
569 The tokens following IPython special syntax might not be valid, so
569 The tokens following IPython special syntax might not be valid, so
570 the transformed code is retokenised every time to identify the next
570 the transformed code is retokenised every time to identify the next
571 piece of special syntax. Hopefully long code cells are mostly valid
571 piece of special syntax. Hopefully long code cells are mostly valid
572 Python, not using lots of IPython special syntax, so this shouldn't be
572 Python, not using lots of IPython special syntax, so this shouldn't be
573 a performance issue.
573 a performance issue.
574 """
574 """
575 tokens_by_line = make_tokens_by_line(lines)
575 tokens_by_line = make_tokens_by_line(lines)
576 candidates = []
576 candidates = []
577 for transformer_cls in self.token_transformers:
577 for transformer_cls in self.token_transformers:
578 transformer = transformer_cls.find(tokens_by_line)
578 transformer = transformer_cls.find(tokens_by_line)
579 if transformer:
579 if transformer:
580 candidates.append(transformer)
580 candidates.append(transformer)
581
581
582 if not candidates:
582 if not candidates:
583 # Nothing to transform
583 # Nothing to transform
584 return False, lines
584 return False, lines
585 ordered_transformers = sorted(candidates, key=TokenTransformBase.sortby)
585 ordered_transformers = sorted(candidates, key=TokenTransformBase.sortby)
586 for transformer in ordered_transformers:
586 for transformer in ordered_transformers:
587 try:
587 try:
588 return True, transformer.transform(lines)
588 return True, transformer.transform(lines)
589 except SyntaxError:
589 except SyntaxError:
590 pass
590 pass
591 return False, lines
591 return False, lines
592
592
593 def do_token_transforms(self, lines):
593 def do_token_transforms(self, lines):
594 for _ in range(TRANSFORM_LOOP_LIMIT):
594 for _ in range(TRANSFORM_LOOP_LIMIT):
595 changed, lines = self.do_one_token_transform(lines)
595 changed, lines = self.do_one_token_transform(lines)
596 if not changed:
596 if not changed:
597 return lines
597 return lines
598
598
599 raise RuntimeError("Input transformation still changing after "
599 raise RuntimeError("Input transformation still changing after "
600 "%d iterations. Aborting." % TRANSFORM_LOOP_LIMIT)
600 "%d iterations. Aborting." % TRANSFORM_LOOP_LIMIT)
601
601
602 def transform_cell(self, cell: str) -> str:
602 def transform_cell(self, cell: str) -> str:
603 """Transforms a cell of input code"""
603 """Transforms a cell of input code"""
604 if not cell.endswith('\n'):
604 if not cell.endswith('\n'):
605 cell += '\n' # Ensure the cell has a trailing newline
605 cell += '\n' # Ensure the cell has a trailing newline
606 lines = cell.splitlines(keepends=True)
606 lines = cell.splitlines(keepends=True)
607 for transform in self.cleanup_transforms + self.line_transforms:
607 for transform in self.cleanup_transforms + self.line_transforms:
608 lines = transform(lines)
608 lines = transform(lines)
609
609
610 lines = self.do_token_transforms(lines)
610 lines = self.do_token_transforms(lines)
611 return ''.join(lines)
611 return ''.join(lines)
612
612
613 def check_complete(self, cell: str):
613 def check_complete(self, cell: str):
614 """Return whether a block of code is ready to execute, or should be continued
614 """Return whether a block of code is ready to execute, or should be continued
615
615
616 Parameters
616 Parameters
617 ----------
617 ----------
618 source : string
618 source : string
619 Python input code, which can be multiline.
619 Python input code, which can be multiline.
620
620
621 Returns
621 Returns
622 -------
622 -------
623 status : str
623 status : str
624 One of 'complete', 'incomplete', or 'invalid' if source is not a
624 One of 'complete', 'incomplete', or 'invalid' if source is not a
625 prefix of valid code.
625 prefix of valid code.
626 indent_spaces : int or None
626 indent_spaces : int or None
627 The number of spaces by which to indent the next line of code. If
627 The number of spaces by which to indent the next line of code. If
628 status is not 'incomplete', this is None.
628 status is not 'incomplete', this is None.
629 """
629 """
630 # Remember if the lines ends in a new line.
630 # Remember if the lines ends in a new line.
631 ends_with_newline = False
631 ends_with_newline = False
632 for character in reversed(cell):
632 for character in reversed(cell):
633 if character == '\n':
633 if character == '\n':
634 ends_with_newline = True
634 ends_with_newline = True
635 break
635 break
636 elif character.strip():
636 elif character.strip():
637 break
637 break
638 else:
638 else:
639 continue
639 continue
640
640
641 if not ends_with_newline:
641 if not ends_with_newline:
642 # Append an newline for consistent tokenization
642 # Append an newline for consistent tokenization
643 # See https://bugs.python.org/issue33899
643 # See https://bugs.python.org/issue33899
644 cell += '\n'
644 cell += '\n'
645
645
646 lines = cell.splitlines(keepends=True)
646 lines = cell.splitlines(keepends=True)
647
647
648 if not lines:
648 if not lines:
649 return 'complete', None
649 return 'complete', None
650
650
651 if lines[-1].endswith('\\'):
651 if lines[-1].endswith('\\'):
652 # Explicit backslash continuation
652 # Explicit backslash continuation
653 return 'incomplete', find_last_indent(lines)
653 return 'incomplete', find_last_indent(lines)
654
654
655 try:
655 try:
656 for transform in self.cleanup_transforms:
656 for transform in self.cleanup_transforms:
657 if not getattr(transform, 'has_side_effects', False):
657 if not getattr(transform, 'has_side_effects', False):
658 lines = transform(lines)
658 lines = transform(lines)
659 except SyntaxError:
659 except SyntaxError:
660 return 'invalid', None
660 return 'invalid', None
661
661
662 if lines[0].startswith('%%'):
662 if lines[0].startswith('%%'):
663 # Special case for cell magics - completion marked by blank line
663 # Special case for cell magics - completion marked by blank line
664 if lines[-1].strip():
664 if lines[-1].strip():
665 return 'incomplete', find_last_indent(lines)
665 return 'incomplete', find_last_indent(lines)
666 else:
666 else:
667 return 'complete', None
667 return 'complete', None
668
668
669 try:
669 try:
670 for transform in self.line_transforms:
670 for transform in self.line_transforms:
671 if not getattr(transform, 'has_side_effects', False):
671 if not getattr(transform, 'has_side_effects', False):
672 lines = transform(lines)
672 lines = transform(lines)
673 lines = self.do_token_transforms(lines)
673 lines = self.do_token_transforms(lines)
674 except SyntaxError:
674 except SyntaxError:
675 return 'invalid', None
675 return 'invalid', None
676
676
677 tokens_by_line = make_tokens_by_line(lines)
677 tokens_by_line = make_tokens_by_line(lines)
678
678
679 # Bail if we got one line and there are more closing parentheses than
679 # Bail if we got one line and there are more closing parentheses than
680 # the opening ones
680 # the opening ones
681 if len(lines) == 1 and has_sunken_brackets(tokens_by_line[0]):
681 if (
682 len(lines) == 1
683 and tokens_by_line
684 and has_sunken_brackets(tokens_by_line[0])
685 ):
682 return "invalid", None
686 return "invalid", None
683
687
684 if not tokens_by_line:
688 if not tokens_by_line:
685 return 'incomplete', find_last_indent(lines)
689 return 'incomplete', find_last_indent(lines)
686
690
687 if tokens_by_line[-1][-1].type != tokenize.ENDMARKER:
691 if tokens_by_line[-1][-1].type != tokenize.ENDMARKER:
688 # We're in a multiline string or expression
692 # We're in a multiline string or expression
689 return 'incomplete', find_last_indent(lines)
693 return 'incomplete', find_last_indent(lines)
690
694
691 newline_types = {tokenize.NEWLINE, tokenize.COMMENT, tokenize.ENDMARKER} # type: ignore
695 newline_types = {tokenize.NEWLINE, tokenize.COMMENT, tokenize.ENDMARKER} # type: ignore
692
696
693 # Pop the last line which only contains DEDENTs and ENDMARKER
697 # Pop the last line which only contains DEDENTs and ENDMARKER
694 last_token_line = None
698 last_token_line = None
695 if {t.type for t in tokens_by_line[-1]} in [
699 if {t.type for t in tokens_by_line[-1]} in [
696 {tokenize.DEDENT, tokenize.ENDMARKER},
700 {tokenize.DEDENT, tokenize.ENDMARKER},
697 {tokenize.ENDMARKER}
701 {tokenize.ENDMARKER}
698 ] and len(tokens_by_line) > 1:
702 ] and len(tokens_by_line) > 1:
699 last_token_line = tokens_by_line.pop()
703 last_token_line = tokens_by_line.pop()
700
704
701 while tokens_by_line[-1] and tokens_by_line[-1][-1].type in newline_types:
705 while tokens_by_line[-1] and tokens_by_line[-1][-1].type in newline_types:
702 tokens_by_line[-1].pop()
706 tokens_by_line[-1].pop()
703
707
704 if not tokens_by_line[-1]:
708 if not tokens_by_line[-1]:
705 return 'incomplete', find_last_indent(lines)
709 return 'incomplete', find_last_indent(lines)
706
710
707 if tokens_by_line[-1][-1].string == ':':
711 if tokens_by_line[-1][-1].string == ':':
708 # The last line starts a block (e.g. 'if foo:')
712 # The last line starts a block (e.g. 'if foo:')
709 ix = 0
713 ix = 0
710 while tokens_by_line[-1][ix].type in {tokenize.INDENT, tokenize.DEDENT}:
714 while tokens_by_line[-1][ix].type in {tokenize.INDENT, tokenize.DEDENT}:
711 ix += 1
715 ix += 1
712
716
713 indent = tokens_by_line[-1][ix].start[1]
717 indent = tokens_by_line[-1][ix].start[1]
714 return 'incomplete', indent + 4
718 return 'incomplete', indent + 4
715
719
716 if tokens_by_line[-1][0].line.endswith('\\'):
720 if tokens_by_line[-1][0].line.endswith('\\'):
717 return 'incomplete', None
721 return 'incomplete', None
718
722
719 # At this point, our checks think the code is complete (or invalid).
723 # At this point, our checks think the code is complete (or invalid).
720 # We'll use codeop.compile_command to check this with the real parser
724 # We'll use codeop.compile_command to check this with the real parser
721 try:
725 try:
722 with warnings.catch_warnings():
726 with warnings.catch_warnings():
723 warnings.simplefilter('error', SyntaxWarning)
727 warnings.simplefilter('error', SyntaxWarning)
724 res = compile_command(''.join(lines), symbol='exec')
728 res = compile_command(''.join(lines), symbol='exec')
725 except (SyntaxError, OverflowError, ValueError, TypeError,
729 except (SyntaxError, OverflowError, ValueError, TypeError,
726 MemoryError, SyntaxWarning):
730 MemoryError, SyntaxWarning):
727 return 'invalid', None
731 return 'invalid', None
728 else:
732 else:
729 if res is None:
733 if res is None:
730 return 'incomplete', find_last_indent(lines)
734 return 'incomplete', find_last_indent(lines)
731
735
732 if last_token_line and last_token_line[0].type == tokenize.DEDENT:
736 if last_token_line and last_token_line[0].type == tokenize.DEDENT:
733 if ends_with_newline:
737 if ends_with_newline:
734 return 'complete', None
738 return 'complete', None
735 return 'incomplete', find_last_indent(lines)
739 return 'incomplete', find_last_indent(lines)
736
740
737 # If there's a blank line at the end, assume we're ready to execute
741 # If there's a blank line at the end, assume we're ready to execute
738 if not lines[-1].strip():
742 if not lines[-1].strip():
739 return 'complete', None
743 return 'complete', None
740
744
741 return 'complete', None
745 return 'complete', None
742
746
743
747
744 def find_last_indent(lines):
748 def find_last_indent(lines):
745 m = _indent_re.match(lines[-1])
749 m = _indent_re.match(lines[-1])
746 if not m:
750 if not m:
747 return 0
751 return 0
748 return len(m.group(0).replace('\t', ' '*4))
752 return len(m.group(0).replace('\t', ' '*4))
General Comments 0
You need to be logged in to leave comments. Login now