Merge pull request #791 from mcgee/KT-9938

#KT-9938 Fixed
2015-12-09 15:17:31 +01:00
parent 83189013c6 4a0e33003b
commit 863e32c5cd
31 changed files with 209 additions and 15 deletions
@@ -243,7 +243,14 @@ public class KtProperty extends KtTypeParameterListOwnerStub<KotlinPropertyStub>
                return (KtExpression) oldInitializer.replace(initializer);
            }
            else {
-                deleteChildRange(findChildByType(EQ), oldInitializer);
+                PsiElement nextSibling = oldInitializer.getNextSibling();
+                PsiElement last =
+                        nextSibling != null
+                        && nextSibling.getNode() != null
+                        && nextSibling.getNode().getElementType() == KtTokens.SEMICOLON
+                        ? nextSibling : oldInitializer;
+
+                deleteChildRange(findChildByType(EQ), last);
                return null;
            }
        }