diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightFixUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightFixUtil.java index 9ca4da8a3580..f57d571f7110 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightFixUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightFixUtil.java @@ -434,10 +434,9 @@ public final class HighlightFixUtil { } public static void registerFixesForExpressionStatement(@NotNull Consumer info, - @NotNull PsiElement statement) { - if (!(statement instanceof PsiExpressionStatement)) return; + @NotNull PsiExpressionStatement statement) { if (!(statement.getParent() instanceof PsiCodeBlock block)) return; - PsiExpression expression = ((PsiExpressionStatement)statement).getExpression(); + PsiExpression expression = statement.getExpression(); if (expression instanceof PsiAssignmentExpression) return; PsiType type = expression.getType(); if (type == null) return; diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/AdditionalJavaErrorFixProvider.java b/java/java-impl-inspections/src/com/intellij/codeInspection/AdditionalJavaErrorFixProvider.java index 293b0a54bcf9..54c0dd7b33e8 100644 --- a/java/java-impl-inspections/src/com/intellij/codeInspection/AdditionalJavaErrorFixProvider.java +++ b/java/java-impl-inspections/src/com/intellij/codeInspection/AdditionalJavaErrorFixProvider.java @@ -1,4 +1,4 @@ -// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.codeInspection; import com.intellij.codeInsight.daemon.impl.analysis.AbstractJavaErrorFixProvider; @@ -15,6 +15,7 @@ import com.intellij.java.codeserver.highlighting.errors.JavaErrorKinds; import com.intellij.pom.java.JavaFeature; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiErrorElement; +import com.intellij.psi.PsiExpressionStatement; import com.intellij.psi.PsiJavaCodeReferenceElement; import com.intellij.psi.PsiReferenceExpression; import com.intellij.psi.PsiSwitchBlock; @@ -57,7 +58,9 @@ public final class AdditionalJavaErrorFixProvider extends AbstractJavaErrorFixPr String description = errorElement.getErrorDescription(); if (description.equals(JavaPsiBundle.message("expected.semicolon"))) { info.accept(new InsertMissingTokenFix(";")); - HighlightFixUtil.registerFixesForExpressionStatement(info, parent); + if (parent instanceof PsiExpressionStatement statement) { + HighlightFixUtil.registerFixesForExpressionStatement(info, statement); + } } if (parent instanceof PsiTryStatement tryStatement && description.equals(JavaPsiBundle.message("expected.catch.or.finally"))) { info.accept(new AddExceptionToCatchFix(false));