From d2b4f4abbc5af066875402db4250e988aadfcd76 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Tue, 18 Aug 2020 21:46:11 +0300
Subject: [PATCH] [git-index] i18n: use HtmlBuilder

GitOrigin-RevId: 0e8f8397bc9509e18a159dbf103ce05d355572c6
---
 .../index/actions/StagingAreaOperationAction.kt       | 11 +++++++----
 .../git4idea/src/git4idea/index/ui/GitStagePanel.kt   |  5 +++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/index/actions/StagingAreaOperationAction.kt b/plugins/git4idea/src/git4idea/index/actions/StagingAreaOperationAction.kt
index 6fe570123fb4..ca0f5698debe 100644
--- a/plugins/git4idea/src/git4idea/index/actions/StagingAreaOperationAction.kt
+++ b/plugins/git4idea/src/git4idea/index/actions/StagingAreaOperationAction.kt
@@ -8,11 +8,12 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.MessageType
 import com.intellij.openapi.util.NlsContexts
 import com.intellij.openapi.util.ThrowableComputable
+import com.intellij.openapi.util.text.HtmlBuilder
+import com.intellij.openapi.util.text.HtmlChunk
 import com.intellij.openapi.vcs.VcsException
 import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier
 import com.intellij.vcsUtil.VcsFileUtil
 import com.intellij.vcsUtil.VcsUtil
-import com.intellij.xml.util.XmlStringUtil
 import git4idea.index.ui.GitFileStatusNode
 import git4idea.index.vfs.GitIndexFileSystemRefresher
 
@@ -54,7 +55,9 @@ fun <T> runProcess(project: Project, @NlsContexts.ProgressTitle title: String, c
 }
 
 private fun showErrorMessage(project: Project, messageTitle: String, exceptions: Collection<Exception>) {
-  VcsBalloonProblemNotifier.showOverVersionControlView(project, XmlStringUtil.wrapInHtmlTag("$messageTitle:", "b")
-                                                                + "\n" + exceptions.joinToString("\n") { it.localizedMessage },
-                                                       MessageType.ERROR)
+  val message = HtmlBuilder().append(HtmlChunk.text("$messageTitle:").bold())
+    .append(HtmlChunk.br())
+    .appendWithSeparators(HtmlChunk.br(), exceptions.map { HtmlChunk.text(it.localizedMessage) })
+
+  VcsBalloonProblemNotifier.showOverVersionControlView(project, message.toString(), MessageType.ERROR)
 }
\ No newline at end of file
diff --git a/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt b/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt
index f394abf01ad5..663bec1bda3e 100644
--- a/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt
+++ b/plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt
@@ -9,6 +9,8 @@ import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.progress.util.ProgressWindow
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
+import com.intellij.openapi.util.text.HtmlBuilder
+import com.intellij.openapi.util.text.HtmlChunk
 import com.intellij.openapi.vcs.AbstractVcsHelper
 import com.intellij.openapi.vcs.VcsException
 import com.intellij.openapi.vcs.VcsNotifier
@@ -24,7 +26,6 @@ import com.intellij.ui.SideBorder
 import com.intellij.util.EditSourceOnDoubleClickHandler
 import com.intellij.util.OpenSourceUtil
 import com.intellij.util.Processor
-import com.intellij.util.ui.UIUtil
 import com.intellij.vcs.commit.getDefaultCommitShortcut
 import com.intellij.vcs.commit.showEmptyCommitMessageConfirmation
 import com.intellij.vcs.log.runInEdt
@@ -253,7 +254,7 @@ internal class GitStagePanel(private val tracker: GitStageTracker, disposablePar
       if (failedRoots.isNotEmpty()) {
         notifier.notifyError(GitBundle.message("stage.commit.failed", failedRoots.keys.joinToString {
           "'${VcsImplUtil.getShortVcsRootName(project, it)}'"
-        }), failedRoots.values.joinToString(UIUtil.BR) { it.localizedMessage })
+        }), HtmlBuilder().appendWithSeparators(HtmlChunk.br(), failedRoots.values.map { HtmlChunk.text(it.localizedMessage) }).toString())
       }
     }
   }