Merge pull request #3576 from rlaverde/fix-autoindentation-after-data…

…-structures Fix autoindentation after data structures.
spyder-ide · Oct 22, 2016 · c5434b4 · c5434b4
2 parents 9434aa6 + 6ccaf87
commit c5434b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/spyder/widgets/sourcecode/codeeditor.py b/spyder/widgets/sourcecode/codeeditor.py
@@ -1957,8 +1957,10 @@ def fix_indent(self, forward=True, comment_or_string=False):
                                 break
                 else:
                     if prevtext.strip():
-                        prevexpr = re.split(r'\(|\{|\[', prevtext)[-1]
-                        correct_indent = len(prevtext)-len(prevexpr)
+                        if len(re.split(r'\(|\{|\[', prevtext)) > 1:
+                            #correct indent only if there are still opening brackets
+                            prevexpr = re.split(r'\(|\{|\[', prevtext)[-1]
+                            correct_indent = len(prevtext)-len(prevexpr)
                     else:
                         correct_indent = len(prevtext)
 

diff --git a/spyder/widgets/sourcecode/tests/test_autoindent.py b/spyder/widgets/sourcecode/tests/test_autoindent.py
@@ -49,6 +49,9 @@ def test_def_with_indented_comment():
     text = get_indent_fix("def function():\n    # Comment\n")
     assert text == "def function():\n    # Comment\n    ", repr(text)
 
+def test_brackets_alone():
+    text = get_indent_fix("def function():\n    print []\n")
+    assert text == "def function():\n    print []\n    ", repr(text)
 
 # --- Failing tests
 # -----------------------------------------------------------------------------
@@ -70,11 +73,5 @@ def test_open_parenthesis():
     assert text == "open_parenthesis(\n    ", repr(text)
 
 
-@pytest.mark.xfail
-def test_brackets_alone():
-    text = get_indent_fix("def function():\n    print []\n")
-    assert text == "def function():\n    print []\n    ", repr(text)
-
-
 if __name__ == "__main__":
     pytest.main()