Merge pull request #2705 from digma-ai/jcef-workaround

shalom938 · web-flow · commit b925c1f32a7a · 2025-04-29T23:18:33.000+03:00
show jcef workaround message
diff --git a/src/main/java/org/digma/intellij/plugin/toolwindow/DigmaSidePaneToolWindowFactory.java b/src/main/java/org/digma/intellij/plugin/toolwindow/DigmaSidePaneToolWindowFactory.java
@@ -26,6 +26,7 @@
 import java.util.Collections;
 import java.util.function.*;
 
+import static org.digma.intellij.plugin.ui.common.JcefRemoteUtilsKt.*;
 import static org.digma.intellij.plugin.ui.common.MainToolWindowPanelKt.createMainToolWindowPanel;
 
 
@@ -49,6 +50,20 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
 
         Log.log(LOGGER::info, project, "creating main tool window for project  {}", project);
 
+        //patch for jcef issue:
+        //https://github.com/digma-ai/digma-intellij-plugin/issues/2668
+        //https://github.com/digma-ai/digma-intellij-plugin/issues/2669
+        //https://youtrack.jetbrains.com/issue/IDEA-367610/jcef-initialization-crash-in-latest-2025.1-EAP-NullPointerException-Cannot-read-field-jsQueryFunction-because-config-is-null
+        if (is2025EAPWithJCEFRemoteEnabled()){
+            Log.log(LOGGER::info, project, "Jcef remote enabled for EAP , creating user message panel", project);
+            sendPosthogEvent("Main");
+            var messagePanel = create2025EAPMessagePanel(project);
+            var content = ContentFactory.getInstance().createContent(messagePanel, null, false);
+            toolWindow.getContentManager().addContent(content);
+            return;
+        }
+
+
         //initialize AnalyticsService early so the UI can detect the connection status when created
         AnalyticsService.getInstance(project);
         //initialize BackendInfoHolder early so it will populate its info soon
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/common/JcefRemoteUtils.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/common/JcefRemoteUtils.kt
@@ -15,7 +15,6 @@ import javax.swing.JPanel
 
 
 fun is2025EAPWithJCEFRemoteEnabled(): Boolean {
-
     return if (ApplicationInfo.getInstance().build.baselineVersion == 251){
         //just touch it so it will initialize static variables
         val isJcefSupported = JBCefApp.isSupported()
@@ -39,3 +38,46 @@ fun sendPosthogEvent(appName:String) {
 
 }
 
+
+fun create2025EAPMessagePanel(project:Project): JPanel {
+
+    val mainPanel = JPanel(BorderLayout())
+    mainPanel.isOpaque = false
+    mainPanel.border = empty()
+    mainPanel.background = listBackground()
+
+    val htmlText = getMessageHtml()
+    val textPane = createTextPaneWithHtml(htmlText)
+
+    mainPanel.add(textPane, BorderLayout.CENTER)
+
+    val slackPanel = createSlackLinkPanel(project)
+    mainPanel.add(slackPanel,BorderLayout.SOUTH)
+
+    return wrapWithScrollable(mainPanel)
+}
+
+
+fun getMessageHtml(): String {
+
+    val title = "Digma 2025.* workaround"
+    val paragraph = "The latest Jetbrains 2025.* has an issue with JCEF that prevents Digma from working," +
+            "Please add the following system properties to fix, and restart your IDE:"
+    val paragraph2 = "Open the Idea help menu, search for 'Edit Custom Properties', add 'jcef.remote.enabled=false' and restart your IDE"
+
+    return "<html>" +
+            "<head>" +
+            "<style>" +
+            "h3 {text-align: center;}" +
+            "p {text-align: center;}" +
+            "div {text-align: center;}" +
+            "</style>" +
+            "</head>" +
+            "<body>" +
+            "<h3>$title</h3>" +
+            "<p>$paragraph</p>" +
+            "<p>$paragraph2</p>" +
+            "</body>" +
+            "</html>"
+}
+
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityToolWindowFactory.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityToolWindowFactory.kt
@@ -12,6 +12,9 @@ import org.digma.intellij.plugin.analytics.AnalyticsService
 import org.digma.intellij.plugin.log.Log
 import org.digma.intellij.plugin.recentactivity.RecentActivityToolWindowShower
 import org.digma.intellij.plugin.ui.RecentActivityToolWindowCardsController
+import org.digma.intellij.plugin.ui.common.create2025EAPMessagePanel
+import org.digma.intellij.plugin.ui.common.is2025EAPWithJCEFRemoteEnabled
+import org.digma.intellij.plugin.ui.common.sendPosthogEvent
 import org.digma.intellij.plugin.ui.common.statuspanels.createAggressiveUpdatePanel
 import org.digma.intellij.plugin.ui.common.statuspanels.createNoConnectionPanel
 import java.awt.CardLayout
@@ -25,6 +28,19 @@ class RecentActivityToolWindowFactory : ToolWindowFactory {
 
         Log.log(logger::info, project, "creating recent activity tool window for project  {}", project)
 
+        //patch for jcef issue:
+        //https://github.com/digma-ai/digma-intellij-plugin/issues/2668
+        //https://github.com/digma-ai/digma-intellij-plugin/issues/2669
+        //https://youtrack.jetbrains.com/issue/IDEA-367610/jcef-initialization-crash-in-latest-2025.1-EAP-NullPointerException-Cannot-read-field-jsQueryFunction-because-config-is-null
+        if (is2025EAPWithJCEFRemoteEnabled()){
+            Log.log(logger::info, project, "Jcef remote enabled for EAP , creating user message panel", project)
+            sendPosthogEvent("Recent Activity")
+            val messagePanel = create2025EAPMessagePanel(project)
+            val content = ContentFactory.getInstance().createContent(messagePanel, null, false)
+            toolWindow.contentManager.addContent(content)
+            return
+        }
+
         //initialize AnalyticsService early so the UI can detect the connection status when created
         AnalyticsService.getInstance(project)
 
