diff --git a/python/python-rest/src/com/jetbrains/rest/run/docutils/DocutilsConfigurationProducer.java b/python/python-rest/src/com/jetbrains/rest/run/docutils/DocutilsConfigurationProducer.java index 7a87617624df..95ce5988f9a5 100644 --- a/python/python-rest/src/com/jetbrains/rest/run/docutils/DocutilsConfigurationProducer.java +++ b/python/python-rest/src/com/jetbrains/rest/run/docutils/DocutilsConfigurationProducer.java @@ -1,8 +1,6 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.jetbrains.rest.run.docutils; -import com.intellij.execution.RunManager; -import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.actions.LazyRunConfigurationProducer; import com.intellij.execution.configurations.ConfigurationFactory; @@ -14,14 +12,12 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.util.containers.ContainerUtil; import com.jetbrains.rest.RestFileType; +import com.jetbrains.rest.run.RestRunConfiguration; import com.jetbrains.rest.run.RestRunConfigurationType; import org.jetbrains.annotations.NotNull; -import java.util.List; - -public class DocutilsConfigurationProducer extends LazyRunConfigurationProducer { +public class DocutilsConfigurationProducer extends LazyRunConfigurationProducer { @NotNull @Override public ConfigurationFactory getConfigurationFactory() { @@ -29,9 +25,10 @@ public class DocutilsConfigurationProducer extends LazyRunConfigurationProducer< } @Override - protected boolean setupConfigurationFromContext(@NotNull DocutilsRunConfiguration configuration, + protected boolean setupConfigurationFromContext(@NotNull RestRunConfiguration configuration, @NotNull ConfigurationContext context, @NotNull Ref sourceElement) { + assert (configuration instanceof DocutilsRunConfiguration); PsiFile script = sourceElement.get().getContainingFile(); if (script == null || script.getFileType() != RestFileType.INSTANCE) { return false; @@ -68,7 +65,7 @@ public class DocutilsConfigurationProducer extends LazyRunConfigurationProducer< } @Override - public boolean isConfigurationFromContext(@NotNull DocutilsRunConfiguration configuration, @NotNull ConfigurationContext context) { + public boolean isConfigurationFromContext(@NotNull RestRunConfiguration configuration, @NotNull ConfigurationContext context) { final PsiElement element = context.getPsiLocation(); if (element == null) { return false; @@ -85,10 +82,4 @@ public class DocutilsConfigurationProducer extends LazyRunConfigurationProducer< final String scriptName = configuration.getInputFile(); return FileUtil.toSystemIndependentName(scriptName).equals(FileUtil.toSystemIndependentName(path)); } - - @Override - protected @NotNull List getConfigurationSettingsList(@NotNull RunManager runManager) { - return ContainerUtil.filter(super.getConfigurationSettingsList(runManager), - s -> s.getConfiguration() instanceof DocutilsRunConfiguration); - } } diff --git a/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxConfigurationProducer.java b/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxConfigurationProducer.java index 7543ea48477d..e98c6b4217ec 100644 --- a/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxConfigurationProducer.java +++ b/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxConfigurationProducer.java @@ -1,8 +1,6 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.jetbrains.rest.run.sphinx; -import com.intellij.execution.RunManager; -import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.actions.LazyRunConfigurationProducer; import com.intellij.execution.configurations.ConfigurationFactory; @@ -14,14 +12,12 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.util.containers.ContainerUtil; import com.jetbrains.rest.RestFile; +import com.jetbrains.rest.run.RestRunConfiguration; import com.jetbrains.rest.run.RestRunConfigurationType; import org.jetbrains.annotations.NotNull; -import java.util.List; - -public class SphinxConfigurationProducer extends LazyRunConfigurationProducer { +public class SphinxConfigurationProducer extends LazyRunConfigurationProducer { @NotNull @Override public ConfigurationFactory getConfigurationFactory() { @@ -29,9 +25,10 @@ public class SphinxConfigurationProducer extends LazyRunConfigurationProducer sourceElement) { + assert (configuration instanceof SphinxRunConfiguration); PsiElement element = sourceElement.get(); if (!(element instanceof PsiDirectory)) return false; @@ -68,7 +65,7 @@ public class SphinxConfigurationProducer extends LazyRunConfigurationProducer getConfigurationSettingsList(@NotNull RunManager runManager) { - return ContainerUtil.filter(super.getConfigurationSettingsList(runManager), - s -> s.getConfiguration() instanceof SphinxRunConfiguration); - } }