From dd7ef4d89f075241433679b75743a2505846e705 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 3 Sep 2015 12:05:33 +0300 Subject: [PATCH] Fix null exception in setName() method (EA-70396) --- .../src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java index 0a997274b0f..3b9d0479f45 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java @@ -78,7 +78,8 @@ abstract class JetNamedDeclarationStub> extend @Override public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException { - return getNameIdentifier().replace(JetPsiFactory(this).createNameIdentifier(name)); + PsiElement identifier = getNameIdentifier(); + return identifier != null ? identifier.replace(JetPsiFactory(this).createNameIdentifier(name)) : null; } @Override