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

[java-inference] Fix inference for case null: (case null -> was already supported)

Browse Source 
Fixes IDEA-297390 Wrong `@NotNull` is inferred for switch with explicit `null` case label
Also: support switch expressions

GitOrigin-RevId: 5605eb5e4487c592597b839c26319de021ba2282
This commit is contained in:
Tagir Valeev
2022-07-11 17:02:03 +00:00
committed by intellij-monorepo-bot
parent 1689ce64df
commit cff8154475
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inference/ParameterNullityInference.kt
+3 -2
View File
@@ -48,7 +48,7 @@ internal fun inferNotNullParameters(tree: LighterAST, parameterNames: List<Strin
dereference(tree, expression, canBeNulls, notNulls, queue)
}
}
SWITCH_STATEMENT -> {
SWITCH_STATEMENT, SWITCH_EXPRESSION -> {
queue.clear()
val expression = JavaLightTreeUtil.findExpressionChild(tree, element)
val hasExplicitNullCheck = findCaseLabelElementList(tree, element)
@@ -195,6 +195,7 @@ internal fun getParameterNames(tree: LighterAST, method: LighterASTNode): List<S
private fun findCaseLabelElementList(tree: LighterAST, switchNode: LighterASTNode): List<LighterASTNode> {
val codeBlock = LightTreeUtil.firstChildOfType(tree, switchNode, CODE_BLOCK) ?: return emptyList()
val rules = LightTreeUtil.getChildrenOfType(tree, codeBlock, SWITCH_LABELED_RULE)
var rules: List<LighterASTNode> = LightTreeUtil.getChildrenOfType(tree, codeBlock, SWITCH_LABELED_RULE)
rules += LightTreeUtil.getChildrenOfType(tree, codeBlock, SWITCH_LABEL_STATEMENT)
return rules.mapNotNull { node -> LightTreeUtil.firstChildOfType(tree, node, CASE_LABEL_ELEMENT_LIST) }
}
java/java-tests/testSrc/com/intellij/java/codeInspection/ParameterNullityInferenceFromSourceTest.java
+15
View File
@@ -152,6 +152,21 @@ public class ParameterNullityInferenceFromSourceTest extends LightJavaCodeInsigh
"}");
}
public void testSwitchWithPattern() {
assertNullity("-",
"void test(String r) {\n" +
" switch (r) {\n" +
" case null:\n" +
" break;\n" +
" }\n" +
" }");
}
public void testSwitchExpression() {
assertNullity("+",
"int test(String s) { return switch(s) {case \"x\"->1;default ->2;}} ");
}
public void testUseConfiguredNullityAnnotation() {
PsiClass clazz = myFixture.addClass("final class Foo { void foo(String s) { s.hashCode(); } }");
PsiParameter parameter = clazz.getMethods()[0].getParameterList().getParameters()[0];