MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-07 22:09:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin k2] The "Introduce Variable" refactoring: fix "java.lang.AssertionError: New body is not found: FUN"

Browse Source 
^KTIJ-26527
IJ-CR-113137

GitOrigin-RevId: f330bb93fb15368acf81b809fade5ce18f17a3ed
This commit is contained in:
Andrey Cherkasov
2023-10-05 11:21:49 +04:00
committed by intellij-monorepo-bot
parent 0c1f99dc08
commit 78d15b5cdf
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/kotlin/refactorings/kotlin.refactorings.introduce.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
View File

@@ -32,10 +32,7 @@ import org.jetbrains.kotlin.idea.base.codeInsight.ShortenReferencesFacility
import org.jetbrains.kotlin.idea.base.psi.moveInsideParenthesesAndReplaceWith
import org.jetbrains.kotlin.idea.base.psi.shouldLambdaParameterBeNamed
import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
import org.jetbrains.kotlin.idea.codeinsight.utils.ConvertToBlockBodyUtils
import org.jetbrains.kotlin.idea.codeinsight.utils.NamedArgumentUtils
import org.jetbrains.kotlin.idea.codeinsight.utils.addTypeArguments
import org.jetbrains.kotlin.idea.codeinsight.utils.getRenderedTypeArguments
import org.jetbrains.kotlin.idea.codeinsight.utils.*
import org.jetbrains.kotlin.idea.refactoring.KotlinCommonRefactoringSettings
import org.jetbrains.kotlin.idea.refactoring.chooseContainer.chooseContainerElementIfNecessary
import org.jetbrains.kotlin.idea.refactoring.introduce.IntroduceRefactoringException
@@ -288,7 +285,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
}
}
fun runRefactoring(isVar: Boolean) {
fun runRefactoring(project: Project, editor: Editor?, isVar: Boolean) {
if (container !is KtDeclarationWithBody) return runRefactoring(
isVar,
expression,
@@ -307,7 +304,12 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
}
}
val newContainer = container.bodyBlockExpression.sure { "New body is not found: $container" }
val newContainer = container.bodyBlockExpression ?: return showErrorHint(
project,
editor,
KotlinBundle.message("cannot.refactor.not.expression")
)
val newExpression = newContainer.findExpressionByCopyableDataAndClearIt(EXPRESSION_KEY)
runRefactoring(
@@ -491,7 +493,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
)
project.executeCommand(INTRODUCE_VARIABLE, null) {
introduceVariableContext.runRefactoring(isVar)
introduceVariableContext.runRefactoring(project, editor, isVar)
val property = introduceVariableContext.propertyRef ?: return@executeCommand