##// END OF EJS Templates
Bail on singleline cells with sunken brackets...
Blazej Michalik -
Show More
@@ -508,6 +508,20 b' def make_tokens_by_line(lines:List[str]):'
508
508
509 return tokens_by_line
509 return tokens_by_line
510
510
511
512 def has_sunken_brackets(tokens: List[tokenize.TokenInfo]):
513 """Check if the depth of brackets in the list of tokens drops below 0"""
514 parenlev = 0
515 for token in tokens:
516 if token.string in {"(", "[", "{"}:
517 parenlev += 1
518 elif token.string in {")", "]", "}"}:
519 parenlev -= 1
520 if parenlev < 0:
521 return True
522 return False
523
524
511 def show_linewise_tokens(s: str):
525 def show_linewise_tokens(s: str):
512 """For investigation and debugging"""
526 """For investigation and debugging"""
513 if not s.endswith('\n'):
527 if not s.endswith('\n'):
@@ -662,6 +676,11 b' class TransformerManager:'
662
676
663 tokens_by_line = make_tokens_by_line(lines)
677 tokens_by_line = make_tokens_by_line(lines)
664
678
679 # Bail if we got one line and there are more closing parentheses than
680 # the opening ones
681 if len(lines) == 1 and has_sunken_brackets(tokens_by_line[0]):
682 return "invalid", None
683
665 if not tokens_by_line:
684 if not tokens_by_line:
666 return 'incomplete', find_last_indent(lines)
685 return 'incomplete', find_last_indent(lines)
667
686
@@ -297,6 +297,24 b' def test_check_complete_II():'
297 nt.assert_equal(cc('''def foo():\n """'''), ('incomplete', 4))
297 nt.assert_equal(cc('''def foo():\n """'''), ('incomplete', 4))
298
298
299
299
300 def test_check_complete_invalidates_sunken_brackets():
301 """
302 Test that a single line with more closing brackets than the opening ones is
303 interpretted as invalid
304 """
305 cc = ipt2.TransformerManager().check_complete
306 nt.assert_equal(cc(")"), ("invalid", None))
307 nt.assert_equal(cc("]"), ("invalid", None))
308 nt.assert_equal(cc("}"), ("invalid", None))
309 nt.assert_equal(cc(")("), ("invalid", None))
310 nt.assert_equal(cc("]["), ("invalid", None))
311 nt.assert_equal(cc("}{"), ("invalid", None))
312 nt.assert_equal(cc("[()("), ("invalid", None))
313 nt.assert_equal(cc("())("), ("invalid", None))
314 nt.assert_equal(cc(")[]("), ("invalid", None))
315 nt.assert_equal(cc("()]("), ("invalid", None))
316
317
300 def test_null_cleanup_transformer():
318 def test_null_cleanup_transformer():
301 manager = ipt2.TransformerManager()
319 manager = ipt2.TransformerManager()
302 manager.cleanup_transforms.insert(0, null_cleanup_transformer)
320 manager.cleanup_transforms.insert(0, null_cleanup_transformer)
General Comments 0
You need to be logged in to leave comments. Login now