PY-12360 Fix test data in remaining tests, commit document after modification

python/src/com/jetbrains/python/formatter/PyTrailingBlankLinesPostFormatProcessor.java

@@ -64,7 +64,7 @@ public class PyTrailingBlankLinesPostFormatProcessor implements PostFormatProces
     if (rangeToReformat.intersects(oldWhitespaceRange)) {
       final TextRange newWhitespaceRange = replaceOrDeleteTrailingWhitespaces((PyFile)source, oldWhitespaceRange);
       final int delta = newWhitespaceRange.getLength() - oldWhitespaceRange.getLength();
-      if (newWhitespaceRange.contains(oldWhitespaceRange)) {
+      if (oldWhitespaceRange.contains(rangeToReformat)) {
         return newWhitespaceRange;
       }
       else if (rangeToReformat.contains(oldWhitespaceRange)) {
@@ -109,19 +109,24 @@ public class PyTrailingBlankLinesPostFormatProcessor implements PostFormatProces
         numLineFeeds = 1;
       }
       documentManager.doPostponedOperationsAndUnblockDocument(document);
-      final String text = StringUtil.repeat("\n", numLineFeeds);
-      if (numLineFeeds > 0 && whitespaceRange.getStartOffset() != 0) {
-        if (!whitespaceRange.isEmpty()) {
-          document.replaceString(whitespaceRange.getStartOffset(), whitespaceRange.getEndOffset(), text);
+      try {
+        final String text = StringUtil.repeat("\n", numLineFeeds);
+        if (numLineFeeds > 0 && whitespaceRange.getStartOffset() != 0) {
+          if (!whitespaceRange.isEmpty()) {
+            document.replaceString(whitespaceRange.getStartOffset(), whitespaceRange.getEndOffset(), text);
+          }
+          else {
+            document.insertString(document.getTextLength(), text);
+          }
         }
-        else {
-          document.insertString(document.getTextLength(), text);
+        else if (!whitespaceRange.isEmpty()) {
+          document.deleteString(whitespaceRange.getStartOffset(), whitespaceRange.getEndOffset());
         }
+        return TextRange.from(whitespaceRange.getStartOffset(), text.length());
       }
-      else if (!whitespaceRange.isEmpty()) {
-        document.deleteString(whitespaceRange.getStartOffset(), whitespaceRange.getEndOffset());
+      finally {
+        documentManager.commitDocument(document);
       }
-      return TextRange.from(whitespaceRange.getStartOffset(), text.length());
     }
     return whitespaceRange;
   }

python/testData/formatter/hangingIndentInKeyValuePair_after.py

@@ -2,4 +2,4 @@ example = {'breakfast': {
     'eggs': 1,
     'spam': 2
 }
-}
+}

python/testData/refactoring/inlinelocal/methodCallInlinedAsQualifier.after.py

@@ -1 +1 @@
-a.method().strip()
+a.method().strip()

python/testData/refactoring/inlinelocal/multiple.after.py

@@ -22,4 +22,4 @@ voo = 10 + 10
 woo = 10 + 10
 xoo = 10 + 10
 yoo = 10 + 10
-zoo = 10 + 10
+zoo = 10 + 10

python/testData/refactoring/inlinelocal/priority.after.py

@@ -1 +1 @@
-boo = (100 + 100) * 100
+boo = (100 + 100) * 100

python/testData/refactoring/inlinelocal/py5832.after.py

@@ -2,4 +2,4 @@ def foo(arg):
     print arg
 
 
-foo(('a', 'b'))
+foo(('a', 'b'))

python/testData/refactoring/inlinelocal/py994.after.py

@@ -1,3 +1,3 @@
 class C:
     def foo(self):
-        return Conference()
+        return Conference()

python/testData/refactoring/inlinelocal/referenceInParenthesis.after.py

@@ -1,3 +1,3 @@
 print ('spam!' * 42)
 ('spam!' * 42)
-hex('spam!' * 42)
+hex('spam!' * 42)

python/testData/refactoring/inlinelocal/resultExceedsRightMargin.after.py

@@ -1,3 +1,3 @@
 result = '123456789|123456789|123456789|123456789|123456789|' + \
          '123456789|123456789|123456789|123456789|123456789|' + \
-         '123456789|123456789|123456789|123456789|123456789|'
+         '123456789|123456789|123456789|123456789|123456789|'

python/testData/refactoring/inlinelocal/simple.after.py

@@ -1 +1 @@
-boo = 10
+boo = 10