From d8607e5f43bef4ae87e085265009af53aa26c0d5 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Thu, 1 Mar 2018 17:01:18 +0300 Subject: [PATCH] enable TD actions for all brave projects & users --- .../actions/ShowDiscoveredTestsAction.java | 17 +++-------------- .../ShowDiscoveredTestsFromChangesAction.java | 4 +++- resources/src/META-INF/IdeaPlugin.xml | 4 ++-- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsAction.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsAction.java index bf08b3f3d153..238f31e18619 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsAction.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsAction.java @@ -10,19 +10,17 @@ import com.intellij.execution.actions.RunConfigurationProducer; import com.intellij.execution.executors.DefaultRunExecutor; import com.intellij.execution.runners.ExecutionUtil; import com.intellij.execution.testDiscovery.TestDiscoveryConfigurationProducer; +import com.intellij.execution.testDiscovery.TestDiscoveryExtension; import com.intellij.execution.testDiscovery.TestDiscoveryProducer; import com.intellij.find.FindUtil; import com.intellij.find.actions.CompositeActiveComponent; import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.ide.util.DefaultPsiElementCellRenderer; -import com.intellij.lang.Language; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; -import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; @@ -32,14 +30,10 @@ import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.PopupChooserBuilder; import com.intellij.openapi.util.Couple; import com.intellij.openapi.util.Ref; -import com.intellij.openapi.vcs.VcsDataKeys; -import com.intellij.openapi.vcs.changes.Change; +import com.intellij.openapi.util.registry.Registry; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.ClassUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.PsiUtilCore; -import com.intellij.uast.UastMetaLanguage; import com.intellij.ui.CollectionListModel; import com.intellij.ui.InplaceButton; import com.intellij.ui.components.JBList; @@ -54,13 +48,8 @@ import one.util.streamex.StreamEx; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.uast.*; -import org.jetbrains.uast.visitor.AbstractUastVisitor; -import org.jetbrains.uast.visitor.UastVisitor; - import javax.swing.*; import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -71,7 +60,7 @@ import static com.intellij.openapi.actionSystem.CommonDataKeys.PSI_FILE; public class ShowDiscoveredTestsAction extends AnAction { @Override public void update(AnActionEvent e) { - e.getPresentation().setEnabledAndVisible(e.getProject() != null && findMethodAtCaret(e) != null); + e.getPresentation().setEnabledAndVisible(Registry.is(TestDiscoveryExtension.TEST_DISCOVERY_REGISTRY_KEY) && e.getProject() != null && findMethodAtCaret(e) != null); } @Override diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsFromChangesAction.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsFromChangesAction.java index 6acb0aa3eee2..20a14186ce4e 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsFromChangesAction.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowDiscoveredTestsFromChangesAction.java @@ -2,12 +2,14 @@ package com.intellij.execution.testDiscovery.actions; import com.intellij.codeInsight.actions.FormatChangedTextUtil; +import com.intellij.execution.testDiscovery.TestDiscoveryExtension; import com.intellij.lang.Language; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.editor.Document; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.Change; import com.intellij.psi.PsiDocumentManager; @@ -30,7 +32,7 @@ import java.util.stream.Collectors; public class ShowDiscoveredTestsFromChangesAction extends AnAction { @Override public void update(AnActionEvent e) { - e.getPresentation().setEnabledAndVisible(e.getProject() != null && e.getData(VcsDataKeys.CHANGES) != null); + e.getPresentation().setEnabledAndVisible(Registry.is(TestDiscoveryExtension.TEST_DISCOVERY_REGISTRY_KEY) && e.getProject() != null && e.getData(VcsDataKeys.CHANGES) != null); } @Override diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index b91b5c4f097c..d156ce01f3d0 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -400,10 +400,10 @@ - + - +