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(), false,