From 678768c069db7e74b821b8d1fa460604b22ee810 Mon Sep 17 00:00:00 2001 From: Carl-Robert Linnupuu Date: Tue, 12 Mar 2024 23:10:34 +0200 Subject: [PATCH] fix: intellij platform warning (#400) --- .../actions/DisableCompletionsAction.java | 6 ++++++ .../actions/EnableCompletionsAction.java | 6 ++++++ .../GenerateGitCommitMessageAction.java | 6 ++++++ .../codegpt/actions/TrackableAction.java | 1 - .../codegpt/actions/editor/AskAction.java | 6 ++++++ .../toolwindow/ClearChatWindowAction.java | 6 ++++++ .../DeleteAllConversationsAction.java | 6 ++++++ .../toolwindow/DeleteConversationAction.java | 6 ++++++ .../actions/toolwindow/MoveAction.java | 6 ++++++ .../actions/toolwindow/MoveDownAction.java | 6 ------ .../actions/toolwindow/MoveUpAction.java | 6 ------ .../toolwindow/OpenInEditorAction.java | 6 ++++++ .../ReplaceCodeInMainEditorAction.java | 6 ++++++ .../chat/ui/textarea/ModelComboBoxAction.java | 21 +++++++++++++++++++ 14 files changed, 81 insertions(+), 13 deletions(-) diff --git a/src/main/java/ee/carlrobert/codegpt/actions/DisableCompletionsAction.java b/src/main/java/ee/carlrobert/codegpt/actions/DisableCompletionsAction.java index da648ffd..b9c29684 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/DisableCompletionsAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/DisableCompletionsAction.java @@ -3,6 +3,7 @@ package ee.carlrobert.codegpt.actions; import static ee.carlrobert.codegpt.settings.service.ServiceType.LLAMA_CPP; import static ee.carlrobert.codegpt.settings.service.ServiceType.OPENAI; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationManager; @@ -34,4 +35,9 @@ public class DisableCompletionsAction extends AnAction { e.getPresentation() .setVisible(codeCompletionEnabled && List.of(OPENAI, LLAMA_CPP).contains(selectedService)); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } } diff --git a/src/main/java/ee/carlrobert/codegpt/actions/EnableCompletionsAction.java b/src/main/java/ee/carlrobert/codegpt/actions/EnableCompletionsAction.java index 5ec3d06b..e646e997 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/EnableCompletionsAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/EnableCompletionsAction.java @@ -3,6 +3,7 @@ package ee.carlrobert.codegpt.actions; import static ee.carlrobert.codegpt.settings.service.ServiceType.LLAMA_CPP; import static ee.carlrobert.codegpt.settings.service.ServiceType.OPENAI; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationManager; @@ -32,4 +33,9 @@ public class EnableCompletionsAction extends AnAction { e.getPresentation() .setVisible(!codeCompletionEnabled && List.of(OPENAI, LLAMA_CPP).contains(selectedService)); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } } diff --git a/src/main/java/ee/carlrobert/codegpt/actions/GenerateGitCommitMessageAction.java b/src/main/java/ee/carlrobert/codegpt/actions/GenerateGitCommitMessageAction.java index f65a7692..eadbb06d 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/GenerateGitCommitMessageAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/GenerateGitCommitMessageAction.java @@ -14,6 +14,7 @@ import static java.util.stream.Collectors.toList; import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationManager; @@ -117,6 +118,11 @@ public class GenerateGitCommitMessageAction extends AnAction { } } + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.EDT; + } + private CompletionEventListener getEventListener(Project project, Document document) { return new CompletionEventListener<>() { private final StringBuilder messageBuilder = new StringBuilder(); diff --git a/src/main/java/ee/carlrobert/codegpt/actions/TrackableAction.java b/src/main/java/ee/carlrobert/codegpt/actions/TrackableAction.java index 0975640c..66ad38ee 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/TrackableAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/TrackableAction.java @@ -3,7 +3,6 @@ package ee.carlrobert.codegpt.actions; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.editor.Editor; -import ee.carlrobert.codegpt.actions.ActionType; import ee.carlrobert.codegpt.telemetry.TelemetryAction; import javax.swing.Icon; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/ee/carlrobert/codegpt/actions/editor/AskAction.java b/src/main/java/ee/carlrobert/codegpt/actions/editor/AskAction.java index 3b8fcd0b..4d73aafb 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/editor/AskAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/editor/AskAction.java @@ -1,5 +1,6 @@ package ee.carlrobert.codegpt.actions.editor; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import ee.carlrobert.codegpt.Icons; @@ -31,4 +32,9 @@ public class AskAction extends AnAction { } } } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } } diff --git a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ClearChatWindowAction.java b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ClearChatWindowAction.java index 62d835d9..93b69207 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ClearChatWindowAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ClearChatWindowAction.java @@ -1,6 +1,7 @@ package ee.carlrobert.codegpt.actions.toolwindow; import com.intellij.icons.AllIcons; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import ee.carlrobert.codegpt.actions.ActionType; @@ -37,4 +38,9 @@ public class ClearChatWindowAction extends AnAction { .send(); } } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } } \ No newline at end of file diff --git a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/DeleteAllConversationsAction.java b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/DeleteAllConversationsAction.java index dab31ba8..b3e4da65 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/DeleteAllConversationsAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/DeleteAllConversationsAction.java @@ -3,6 +3,7 @@ package ee.carlrobert.codegpt.actions.toolwindow; import static ee.carlrobert.codegpt.Icons.Default; import com.intellij.icons.AllIcons; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ui.Messages; @@ -53,4 +54,9 @@ public class DeleteAllConversationsAction extends AnAction { this.onRefresh.run(); } } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } } diff --git a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/DeleteConversationAction.java b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/DeleteConversationAction.java index be822ad6..2d235f5c 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/DeleteConversationAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/DeleteConversationAction.java @@ -1,6 +1,7 @@ package ee.carlrobert.codegpt.actions.toolwindow; import com.intellij.icons.AllIcons; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ui.Messages; @@ -38,4 +39,9 @@ public class DeleteConversationAction extends AnAction { } } } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } } diff --git a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveAction.java b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveAction.java index 50dd2b57..ab3ba200 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveAction.java @@ -1,5 +1,6 @@ package ee.carlrobert.codegpt.actions.toolwindow; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; @@ -36,4 +37,9 @@ public abstract class MoveAction extends AnAction { }); } } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } } diff --git a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveDownAction.java b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveDownAction.java index fa311f94..8abccc84 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveDownAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveDownAction.java @@ -1,7 +1,6 @@ package ee.carlrobert.codegpt.actions.toolwindow; import com.intellij.icons.AllIcons; -import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; import ee.carlrobert.codegpt.actions.editor.EditorActionsUtil; import ee.carlrobert.codegpt.conversations.Conversation; @@ -16,11 +15,6 @@ public class MoveDownAction extends MoveAction { EditorActionsUtil.registerOrReplaceAction(this); } - @Override - public void update(@NotNull AnActionEvent event) { - super.update(event); - } - @Override protected Optional getConversation(@NotNull Project project) { return ConversationService.getInstance().getPreviousConversation(); diff --git a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveUpAction.java b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveUpAction.java index d3b6b28b..dccb6f5c 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveUpAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/MoveUpAction.java @@ -1,7 +1,6 @@ package ee.carlrobert.codegpt.actions.toolwindow; import com.intellij.icons.AllIcons; -import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; import ee.carlrobert.codegpt.actions.editor.EditorActionsUtil; import ee.carlrobert.codegpt.conversations.Conversation; @@ -16,11 +15,6 @@ public class MoveUpAction extends MoveAction { EditorActionsUtil.registerOrReplaceAction(this); } - @Override - public void update(@NotNull AnActionEvent event) { - super.update(event); - } - @Override protected Optional getConversation(@NotNull Project project) { return ConversationService.getInstance().getPreviousConversation(); diff --git a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/OpenInEditorAction.java b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/OpenInEditorAction.java index c3ba49d7..650923d8 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/OpenInEditorAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/OpenInEditorAction.java @@ -4,6 +4,7 @@ import static java.lang.String.format; import static java.util.Objects.requireNonNull; import com.intellij.icons.AllIcons; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.fileEditor.FileEditorManager; @@ -60,4 +61,9 @@ public class OpenInEditorAction extends AnAction { .send(); } } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } } diff --git a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ReplaceCodeInMainEditorAction.java b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ReplaceCodeInMainEditorAction.java index 5bcd92cf..afe6f7e8 100644 --- a/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ReplaceCodeInMainEditorAction.java +++ b/src/main/java/ee/carlrobert/codegpt/actions/toolwindow/ReplaceCodeInMainEditorAction.java @@ -3,6 +3,7 @@ package ee.carlrobert.codegpt.actions.toolwindow; import static java.util.Objects.requireNonNull; import com.intellij.icons.AllIcons; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -34,4 +35,9 @@ public class ReplaceCodeInMainEditorAction extends AnAction { requireNonNull(toolWindowEditor.getSelectionModel().getSelectedText())); } } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.EDT; + } } diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java index 9fe48b23..d7f11dc6 100644 --- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java +++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/textarea/ModelComboBoxAction.java @@ -5,6 +5,7 @@ import static ee.carlrobert.codegpt.settings.service.ServiceType.OPENAI; import static ee.carlrobert.codegpt.settings.service.ServiceType.YOU; import static java.lang.String.format; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DefaultActionGroup; @@ -211,6 +212,11 @@ public class ModelComboBoxAction extends ComboBoxAction { public void actionPerformed(@NotNull AnActionEvent e) { handleProviderChange(serviceType, label, icon, comboBoxPresentation); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } }; } @@ -252,6 +258,11 @@ public class ModelComboBoxAction extends ComboBoxAction { Icons.OpenAI, comboBoxPresentation); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } }; } @@ -276,6 +287,11 @@ public class ModelComboBoxAction extends ComboBoxAction { Icons.YouSmall, comboBoxPresentation); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } }; } @@ -301,6 +317,11 @@ public class ModelComboBoxAction extends ComboBoxAction { Icons.YouSmall, comboBoxPresentation); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return ActionUpdateThread.BGT; + } }; } }