Skip to content

Fixing exception due to null fix from DataFlowInspectionBase.createRemoveAssignmentFix() #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 1 commit into from
Dec 19, 2025
Merged

Fixing exception due to null fix from DataFlowInspectionBase.createRemoveAssignmentFix() #262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions .../java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInspectionBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import consulo.project.Project;
import consulo.util.collection.ArrayUtil;
import consulo.util.collection.ContainerUtil;
import consulo.util.collection.SmartList;
import consulo.util.lang.StringUtil;
import consulo.util.lang.ThreeState;
import jakarta.annotation.Nonnull;
Expand Down Expand Up @@ -151,7 +150,7 @@ public void visitMethodReferenceExpression(@Nonnull PsiMethodReferenceExpression
PsiType returnType = LambdaUtil.getFunctionalInterfaceReturnType(expression);
if (TypeConversionUtil.isPrimitiveAndNotNull(returnType)) {
holder.newProblem(JavaAnalysisLocalize.dataflowMessageUnboxingMethodReference())
.range((PsiElement) expression)
.range(expression)
.create();
}
}
Expand Down Expand Up @@ -188,7 +187,7 @@ private void checkLoopCondition(PsiExpression condition) {
if (condition != null && condition.textMatches(PsiKeyword.FALSE)) {
holder.newProblem(JavaAnalysisLocalize.dataflowMessageConstantNoRef(0))
.range(condition)
.withFix(createSimplifyBooleanExpressionFix(condition, false))
.withOptionalFix(createSimplifyBooleanExpressionFix(condition, false))
.create();
}
}
Expand Down Expand Up @@ -284,18 +283,17 @@ protected List<LocalQuickFix> createMethodReferenceNPEFixes(PsiMethodReferenceEx
return Collections.emptyList();
}

protected
@Nullable
LocalQuickFix createUnwrapSwitchLabelFix() {
protected LocalQuickFix createUnwrapSwitchLabelFix() {
return null;
}

protected
@Nullable
LocalQuickFix createIntroduceVariableFix() {
protected LocalQuickFix createIntroduceVariableFix() {
return null;
}

@Nullable
protected LocalQuickFix createRemoveAssignmentFix(PsiAssignmentExpression assignment) {
return null;
}
Expand Down Expand Up @@ -405,7 +403,7 @@ private void reportUnreachableSwitchBranches(Map<PsiExpression, ThreeState> labe
coveredSwitches.add(statement);
holder.newProblem(JavaAnalysisLocalize.dataflowMessageOnlySwitchLabel())
.range(label)
.withFix(createUnwrapSwitchLabelFix())
.withOptionalFix(createUnwrapSwitchLabelFix())
.create();
}
for (Map.Entry<PsiExpression, ThreeState> entry : labelReachability.entrySet()) {
Expand Down Expand Up @@ -652,7 +650,7 @@ private void reportDuplicateAssignments(ProblemReporter reporter, DataFlowInstru
: JavaAnalysisLocalize.dataflowMessageRedundantAssignment();
reporter.newProblem(message)
.range(expr)
.withFix(createRemoveAssignmentFix(assignment))
.withOptionalFix(createRemoveAssignmentFix(assignment))
.create();
});
}
Expand Down Expand Up @@ -698,7 +696,7 @@ protected void reportNullabilityProblems(
NullabilityProblemKind.callMethodRefNPE.ifMyProblem(
problem,
methodRef -> reporter.newProblem(JavaAnalysisLocalize.dataflowMessageNpeMethodrefInvocation())
.range((PsiElement) methodRef)
.range(methodRef)
.withFixes(createMethodReferenceNPEFixes(methodRef, reporter.isOnTheFly()))
.create()
);
Expand All @@ -716,14 +714,14 @@ protected void reportNullabilityProblems(
NullabilityProblemKind.passingToNotNullMethodRefParameter.ifMyProblem(
problem,
methodRef -> reporter.newProblem(JavaAnalysisLocalize.dataflowMessagePassingNullableArgumentMethodref())
.range((PsiElement) methodRef)
.range(methodRef)
.withFixes(createMethodReferenceNPEFixes(methodRef, reporter.isOnTheFly()))
.create()
);
NullabilityProblemKind.unboxingMethodRefParameter.ifMyProblem(
problem,
methodRef -> reporter.newProblem(JavaAnalysisLocalize.dataflowMessageUnboxingNullableArgumentMethodref())
.range((PsiElement) methodRef)
.range(methodRef)
.withFixes(createMethodReferenceNPEFixes(methodRef, reporter.isOnTheFly()))
.create()
);
Expand Down Expand Up @@ -774,7 +772,7 @@ protected void reportNullabilityProblems(
NullabilityProblemKind.passingToNonAnnotatedMethodRefParameter.ifMyProblem(
problem,
methodRef -> reporter.newProblem(problem.getMessage(expressions))
.range((PsiElement) methodRef)
.range(methodRef)
.create()
);
NullabilityProblemKind.passingToNonAnnotatedParameter.ifMyProblem(
Expand Down Expand Up @@ -829,7 +827,7 @@ private void reportMethodReferenceProblems(ProblemsHolder holder, DataFlowInstru
if (result != ConstantResult.UNKNOWN) {
Object value = result.value();
holder.newProblem(JavaAnalysisLocalize.dataflowMessageConstantMethodReference(value))
.range((PsiElement) methodRef)
.range(methodRef)
.withFix(createReplaceWithTrivialLambdaFix(value))
.create();
}
Expand Down Expand Up @@ -858,7 +856,7 @@ private void reportAlwaysReturnsNotNull(ProblemsHolder holder, PsiElement scope)
NullableStuffInspectionBase.getPresentableAnnoName(annotation),
method.getName()
))
.range((PsiElement) annoName)
.range(annoName)
.withOptionalFix(AddAnnotationPsiFix.createAddNotNullFix(method))
.withOptionalFix(
holder.isOnTheFly()
Expand Down
Loading