MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-05 08:06:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

[extract method] IDEA-262123: return default variable value on unconditional exits

Browse Source 
GitOrigin-RevId: eaf46751769ecddd3711de96c48b62f209878b27
This commit is contained in:
Alexandr Suhinin
2024-06-20 17:01:05 +03:00
committed by intellij-monorepo-bot
parent 7c0af63e54
commit ac42764da7
5 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/BodyBuilder.kt
View File

@@ -32,7 +32,8 @@ class BodyBuilder(private val factory: PsiElementFactory) {
is EmptyOutput -> throw IllegalStateException()
}
is UnconditionalFlow -> when (dataOutput) {
is VariableOutput, is EmptyOutput -> "return;"
is VariableOutput -> "return ${dataOutput.variable.name};"
is EmptyOutput -> "return;"
is ExpressionOutput -> "return $returnExpression;"
ArtificialBooleanOutput -> throw IllegalStateException()
}

1
java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodAnalyzer.kt
View File

@@ -47,7 +47,6 @@ fun findExtractOptions(elements: List<PsiElement>, inferNullity: Boolean = true)
variableData.nullability != Nullability.NOT_NULL && flowOutput is ConditionalFlow -> null
flowOutput is ConditionalFlow && ! canExtractStatementsFromScope(flowOutput.statements, elements) -> null
flowOutput is ConditionalFlow -> variableData.copy(nullability = Nullability.NULLABLE)
flowOutput is UnconditionalFlow -> null
else -> variableData
}
else -> findFlowData(analyzer, flowOutput)