Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed getActionUpdateThread (backport of e3b3fa3) #6270

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Fixed getActionUpdateThread (backport of e3b3fa3) #6270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b94d90f
Move Bazel action state updates to BGT.
Mar 11, 2024
8e1778d
Fixed conflicts with google changes
LeFrosch Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions base/src/com/google/idea/blaze/base/actions/BlazeMenuGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@
/** The "Blaze" menu group, only visible in blaze mode */
public class BlazeMenuGroup extends DefaultActionGroup {

@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
}

@Override
public final void update(AnActionEvent e) {
// Don't hide the menu if project is null: it will be null temporarily while loading a
Expand Down Expand Up @@ -59,4 +54,9 @@ private static String menuName(BuildSystemName buildSystemName) {
public boolean isDumbAware() {
return true;
}

@Override
public ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.EDT;
}
}
10 changes: 5 additions & 5 deletions base/src/com/google/idea/blaze/base/actions/BlazeProjectAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ protected BlazeProjectAction(
super(text, description, icon);
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
}

@Override
public final void update(AnActionEvent e) {
Project project = e.getProject();
Expand Down Expand Up @@ -132,6 +127,11 @@ public final void actionPerformed(AnActionEvent anActionEvent) {

protected void updateForBlazeProject(Project project, AnActionEvent e) {}

@Override
public ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
}

protected abstract void actionPerformedInBlazeProject(Project project, AnActionEvent e);

private boolean compatibleBuildSystem(Project project) {
Expand Down
10 changes: 5 additions & 5 deletions base/src/com/google/idea/blaze/base/actions/BlazeProjectToggleAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ protected BlazeProjectToggleAction(
super(text, description, icon);
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
}

@Override
public final void update(AnActionEvent e) {
Project project = e.getProject();
Expand All @@ -56,4 +51,9 @@ public final void update(AnActionEvent e) {
}

protected void updateForBlazeProject(Project project, AnActionEvent e) {}

@Override
public ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
}
}
10 changes: 5 additions & 5 deletions base/src/com/google/idea/blaze/base/run/exporter/ExportRunConfigurationDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,11 +259,6 @@ private SelectAllButton() {
super("Select All", AllIcons.Actions.Selectall);
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
}

@Override
public synchronized void actionPerformed(AnActionEvent anActionEvent) {
boolean newState = !allSelected;
Expand All @@ -283,5 +278,10 @@ public synchronized void actionPerformed(AnActionEvent anActionEvent) {
table.revalidate();
table.repaint();
}

@Override
public ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.EDT;
}
}
}
7 changes: 7 additions & 0 deletions base/src/com/google/idea/blaze/base/sync/actions/IncrementalSyncProjectAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.intellij.notification.NotificationGroup;
import com.intellij.notification.NotificationType;
import com.intellij.notification.Notifications;
import com.intellij.openapi.actionSystem.ActionUpdateThread;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.application.ApplicationNamesInfo;
Expand Down Expand Up @@ -117,4 +118,10 @@ private static void showPopupNotification(Project project) {
protected QuerySyncStatus querySyncSupport() {
return QuerySyncStatus.SUPPORTED;
}

@Override
public ActionUpdateThread getActionUpdateThread() {
// Not clear what `showPopupNotification` does and why.
return ActionUpdateThread.EDT;
}
}
8 changes: 4 additions & 4 deletions base/src/com/google/idea/blaze/base/toolwindow/ConsoleView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,13 +272,13 @@ public void actionPerformed(AnActionEvent e) {
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
public void update(AnActionEvent event) {
event.getPresentation().setEnabled(stopHandler != null);
}

@Override
public void update(AnActionEvent event) {
event.getPresentation().setEnabled(stopHandler != null);
public ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.EDT;
}
}

Expand Down
20 changes: 10 additions & 10 deletions base/src/com/google/idea/blaze/base/ui/problems/BlazeProblemsViewPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,6 @@ public AutoscrollToConsoleAction() {
super("Autoscroll to console", "Autoscroll to console", AllIcons.Debugger.Console);
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
}

@Override
public boolean isSelected(AnActionEvent event) {
return configuration.getAutoscrollToConsole();
Expand All @@ -189,6 +184,11 @@ public boolean isSelected(AnActionEvent event) {
public void setSelected(AnActionEvent event, boolean flag) {
configuration.setAutoscrollToConsole(flag);
}

@Override
public ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.EDT;
}
}

private static class OpenInConsoleAction extends BaseNavigateToSourceAction {
Expand Down Expand Up @@ -217,11 +217,6 @@ private class ShowWarningsAction extends ToggleAction implements DumbAware {
configuration = ErrorTreeViewConfiguration.getInstance(getProject());
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
}

@Override
public boolean isSelected(AnActionEvent event) {
return !configuration.isHideWarnings();
Expand All @@ -234,6 +229,11 @@ public void setSelected(AnActionEvent event, boolean showWarnings) {
reload();
}
}

@Override
public ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.EDT;
}
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions base/src/com/google/idea/blaze/base/wizard2/BlazeImportProjectAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@ protected ProjectImportWizardStep[] getSteps(WizardContext context) {
createFromWizard(projectCreator, wizard.context);
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
}

@Override
public void update(AnActionEvent e) {
super.update(e);
e.getPresentation()
.setText(String.format("Import %s Project...", Blaze.defaultBuildSystemName()));
}

@Override
public ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.EDT;
}

private static void createFromWizard(
BlazeProjectCreator blazeProjectCreator, WizardContext wizardContext) {
try {
Expand Down
6 changes: 6 additions & 0 deletions java/src/com/google/idea/blaze/java/run/hotswap/BlazeHotSwapAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.google.idea.common.actions.ReplaceActionHelper;
import com.intellij.debugger.actions.HotSwapAction;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.ActionUpdateThread;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.impl.ActionConfigurationCustomizer;
Expand Down Expand Up @@ -60,4 +61,9 @@ public void update(AnActionEvent e) {
&& BlazeHotSwapManager.findHotSwappableBlazeDebuggerSession(e.getProject()) != null;
e.getPresentation().setEnabled(canHotSwap);
}

@Override
public ActionUpdateThread getActionUpdateThread() {
return ActionUpdateThread.BGT;
}
}
Loading