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

EA-231509: dont use PsiType.NULL as a return type

Browse Source 
GitOrigin-RevId: 23f8141f25a7b1ba7779debe97002663c543be31
This commit is contained in:
Alexandr Suhinin
2020-05-06 11:00:24 +00:00
committed by intellij-monorepo-bot
parent 897ea7110a
commit 90a476deb1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodAnalyzer.kt
+4 -1
View File
@@ -146,7 +146,10 @@ private fun findOutputFromReturn(flowOutput: FlowOutput): ExpressionOutput? {
val returnExpressions = flowOutput.statements
.mapNotNull { statement -> (statement as? PsiReturnStatement)?.returnValue }
.sortedBy { returnStatement -> returnStatement.startOffset }
val returnType = returnExpressions.asSequence().mapNotNull { expression -> expression.type }.firstOrNull()
val returnType = returnExpressions.asSequence()
.mapNotNull { expression -> expression.type }
.filterNot { type -> type == PsiType.NULL }
.firstOrNull()
val variableName = returnExpressions.asSequence().map { expression -> guessName(expression) }.firstOrNull() ?: "x"
val nullability = CodeFragmentAnalyzer.inferNullability(returnExpressions)
return if (returnType != null) ExpressionOutput(returnType, variableName, returnExpressions, nullability) else null