From 1510cc3e88582623fcd8a6d4c0cbd489f5b4a687 Mon Sep 17 00:00:00 2001 From: UNV Date: Wed, 3 Dec 2025 01:04:15 +0300 Subject: [PATCH] Using new optionalFixRange in fix creation in case of nullable TextRange. --- .../daemon/impl/analysis/HighlightMethodUtil.java | 4 ++-- .../codeInsight/daemon/impl/analysis/HighlightUtil.java | 2 +- .../daemon/impl/quickfix/ConvertDoubleToFloatFix.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java index f91cfe25d..fd3bbdee7 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java @@ -2322,9 +2322,9 @@ private static void registerChangeMethodSignatureFromUsageIntention( if (method != null && context.getManager().isInProject(method)) { QuickFixFactory factory = QuickFixFactory.getInstance(); hlBuilder.newFix(factory.createChangeMethodSignatureFromUsageFix(method, expressions, substitutor, context, false, 2)) - .fixRange(fixRange).register() + .optionalFixRange(fixRange).register() .newFix(factory.createChangeMethodSignatureFromUsageReverseOrderFix(method, expressions, substitutor, context, false, 2)) - .fixRange(fixRange).register(); + .optionalFixRange(fixRange).register(); } } } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java index 48aad6c4b..82dd76f5a 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -354,7 +354,7 @@ public static void registerAccessQuickFixAction( } LocalQuickFixAndIntentionActionOnPsiElement action = QuickFixFactory.getInstance().createModifierFixBuilder(refElement).add(modifier).showContainingClass().create(); - hlBuilder.newFix(action).fixRange(fixRange).register(); + hlBuilder.newFix(action).optionalFixRange(fixRange).register(); } } } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ConvertDoubleToFloatFix.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ConvertDoubleToFloatFix.java index f65bc016b..3cd4fddbd 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ConvertDoubleToFloatFix.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ConvertDoubleToFloatFix.java @@ -91,7 +91,7 @@ public static void registerIntentions( @Nonnull JavaResolveResult[] candidates, @Nonnull PsiExpressionList list, @Nullable HighlightInfo.Builder hlBuilder, - TextRange fixRange + @Nullable TextRange fixRange ) { if (hlBuilder == null || candidates.length == 0) { return; @@ -105,7 +105,7 @@ public static void registerIntentions( private static void registerIntention( @Nonnull PsiExpression[] expressions, @Nonnull HighlightInfo.Builder hlBuilder, - TextRange fixRange, + @Nullable TextRange fixRange, @Nonnull JavaResolveResult candidate, @Nonnull PsiElement context ) { @@ -121,7 +121,7 @@ private static void registerIntention( if (expressions[i] instanceof PsiLiteralExpression literal && PsiType.FLOAT.equals(parameter.getType()) && PsiType.DOUBLE.equals(literal.getType())) { - hlBuilder.newFix(new ConvertDoubleToFloatFix(literal)).fixRange(fixRange).register(); + hlBuilder.newFix(new ConvertDoubleToFloatFix(literal)).optionalFixRange(fixRange).register(); } } }