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

java switch expressions: infer Object if one of branches has null type (IDEA-241470)

Browse Source 
GitOrigin-RevId: 489d3413091cbd1a85348fae0a428e29b287f7e0
This commit is contained in:
Anna Kozlova
2020-05-25 21:31:52 +02:00
committed by intellij-monorepo-bot
parent 6324dc91a2
commit 8aafb282f3
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchExpressionImpl.java
View File

@@ -92,10 +92,11 @@ public class PsiSwitchExpressionImpl extends PsiSwitchBlockImpl implements PsiSw
// to the least upper bound (4.10.4) of the types of the result expressions.
PsiType leastUpperBound = PsiType.NULL;
for (PsiType type : resultTypes) {
if (TypeConversionUtil.isNullType(type)) return PsiType.getJavaLangObject(getManager(), getResolveScope());
if (TypeConversionUtil.isPrimitiveAndNotNull(type)) {
type = ((PsiPrimitiveType)type).getBoxedType(this);
}
if (leastUpperBound == PsiType.NULL) {
if (TypeConversionUtil.isNullType(leastUpperBound)) {
leastUpperBound = type;
}
else {

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/switchExpressions/SimpleInferenceCases.java
View File

@@ -116,4 +116,12 @@ class MyTest {
System.out.println(c.getCanonicalName());
}
static void testNull(int i) {
var v = switch(i) {
case 1 -> "abcd";
default -> null;
};
System.out.println(v.<error descr="Cannot resolve method 'substring' in 'Object'">substring</error>(1));
}
}