MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git-index] i18n: use HtmlBuilder

Browse Source 
GitOrigin-RevId: 0e8f8397bc9509e18a159dbf103ce05d355572c6
This commit is contained in:
Julia Beliaeva
2020-08-18 18:48:21 +00:00
committed by intellij-monorepo-bot
parent 45408c96c2
commit d2b4f4abbc
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/index/actions/StagingAreaOperationAction.kt
+7 -4
View File
@@ -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)
}
plugins/git4idea/src/git4idea/index/ui/GitStagePanel.kt
+3 -2
View File
@@ -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())
}
}
}