fix intellij plugin

Checkmarx · Sep 4, 2024 · ade15b1 · ade15b1
1 parent 0bd65bf
commit ade15b1
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 5 deletions.
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/CancelScanAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/CancelScanAction.java
@@ -8,6 +8,7 @@
 import com.intellij.ide.ActivityTracker;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.notification.NotificationType;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.diagnostic.Logger;
@@ -62,8 +63,12 @@ public void update(@NotNull AnActionEvent e) {
             e.getPresentation().setEnabled(isScanRunning);
         }
         catch (Exception ex) {
-            ex.printStackTrace();
-            e.getPresentation().setEnabled(false);
+            e.getPresentation().setEnabled(true);
         }
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
+    }
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/CollapseAllAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/CollapseAllAction.java
@@ -3,6 +3,7 @@
 import com.checkmarx.intellij.Bundle;
 import com.checkmarx.intellij.Resource;
 import com.checkmarx.intellij.tool.window.CxToolWindowPanel;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import org.jetbrains.annotations.NotNull;
@@ -28,4 +29,9 @@ public CollapseAllAction() {
     public void actionPerformed(@NotNull AnActionEvent e) {
         Optional.ofNullable(getCxToolWindowPanel(e)).ifPresent(CxToolWindowPanel::collapseAll);
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/ExpandAllAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/ExpandAllAction.java
@@ -3,6 +3,7 @@
 import com.checkmarx.intellij.Bundle;
 import com.checkmarx.intellij.Resource;
 import com.checkmarx.intellij.tool.window.CxToolWindowPanel;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import org.jetbrains.annotations.NotNull;
@@ -28,4 +29,9 @@ public ExpandAllAction() {
     public void actionPerformed(@NotNull AnActionEvent e) {
         Optional.ofNullable(getCxToolWindowPanel(e)).ifPresent(CxToolWindowPanel::expandAll);
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/OpenSettingsAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/OpenSettingsAction.java
@@ -3,6 +3,7 @@
 import com.checkmarx.intellij.Bundle;
 import com.checkmarx.intellij.Resource;
 import com.checkmarx.intellij.settings.global.GlobalSettingsConfigurable;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.options.ShowSettingsUtil;
@@ -27,4 +28,9 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         ShowSettingsUtil.getInstance()
                         .showSettingsDialog(e.getProject(), GlobalSettingsConfigurable.class);
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/StartScanAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/StartScanAction.java
@@ -15,6 +15,7 @@
 import com.intellij.ide.ActivityTracker;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.notification.*;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.diagnostic.Logger;
@@ -71,7 +72,6 @@ public static Boolean getUserHasPermissionsToScan() {
                 userHasPermissionsToScan = TenantSetting.isScanAllowed();
             } catch (Exception ex) {
                 userHasPermissionsToScan = false;
-                LOGGER.error(ex);
             }
         }
         return userHasPermissionsToScan;
@@ -289,7 +289,6 @@ public void update(@NotNull AnActionEvent e) {
             e.getPresentation().setEnabled(!isScanRunning && !isPollingScan && !scanTriggered && projectAndBranchSelected);
         }
         catch (Exception ex) {
-            LOGGER.error(ex);
             e.getPresentation().setEnabled(false);
         }
     }
@@ -311,4 +310,9 @@ public static void cancelRunningScan() {
     private static String msg(Resource resource, Object... params) {
         return Bundle.message(resource, params);
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
+    }
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/filter/FilterBaseAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/filter/FilterBaseAction.java
@@ -4,6 +4,7 @@
 import com.checkmarx.intellij.tool.window.ResultState;
 import com.checkmarx.intellij.tool.window.Severity;
 import com.checkmarx.intellij.tool.window.actions.CxToolWindowAction;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.openapi.application.ApplicationManager;
@@ -211,4 +212,9 @@ public interface FilterChanged {
          */
         void filterChanged();
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/group/by/GroupByActionGroup.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/group/by/GroupByActionGroup.java
@@ -1,5 +1,6 @@
 package com.checkmarx.intellij.tool.window.actions.group.by;
 
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.project.DumbAware;
@@ -12,4 +13,9 @@ public void update(@NotNull AnActionEvent e) {
         super.update(e);
         e.getPresentation().setEnabled(true);
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/group/by/GroupByBaseAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/group/by/GroupByBaseAction.java
@@ -2,6 +2,7 @@
 
 import com.checkmarx.intellij.tool.window.actions.CxToolWindowAction;
 import com.checkmarx.intellij.tool.window.GroupBy;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.openapi.util.NlsActions;
@@ -32,4 +33,9 @@ public void setSelected(@NotNull AnActionEvent e, boolean state) {
     }
 
     protected abstract GroupBy getGroupBy();
+
+    @Override
+    public ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/BaseSelectionGroup.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/BaseSelectionGroup.java
@@ -6,6 +6,7 @@
 import com.checkmarx.intellij.tool.window.actions.CxToolWindowAction;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.project.DumbAware;
@@ -83,4 +84,10 @@ public void update(@NotNull AnActionEvent e) {
      * @param scan overriding scan
      */
     abstract void override(Scan scan);
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
+
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/BranchSelectionGroup.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/BranchSelectionGroup.java
@@ -5,6 +5,7 @@
 import com.checkmarx.intellij.Constants;
 import com.checkmarx.intellij.Resource;
 import com.checkmarx.intellij.Utils;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.application.ApplicationManager;

diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/ResetSelectionAction.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/ResetSelectionAction.java
@@ -4,6 +4,7 @@
 import com.checkmarx.intellij.Resource;
 import com.checkmarx.intellij.tool.window.actions.CxToolWindowAction;
 import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import lombok.Getter;
@@ -45,4 +46,9 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             cxToolWindowPanel.resetPanel();
         });
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
 }
diff --git a/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/RootGroup.java b/src/main/java/com/checkmarx/intellij/tool/window/actions/selection/RootGroup.java
@@ -2,6 +2,7 @@
 
 import com.checkmarx.intellij.commands.Scan;
 import com.checkmarx.intellij.tool.window.actions.CxToolWindowAction;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.DumbAware;
@@ -64,15 +65,23 @@ public void setEnabled(boolean enabled) {
         projectSelectionGroup.setEnabled(enabled);
         branchSelectionGroup.setEnabled(enabled);
         scanSelectionGroup.setEnabled(enabled);
-        resetSelectionAction.setEnabled(enabled);
+        if (resetSelectionAction != null) {
+            resetSelectionAction.setEnabled(enabled);
+        }
         refreshPanel(project);
     }
 
+
     public void reset() {
         projectSelectionGroup.clear();
         branchSelectionGroup.clear();
         scanSelectionGroup.clear();
         refreshPanel(project);
         projectSelectionGroup.refresh();
     }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
 }