azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change ExtractDeclarationFromCurrentFileIntention applicability range

Browse Source 
Fixed #KT-33362
This commit is contained in:
Igor Yakovlev
2019-08-15 20:08:28 +03:00
parent e9e3df23fc
commit ae3f36ebde
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ExtractDeclarationFromCurrentFileIntention.kt
+5 -6
View File
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
import org.jetbrains.kotlin.idea.core.moveCaret import org.jetbrains.kotlin.idea.core.moveCaret
import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention 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.createKotlinFile
import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog
import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens
@@ -55,12 +54,12 @@ class ExtractDeclarationFromCurrentFileIntention :
val extraClassesToMove = element.tryGetExtraClassesToMove() ?: return null val extraClassesToMove = element.tryGetExtraClassesToMove() ?: return null
val keyword = when (element) { val startOffset = when (element) {
is KtClass -> element.getClassOrInterfaceKeyword() is KtClass -> element.startOffset
is KtObjectDeclaration -> element.getObjectKeyword() is KtObjectDeclaration -> element.getObjectKeyword()?.startOffset
else -> return null else -> return null
} } ?: return null
val startOffset = keyword?.startOffset ?: return null
val endOffset = element.nameIdentifier?.endOffset ?: return null val endOffset = element.nameIdentifier?.endOffset ?: return null
text = if (extraClassesToMove.isNotEmpty()) "Extract '${element.name}' and subclasses from current file" text = if (extraClassesToMove.isNotEmpty()) "Extract '${element.name}' and subclasses from current file"