Auto-import before object declaration corrupts code

idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java

@@ -50,6 +50,7 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder {
                 .between(IMPORT_DIRECTIVE, CLASS).blankLines(1)
                 .between(IMPORT_DIRECTIVE, FUN).blankLines(1)
                 .between(IMPORT_DIRECTIVE, PROPERTY).blankLines(1)
+                .between(IMPORT_DIRECTIVE, OBJECT_DECLARATION).blankLines(1)
 
                 .before(FUN).lineBreakInCode()
                 .before(PROPERTY).lineBreakInCode()

idea/testData/quickfix/importHelper/ImportBeforeObject.kt

@@ -0,0 +1,2 @@
+object some {
+}

idea/testData/quickfix/importHelper/ImportBeforeObject.kt.after

@@ -0,0 +1,4 @@
+import java.util.HashSet
+
+object some {
+}

idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java

@@ -28,26 +28,19 @@ import java.io.IOException;
  */
 public class ImportClassHelperTest extends LightDaemonAnalyzerTestCase {
     public void testDoNotImportIfGeneralExist() {
-        configureByFile(getTestName(false) + ".kt");
+        testImportInFile("jettesting.data.testFunction");
-        ImportClassHelper.addImportDirective("jettesting.data.testFunction", (JetFile) getFile());
-        checkResultByFile(getTestName(false) + ".kt.after");
     }
 
     public void testDoNotImportIfGeneralSpaceExist() {
-        configureByFile(getTestName(false) + ".kt");
+        testImportInFile("jettesting.data.testFunction");
-        ImportClassHelper.addImportDirective("jettesting.data.testFunction", (JetFile) getFile());
-        checkResultByFile(getTestName(false) + ".kt.after");
     }
 
     public void testNoDefaultImport() {
-        configureByFile(getTestName(false) + ".kt");
+        testImportInFile("std.io.println");
-        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+    }
-            @Override
+
-            public void run() {
+    public void testImportBeforeObject() {
-                ImportClassHelper.addImportDirective("std.io.println", (JetFile) getFile());
+        testImportInFile("java.util.HashSet");
-            }
-        });
-        checkResultByFile(getTestName(false) + ".kt.after");
     }
 
     public void testInsertInEmptyFile() throws IOException {
@@ -74,6 +67,17 @@ public class ImportClassHelperTest extends LightDaemonAnalyzerTestCase {
         checkResultByText("package some\n\nimport java.util.ArrayList");
     }
 
+    public void testImportInFile(final String importString) {
+        configureByFile(getTestName(false) + ".kt");
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+            @Override
+            public void run() {
+                ImportClassHelper.addImportDirective(importString, (JetFile) getFile());
+            }
+        });
+        checkResultByFile(getTestName(false) + ".kt.after");
+    }
+
     @Override
     protected String getTestDataPath() {
         return PluginTestCaseBase.getTestDataPathBase() + "/quickfix/importHelper/";