From ae3f36ebde7bfc5dbd31bf70492d3fd3b35c2d24 Mon Sep 17 00:00:00 2001
From: Igor Yakovlev <igor.yakovlev@jetbrains.com>
Date: Thu, 15 Aug 2019 20:08:28 +0300
Subject: [PATCH] Change ExtractDeclarationFromCurrentFileIntention
 applicability range

Fixed #KT-33362
---
 .../ExtractDeclarationFromCurrentFileIntention.kt     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ExtractDeclarationFromCurrentFileIntention.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ExtractDeclarationFromCurrentFileIntention.kt
index 880870db881..3778f1f9c57 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ExtractDeclarationFromCurrentFileIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ExtractDeclarationFromCurrentFileIntention.kt
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.core.moveCaret
 import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
-import org.jetbrains.kotlin.idea.kdoc.insert
 import org.jetbrains.kotlin.idea.refactoring.createKotlinFile
 import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog
 import org.jetbrains.kotlin.lexer.KtTokens
@@ -55,12 +54,12 @@ class ExtractDeclarationFromCurrentFileIntention :
 
         val extraClassesToMove = element.tryGetExtraClassesToMove() ?: return null
 
-        val keyword = when (element) {
-            is KtClass -> element.getClassOrInterfaceKeyword()
-            is KtObjectDeclaration -> element.getObjectKeyword()
+        val startOffset = when (element) {
+            is KtClass -> element.startOffset
+            is KtObjectDeclaration -> element.getObjectKeyword()?.startOffset
             else -> return null
-        }
-        val startOffset = keyword?.startOffset ?: return null
+        } ?: return null
+
         val endOffset = element.nameIdentifier?.endOffset ?: return null
 
         text = if (extraClassesToMove.isNotEmpty()) "Extract '${element.name}' and subclasses from current file"