From 3b0cd615e83e66b9f6c6d4b14d7153036363e722 Mon Sep 17 00:00:00 2001 From: UNV Date: Mon, 12 Jan 2026 18:07:16 +0300 Subject: [PATCH 1/2] Replacing LocalizeValue.map() call excluding localizeManager. --- .../daemon/impl/analysis/HighlightMethodUtil.java | 11 +++++------ .../daemon/impl/quickfix/AddMethodQualifierFix.java | 2 +- .../daemon/impl/quickfix/StaticImportMemberFix.java | 4 ++-- 3 files changed, 8 insertions(+), 9 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 1192a3978..3c70e6133 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 @@ -762,10 +762,9 @@ private static LocalizeValue buildOneLineMismatchDescription( ); return LocalizeValue.of("" + - message.map((localizeManager, s) -> XmlStringUtil.escapeString(s)) + + message.map(s -> XmlStringUtil.escapeString(s)) + " XmlStringUtil.escapeString(s)) + createMismatchedArgumentsHtmlTooltip(candidateInfo, list).map(s -> XmlStringUtil.escapeString(s)) + "\"" + (StyleManager.get().getCurrentStyle().isDark() ? " color=\"7AB4C9\" " : "") + ">" + DaemonLocalize.inspectionExtendedDescription() + "" ); @@ -853,7 +852,7 @@ else if (element != null && !resolveResult.isStaticsScopeCorrect()) { return HighlightInfo.newHighlightInfo(highlightInfoType) .range(elementToHighlight) .description(description) - .escapedToolTip(description.map((localizeManager, s) -> XmlStringUtil.escapeString(s))) + .escapedToolTip(description.map(s -> XmlStringUtil.escapeString(s))) .registerFix(QuickFixFactory.getInstance().createAccessStaticViaInstanceFix(referenceToMethod, resolveResult)); } } @@ -875,7 +874,7 @@ else if (element != null && !resolveResult.isStaticsScopeCorrect()) { HighlightInfo.Builder hlBuilder = HighlightInfo.newHighlightInfo(highlightInfoType) .range(elementToHighlight) .description(description) - .escapedToolTip(description.map((localizeManager, s) -> XmlStringUtil.escapeString(s))); + .escapedToolTip(description.map(s -> XmlStringUtil.escapeString(s))); registerMethodCallIntentions(hlBuilder, methodCall, list, resolveHelper); if (element != null && !resolveResult.isStaticsScopeCorrect()) { HighlightUtil.registerStaticProblemQuickFixAction(element, hlBuilder, referenceToMethod); @@ -972,7 +971,7 @@ public static HighlightInfo.Builder checkAmbiguousMethodCallArguments( if (candidates.length == 0) { return null; } - toolTip = description.map((localizeManager, s) -> XmlStringUtil.escapeString(s)); + toolTip = description.map(s -> XmlStringUtil.escapeString(s)); } HighlightInfo.Builder hlBuilder = HighlightInfo.newHighlightInfo(highlightInfoType) .range(elementToHighlight) diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java index d651d9bf9..94694f320 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java @@ -64,7 +64,7 @@ public LocalizeValue getText() { } LocalizeValue text = JavaQuickFixLocalize.addMethodQualifierFixText(candidates.size() > 1 ? "" : candidates.get(0).getName()); if (candidates.size() > 1) { - text = text.map((localizeManager, s) -> s + "..."); + text = text.map(s -> s + "..."); } return text; } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java index ca6acd621..488438904 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java @@ -59,10 +59,10 @@ public Priority getPriority() { public LocalizeValue getText() { LocalizeValue text = getBaseText(); if (candidates != null && candidates.size() == 1) { - text = text.map((localizeManager, s) -> s + " '" + getMemberPresentableText(candidates.get(0)) + "'"); + text = text.map(s -> s + " '" + getMemberPresentableText(candidates.get(0)) + "'"); } else { - text = text.map((localizeManager, s) -> s + "..."); + text = text.map(s -> s + "..."); } return text; } From 2949e71b479ab65de23148d0fd32e713c3def5e0 Mon Sep 17 00:00:00 2001 From: UNV Date: Mon, 12 Jan 2026 18:32:31 +0300 Subject: [PATCH 2/2] Unicode ellipsis. --- .../codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java | 2 +- .../codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java index 94694f320..41559f05d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java @@ -64,7 +64,7 @@ public LocalizeValue getText() { } LocalizeValue text = JavaQuickFixLocalize.addMethodQualifierFixText(candidates.size() > 1 ? "" : candidates.get(0).getName()); if (candidates.size() > 1) { - text = text.map(s -> s + "..."); + text = text.map(s -> s + "…"); } return text; } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java index 488438904..22b175520 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java @@ -62,7 +62,7 @@ public LocalizeValue getText() { text = text.map(s -> s + " '" + getMemberPresentableText(candidates.get(0)) + "'"); } else { - text = text.map(s -> s + "..."); + text = text.map(s -> s + "…"); } return text; }