Remove SparkJobRun/Debug actions from test sources context

andxu · Dec 28, 2018 · e479052 · e479052
1 parent 1ea7d49
commit e479052
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/...c/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobLocalRunConfigurationProducer.java b/...c/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobLocalRunConfigurationProducer.java
@@ -41,6 +41,8 @@
 
 import java.util.Optional;
 
+import static com.intellij.openapi.roots.TestSourcesFilter.isTestSources;
+
 public class SparkBatchJobLocalRunConfigurationProducer extends JavaRunConfigurationProducerBase<LivySparkBatchJobRunConfiguration> {
     private SparkApplicationType applicationType;
 
@@ -57,8 +59,10 @@ public boolean setupConfigurationFromContext(LivySparkBatchJobRunConfiguration c
         } else {
             return Optional.ofNullable(context.getModule())
                     .map(Module::getProject)
-                    .flatMap(project -> Optional.ofNullable(SparkContextUtilsKt.getSparkMainClassWithElement(context))
-                            .filter(mainClass -> SparkContextUtilsKt.isSparkContext(mainClass.getContainingFile())))
+                    .flatMap(project -> Optional
+                            .ofNullable(SparkContextUtilsKt.getSparkMainClassWithElement(context))
+                            .filter(mainClass -> SparkContextUtilsKt.isSparkContext(mainClass.getContainingFile()) &&
+                                    !isTestSources(mainClass.getContainingFile().getVirtualFile(), project)))
                     .map(mainClass -> {
                         setupConfiguration(configuration, mainClass, context);
 
@@ -101,6 +105,10 @@ public boolean isConfigurationFromContext(LivySparkBatchJobRunConfiguration jobC
                         return false;
                     }
 
+                    if (isTestSources(mainClass.getContainingFile().getVirtualFile(), jobConfiguration.getProject())) {
+                        return false;
+                    }
+
                     final Module configurationModule = jobConfiguration.getConfigurationModule().getModule();
 
                     if (!Comparing.equal(context.getModule(), configurationModule)) {

diff --git a/...ntellij/src/com/microsoft/azure/hdinsight/spark/run/action/SparkRunConfigurationAction.kt b/...ntellij/src/com/microsoft/azure/hdinsight/spark/run/action/SparkRunConfigurationAction.kt
@@ -28,6 +28,7 @@ import com.intellij.execution.RunnerAndConfigurationSettings
 import com.intellij.execution.RunnerRegistry
 import com.intellij.execution.runners.ExecutionEnvironmentBuilder
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.roots.TestSourcesFilter.isTestSources
 import com.microsoft.azure.hdinsight.common.logger.ILogger
 import com.microsoft.azure.hdinsight.spark.run.configuration.LivySparkBatchJobRunConfiguration
 import com.microsoft.azure.hdinsight.spark.run.getNormalizedClassNameForSpark
@@ -58,11 +59,15 @@ abstract class SparkRunConfigurationAction : AzureAnAction, ILogger {
         val runManagerEx = RunManagerEx.getInstanceEx(project)
         val selectedConfigSettings = runManagerEx.selectedConfiguration
 
+        val mainClass = actionEvent.dataContext.getSparkConfigurationContext()?.getSparkMainClassWithElement()
+        if (mainClass?.containingFile?.let { isTestSources(it.virtualFile, project) } == true) {
+            return
+        }
+
         presentation.apply {
             when {
-                actionEvent.isFromActionToolbar -> {
-                    isEnabledAndVisible = canRun(selectedConfigSettings?: return)
-                }
+
+                actionEvent.isFromActionToolbar -> isEnabledAndVisible = canRun(selectedConfigSettings?: return)
                 else -> {
                     // From context menu or Line marker action menu
                     isEnabledAndVisible = actionEvent.dataContext.isSparkContext()