From 9b1f323118903c3845b2eb4e07f4ffcb390f2811 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 29 Dec 2017 20:42:36 +0300 Subject: [PATCH] Retain empty companion in KtNamedDeclarationStub.remove --- .../kotlin/psi/KtNamedDeclarationStub.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedDeclarationStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedDeclarationStub.java index 5497609bfd4..001f854915b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedDeclarationStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedDeclarationStub.java @@ -157,17 +157,4 @@ abstract class KtNamedDeclarationStub> extends } return KtNamedDeclarationUtil.getFQName(this); } - - @Override - public void delete() throws IncorrectOperationException { - KtClassOrObject classOrObject = KtPsiUtilKt.getContainingClassOrObject(this); - - super.delete(); - - if (classOrObject instanceof KtObjectDeclaration - && ((KtObjectDeclaration) classOrObject).isCompanion() - && classOrObject.getDeclarations().isEmpty()) { - classOrObject.delete(); - } - } }