Merge pull request #656 from JetBrains/rr/yole/kt7483

fix JetPsiUtil.deleteClass() so that it no longer tries to delete the en...

compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java

@@ -288,7 +288,7 @@ public class JetPsiUtil {
     public static void deleteClass(@NotNull JetClassOrObject clazz) {
         CheckUtil.checkWritable(clazz);
         JetFile file = clazz.getContainingJetFile();
-        if (clazz.isLocal() || file.getDeclarations().size() > 1) {
+        if (!clazz.isTopLevel() || file.getDeclarations().size() > 1) {
             PsiElement parent = clazz.getParent();
             CodeEditUtil.removeChild(parent.getNode(), clazz.getNode());
         }

idea/testData/safeDelete/deleteObject/kotlinObject/companionObject.kt

@@ -0,0 +1,6 @@
+
+class A {
+    fun foo(): Int = 0
+
+    companion ob<caret>ject {}
+}

idea/testData/safeDelete/deleteObject/kotlinObject/companionObject.kt.after

@@ -0,0 +1,4 @@
+class A {
+    fun foo(): Int = 0
+
+}

idea/tests/org/jetbrains/kotlin/safeDelete/JetSafeDeleteTestGenerated.java

@@ -133,6 +133,12 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
             doObjectTest(fileName);
         }
 
+        @TestMetadata("companionObject.kt")
+        public void testCompanionObject() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/companionObject.kt");
+            doObjectTest(fileName);
+        }
+
         @TestMetadata("localObject1.kt")
         public void testLocalObject1() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt");