mirror of
https://github.com/xonsh/xonsh.git
synced 2025-03-04 16:34:47 +01:00
Merge branch 'fix_double_wrapping_check' of github.com:adqm/xonsh into adqm-fix_double_wrapping_check
This commit is contained in:
commit
ad21481f46
1 changed files with 5 additions and 5 deletions
|
@ -185,15 +185,15 @@ class Execer(object):
|
|||
if prev_indent == curr_indent:
|
||||
raise original_error
|
||||
maxcol = self._find_next_break(line, last_error_col)
|
||||
if line.startswith('$['):
|
||||
# if we have already wrapped this in subproc tokens
|
||||
# and it still doesn't work, adding more won't help
|
||||
# anything
|
||||
raise original_error
|
||||
sbpline = subproc_toks(line,
|
||||
returnline=True,
|
||||
maxcol=maxcol,
|
||||
lexer=self.parser.lexer)
|
||||
if sbpline.startswith('$[$['):
|
||||
# if we have already wrapped this in subproc tokens
|
||||
# and it still doesn't work, adding more won't help
|
||||
# anything
|
||||
raise original_error
|
||||
if sbpline is None:
|
||||
# subprocess line had no valid tokens, likely because
|
||||
# it only contained a comment.
|
||||
|
|
Loading…
Add table
Reference in a new issue