Delete companion manually during callable inlining

2018-01-30 16:02:32 +03:00
parent 9b1f323118
commit 6181ba47c8
1 changed files with 9 additions and 1 deletions
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject

 class KotlinInlineCallableProcessor(
        project: Project,
@@ -70,7 +71,14 @@ class KotlinInlineCallableProcessor(
                postAction = {
                    if (deleteAfter) {
                        if (usages.size == simpleNameUsages.size) {
-                            declaration.delete()
+                            val containingClass = declaration.containingClassOrObject
+                            if (containingClass is KtObjectDeclaration
+                                && containingClass.isCompanion()
+                                && containingClass.declarations.size == 1) {
+                                containingClass.delete()
+                            } else {
+                                declaration.delete()
+                            }
                            statementToDelete?.delete()
                        }
                        else {