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] do not show staging area error messages as "Version Control" toolwindow notifications

Browse Source 
GitOrigin-RevId: 4c6ceddf7562ec2aa51545c76fcb83b0e0b59a07
This commit is contained in:
Julia Beliaeva
2023-09-02 00:32:51 +00:00
committed by intellij-monorepo-bot
parent e1b19ebf6c
commit 75c76d9486
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/GitNotificationIdsHolder.kt
+3 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package git4idea
import com.intellij.notification.impl.NotificationIdsHolder
@@ -83,6 +83,7 @@ class GitNotificationIdsHolder : NotificationIdsHolder {
REVERT_ABORT_SUCCESS,
STAGE_COMMIT_ERROR,
STAGE_COMMIT_SUCCESS,
STAGE_OPERATION_FAILED,
STASH_FAILED,
STASH_LOCAL_CHANGES_DETECTED,
TAG_CREATED,
@@ -190,6 +191,7 @@ class GitNotificationIdsHolder : NotificationIdsHolder {
const val REVERT_ABORT_SUCCESS = "git.revert.abort.success"
const val STAGE_COMMIT_ERROR = "git.stage.commit.error"
const val STAGE_COMMIT_SUCCESS = "git.stage.commit.successful"
const val STAGE_OPERATION_FAILED = "git.stage.operation.error"
const val STASH_FAILED = "git.stash.failed"
const val STASH_LOCAL_CHANGES_DETECTED = "git.stash.local.changes.detected"
const val TAG_CREATED = "git.tag.created"
plugins/git4idea/src/git4idea/index/actions/StagingAreaOperation.kt
+1 -1
View File
@@ -23,7 +23,7 @@ interface StagingAreaOperation {
val actionText: Supplier<@NlsActions.ActionText String>
val progressTitle: @NlsContexts.ProgressTitle String
val icon: Icon?
val errorMessage: @NlsContexts.NotificationContent String
val errorMessage: @NlsContexts.NotificationTitle String
val shortcutText: String? get() = null
fun matches(statusNode: GitFileStatusNode): Boolean
plugins/git4idea/src/git4idea/index/actions/StagingAreaOperationAction.kt
+6 -9
View File
@@ -5,16 +5,16 @@ import com.intellij.openapi.actionSystem.Presentation
import com.intellij.openapi.fileEditor.FileDocumentManager
import com.intellij.openapi.progress.ProgressManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.MessageType
import com.intellij.openapi.util.NlsContexts
import com.intellij.openapi.util.NlsContexts.NotificationContent
import com.intellij.openapi.util.NlsContexts.NotificationTitle
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.openapi.vcs.VcsNotifier
import com.intellij.vcsUtil.VcsFileUtil
import git4idea.GitContentRevision
import git4idea.GitNotificationIdsHolder
import git4idea.index.ui.GitFileStatusNode
import git4idea.repo.GitRepository
import git4idea.repo.GitRepositoryManager
@@ -88,10 +88,7 @@ fun <T> runProcess(project: Project, @NlsContexts.ProgressTitle title: String, c
title, canBeCancelled, project)
}
private fun showErrorMessage(project: Project, @NotificationContent messageTitle: String, exceptions: Collection<Exception>) {
val message = HtmlBuilder().append(HtmlChunk.text("$messageTitle:").bold())
.br()
.appendWithSeparators(HtmlChunk.br(), exceptions.map { HtmlChunk.text(it.localizedMessage) })
VcsBalloonProblemNotifier.showOverVersionControlView(project, message.toString(), MessageType.ERROR)
private fun showErrorMessage(project: Project, @NotificationTitle messageTitle: String, exceptions: Collection<Exception>) {
val message = HtmlBuilder().appendWithSeparators(HtmlChunk.br(), exceptions.map { HtmlChunk.text(it.localizedMessage) })
VcsNotifier.getInstance(project).notifyError(GitNotificationIdsHolder.STAGE_OPERATION_FAILED, messageTitle, message.toString())
}