From a5a6ecd1ec7bdeea86f89422d44792c6a798bfe0 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 18 Mar 2015 16:34:03 +0300
Subject: [PATCH] Fix NPE from RenameOnSecondaryConstructorHandler

---
 .../refactoring/rename/RenameOnSecondaryConstructorHandler.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt
index 7818e39ec44..6f98aecd522 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt
@@ -35,8 +35,8 @@ public class RenameOnSecondaryConstructorHandler : RenameHandler {
     override fun isAvailableOnDataContext(dataContext: DataContext?): Boolean {
         if (dataContext == null) return false
 
-        val editor = CommonDataKeys.EDITOR.getData(dataContext)
-        val file = CommonDataKeys.PSI_FILE.getData(dataContext)
+        val editor = CommonDataKeys.EDITOR.getData(dataContext) ?: return false
+        val file = CommonDataKeys.PSI_FILE.getData(dataContext) ?: return false
 
         val element = PsiTreeUtil.findElementOfClassAtOffsetWithStopSet(
                 file, editor.getCaretModel().getOffset(), javaClass<JetSecondaryConstructor>(), false,