From fcd7753072f7afac0f34a87e1d1cd06bba550792 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Tue, 13 Jan 2026 17:15:20 +0300
Subject: [PATCH] Replacing LocalizeValue.map() call excluding localizeManager.

---
 .../src/main/java/git4idea/reset/GitResetOperation.java   | 2 +-
 plugin/src/main/java/git4idea/util/GitUIUtil.java         | 2 +-
 .../main/java/git4idea/util/GitUntrackedFilesHelper.java  | 8 +++-----
 .../src/main/java/git4idea/util/GitVcsConsoleWriter.java  | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/plugin/src/main/java/git4idea/reset/GitResetOperation.java b/plugin/src/main/java/git4idea/reset/GitResetOperation.java
index f38bdf7..aa9d7f8 100644
--- a/plugin/src/main/java/git4idea/reset/GitResetOperation.java
+++ b/plugin/src/main/java/git4idea/reset/GitResetOperation.java
@@ -176,7 +176,7 @@ else if (!successes.isEmpty()) {
     private static LocalizeValue formErrorReport(@Nonnull Map<GitRepository, GitCommandResult> errorResults) {
         MultiMap<LocalizeValue, GitRepository> grouped = groupByResult(errorResults);
         if (grouped.size() == 1) {
-            return grouped.keySet().iterator().next().map((localizeManager, string) -> "<code>" + string + "</code>");
+            return grouped.keySet().iterator().next().map(s -> "<code>" + s + "</code>");
         }
         return LocalizeValue.localizeTODO(StringUtil.join(
             grouped.entrySet(),
diff --git a/plugin/src/main/java/git4idea/util/GitUIUtil.java b/plugin/src/main/java/git4idea/util/GitUIUtil.java
index a1c8d4a..21796a4 100644
--- a/plugin/src/main/java/git4idea/util/GitUIUtil.java
+++ b/plugin/src/main/java/git4idea/util/GitUIUtil.java
@@ -61,7 +61,7 @@ public static void notifyMessages(
         boolean important,
         @Nullable Collection<String> messages
     ) {
-        LocalizeValue desc = description.map((localizeManager, string) -> string.replace("\n", "<br/>"));
+        LocalizeValue desc = description.map(s -> s.replace("\n", "<br/>"));
         if (messages != null && !messages.isEmpty()) {
             desc = LocalizeValue.join(desc, LocalizeValue.of(StringUtil.join(messages, "<hr/><br/>")));
         }
diff --git a/plugin/src/main/java/git4idea/util/GitUntrackedFilesHelper.java b/plugin/src/main/java/git4idea/util/GitUntrackedFilesHelper.java
index 1c99939..3244e7e 100644
--- a/plugin/src/main/java/git4idea/util/GitUntrackedFilesHelper.java
+++ b/plugin/src/main/java/git4idea/util/GitUntrackedFilesHelper.java
@@ -88,7 +88,7 @@ public static void notifyUntrackedFilesOverwrittenBy(
                         LegacyDialog legacyDialog = componentFactory.createSelectFilesDialogOnlyOk(
                             project,
                             new ArrayList<>(untrackedFiles),
-                            dialogDesc.map((localizeManager, string) -> StringUtil.stripHtml(string, true)).get(),
+                            dialogDesc.map(s -> StringUtil.stripHtml(s, true)).get(),
                             null,
                             false,
                             false,
@@ -155,7 +155,7 @@ public static boolean showUntrackedFilesDialogWithRollback(
                 }
                 LocalizeValue title = LocalizeValue.localizeTODO("Could not " + operationName.capitalize());
                 LocalizeValue description = createUntrackedFilesOverwrittenDescription(operationName, false)
-                    .map((localizeManager, string) -> StringUtil.stripHtml(string, true));
+                    .map(string -> StringUtil.stripHtml(string, true));
                 DialogWrapper dialog = new UntrackedFilesRollBackDialog(project, filesBrowser, description, rollbackProposal);
                 dialog.setTitle(title);
                 DialogManager.show(dialog);
@@ -194,9 +194,7 @@ public UntrackedFilesRollBackDialog(
         protected JComponent createSouthPanel() {
             JComponent buttons = super.createSouthPanel();
             JPanel panel = new JPanel(new VerticalFlowLayout());
-            panel.add(
-                new JBLabel(myRollbackProposal.map((localizeManager, string) -> XmlStringUtil.wrapInHtml(string)).get())
-            );
+            panel.add(new JBLabel(myRollbackProposal.map(XmlStringUtil::wrapInHtml).get()));
             if (buttons != null) {
                 panel.add(buttons);
             }
diff --git a/plugin/src/main/java/git4idea/util/GitVcsConsoleWriter.java b/plugin/src/main/java/git4idea/util/GitVcsConsoleWriter.java
index b8907ec..cfb2205 100644
--- a/plugin/src/main/java/git4idea/util/GitVcsConsoleWriter.java
+++ b/plugin/src/main/java/git4idea/util/GitVcsConsoleWriter.java
@@ -14,10 +14,10 @@
 import consulo.util.lang.StringUtil;
 import consulo.versionControlSystem.ProjectLevelVcsManager;
 import consulo.versionControlSystem.VcsConsoleLine;
+import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
-import jakarta.annotation.Nonnull;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -78,7 +78,7 @@ public void showCommandLine(@Nonnull String cmdLine) {
    */
   public void showMessage(@Nonnull LocalizeValue message, @Nonnull ConsoleViewContentType contentType) {
     LocalizeValue shortMessage =
-        message.map(((localizeManager, value) -> StringUtil.shortenPathWithEllipsis(value, MAX_CONSOLE_OUTPUT_SIZE)));
+        message.map(value -> StringUtil.shortenPathWithEllipsis(value, MAX_CONSOLE_OUTPUT_SIZE));
     ProjectLevelVcsManager.getInstance(myProject).addMessageToConsoleWindow(shortMessage.get(), contentType);
   }