From 5033bf919e2a9ee314fd034346a67204a680b9b9 Mon Sep 17 00:00:00 2001
From: Mikhail Pyltsin <Mikhail.Pyltsin@jetbrains.com>
Date: Wed, 7 Feb 2024 13:13:25 +0100
Subject: [PATCH] [java-console] EA-1054212 Support for dumb mode and edt
 thread in ClassLoggingConsoleFilterProvider

- use platform dumb mode notification
- add support for COMMON_LOGGING_MAVEN

GitOrigin-RevId: fc032001197ff5a132f2b7300111c8ef8845dc65
---
 .../console/ClassLoggingConsoleFilterProvider.kt    |  3 ++-
 .../console/OnFlyMultipleFilesHyperlinkInfo.kt      | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassLoggingConsoleFilterProvider.kt b/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassLoggingConsoleFilterProvider.kt
index 0066094f6220..8af251edd1fc 100644
--- a/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassLoggingConsoleFilterProvider.kt
+++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/ClassLoggingConsoleFilterProvider.kt
@@ -12,7 +12,8 @@ import com.intellij.psi.search.GlobalSearchScope
 
 const val SLF4J_MAVEN = "org.slf4j:slf4j-api"
 private const val LOG4J_MAVEN = "org.apache.logging.log4j:log4j-api"
-private val LOG_MAVEN = setOf(SLF4J_MAVEN, LOG4J_MAVEN)
+private const val COMMON_LOGGING_MAVEN = "commons-logging:commons-logging"
+private val LOG_MAVEN = setOf(SLF4J_MAVEN, LOG4J_MAVEN, COMMON_LOGGING_MAVEN)
 
 class ClassLoggingConsoleFilterProvider : ConsoleFilterProvider {
   override fun getDefaultFilters(project: Project): Array<Filter> {
diff --git a/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/OnFlyMultipleFilesHyperlinkInfo.kt b/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/OnFlyMultipleFilesHyperlinkInfo.kt
index 29dd2d7cf4c5..9bdc892bf34b 100644
--- a/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/OnFlyMultipleFilesHyperlinkInfo.kt
+++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/customization/console/OnFlyMultipleFilesHyperlinkInfo.kt
@@ -7,6 +7,7 @@ import com.intellij.codeInsight.hint.HintUtil
 import com.intellij.execution.filters.HyperlinkInfoFactory.HyperlinkHandler
 import com.intellij.execution.filters.impl.MultipleFilesHyperlinkInfoBase
 import com.intellij.openapi.fileEditor.OpenFileDescriptor
+import com.intellij.openapi.project.DumbModeBlockedFunctionality
 import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.popup.Balloon
@@ -51,12 +52,14 @@ class OnFlyMultipleFilesHyperlinkInfo internal constructor(private val myInfoCac
 
   override fun showNotFound(project: Project, hyperlinkLocationPoint: RelativePoint?) {
     if (hyperlinkLocationPoint == null) return
-    val message = if (DumbService.isDumb(project)) {
-      CodeInsightBundle.message("notification.navigation.is.not.available.while.indexing")
-    }
-    else {
-      JvmAnalysisBundle.message("action.find.similar.stack.call.methods.not.found")
+    if (DumbService.isDumb(project)) {
+      DumbService.getInstance(project).showDumbModeNotificationForFunctionality(
+        CodeInsightBundle.message("message.navigation.is.not.available.here.during.index.update"),
+        DumbModeBlockedFunctionality.GotoClass
+      )
+      return
     }
+    val message = JvmAnalysisBundle.message("action.find.similar.stack.call.methods.not.found")
     val label = HintUtil.createWarningLabel(message)
     JBPopupFactory.getInstance().createBalloonBuilder(label)
       .setFadeoutTime(4000)