MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.labs.intellij.net:idea/ultimate

Browse Source
This commit is contained in:
Dmitry Cheryasov
2010-05-13 20:41:24 +03:00
parent 01ada3b7b0 46f0a8bd6a
commit 96f6e7d4ce
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/run/PythonRunConfigurationProducer.java
+3 -4
View File
@@ -1,8 +1,8 @@
package com.jetbrains.python.run;
import com.intellij.execution.Location;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl;
import com.intellij.execution.junit.RuntimeConfigurationProducer;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
@@ -27,7 +27,7 @@ public class PythonRunConfigurationProducer extends RuntimeConfigurationProducer
return mySourceFile;
}
protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(final Location location, final ConfigurationContext context) {
protected RunnerAndConfigurationSettings createConfigurationByElement(final Location location, final ConfigurationContext context) {
PsiFile script = location.getPsiElement().getContainingFile();
if (script == null || script.getFileType() != PythonFileType.INSTANCE) {
return null;
@@ -43,7 +43,7 @@ public class PythonRunConfigurationProducer extends RuntimeConfigurationProducer
mySourceFile = script;
final Project project = mySourceFile.getProject();
RunnerAndConfigurationSettingsImpl settings = cloneTemplateConfiguration(project, context);
RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context);
PythonRunConfiguration configuration = (PythonRunConfiguration) settings.getConfiguration();
final VirtualFile vFile = mySourceFile.getVirtualFile();
if (vFile == null) return null;
@@ -57,7 +57,6 @@ public class PythonRunConfigurationProducer extends RuntimeConfigurationProducer
configuration.setUseModuleSdk(true);
configuration.setModule(module);
}
copyStepsBeforeRun(project, configuration);
return settings;
}
python/src/com/jetbrains/python/testing/PythonUnitTestConfigurationProducer.java
+9 -10
View File
@@ -9,7 +9,6 @@ import com.intellij.execution.RunManager;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.execution.configurations.ConfigurationTypeUtil;
import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl;
import com.intellij.execution.junit.RuntimeConfigurationProducer;
import com.intellij.facet.Facet;
import com.intellij.facet.FacetManager;
@@ -41,7 +40,7 @@ public class PythonUnitTestConfigurationProducer extends RuntimeConfigurationPro
}
@Override
protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, ConfigurationContext context) {
protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context) {
RunnerAndConfigurationSettings settings;
Module module = location.getModule();
@@ -54,19 +53,19 @@ public class PythonUnitTestConfigurationProducer extends RuntimeConfigurationPro
}
settings = createConfigurationFromFolder(location);
if (settings != null) return (RunnerAndConfigurationSettingsImpl)settings;
if (settings != null) return settings;
final PyElement pyElement = PsiTreeUtil.getParentOfType(location.getPsiElement(), PyElement.class);
if (pyElement != null) {
settings = createConfigurationFromFunction(location, pyElement);
if (settings != null) return (RunnerAndConfigurationSettingsImpl)settings;
if (settings != null) return settings;
settings = createConfigurationFromClass(location, pyElement);
if (settings != null) return (RunnerAndConfigurationSettingsImpl)settings;
if (settings != null) return settings;
}
settings = createConfigurationFromFile(location, location.getPsiElement());
if (settings != null) return (RunnerAndConfigurationSettingsImpl)settings;
if (settings != null) return settings;
return null;
}
@@ -198,13 +197,13 @@ public class PythonUnitTestConfigurationProducer extends RuntimeConfigurationPro
}
@Override
protected RunnerAndConfigurationSettingsImpl findExistingByElement(Location location,
@NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations
protected RunnerAndConfigurationSettings findExistingByElement(Location location,
@NotNull RunnerAndConfigurationSettings[] existingConfigurations
) {
final RunnerAndConfigurationSettingsImpl settings = createConfigurationByElement(location, null);
final RunnerAndConfigurationSettings settings = createConfigurationByElement(location, null);
if (settings != null) {
final PythonUnitTestRunConfiguration configuration = (PythonUnitTestRunConfiguration)settings.getConfiguration();
for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) {
for (RunnerAndConfigurationSettings existingConfiguration : existingConfigurations) {
if (configuration.compareSettings((PythonUnitTestRunConfiguration)existingConfiguration.getConfiguration())) {
return existingConfiguration;
}
python/src/com/jetbrains/python/testing/pytest/PyTestConfigurationProducer.java
+5 -6
View File
@@ -10,7 +10,6 @@ import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.execution.configurations.ConfigurationTypeUtil;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl;
import com.intellij.execution.junit.RuntimeConfigurationProducer;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.util.Comparing;
@@ -37,7 +36,7 @@ public class PyTestConfigurationProducer extends RuntimeConfigurationProducer {
}
@Override
protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, ConfigurationContext context) {
protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context) {
PsiElement element = location.getPsiElement();
PsiFileSystemItem file = element instanceof PsiDirectory ? (PsiDirectory)element : element.getContainingFile();
if (file == null) return null;
@@ -63,7 +62,7 @@ public class PyTestConfigurationProducer extends RuntimeConfigurationProducer {
configuration.setKeywords(name);
configuration.setName(name + " in " + configuration.getName());
}
return (RunnerAndConfigurationSettingsImpl)result;
return result;
}
@Nullable
@@ -79,10 +78,10 @@ public class PyTestConfigurationProducer extends RuntimeConfigurationProducer {
}
@Override
protected RunnerAndConfigurationSettingsImpl findExistingByElement(Location location,
@NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations
protected RunnerAndConfigurationSettings findExistingByElement(Location location,
@NotNull RunnerAndConfigurationSettings[] existingConfigurations
) {
for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) {
for (RunnerAndConfigurationSettings existingConfiguration : existingConfigurations) {
final RunConfiguration configuration = existingConfiguration.getConfiguration();
PyTestRunConfiguration pyTestRunConfiguration = (PyTestRunConfiguration)configuration;
final PsiElement element = location.getPsiElement();