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

better diagnostics for EA-72923 - CCE: AllInDirectoryConfigurationProducer.setupConfigurationFromContext

Browse Source
This commit is contained in:
Dmitry Avdeev
2015-09-18 16:10:34 +03:00
parent 7d443bfb62
commit 3084a24112
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java
+11 -8
View File
@@ -85,19 +85,16 @@ public abstract class RunConfigurationProducer<T extends RunConfiguration> {
@Nullable
public ConfigurationFromContext createConfigurationFromContext(ConfigurationContext context) {
final RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(context);
final Ref<PsiElement> locationRef = new Ref<PsiElement>(context.getPsiLocation());
T configuration = null;
try {
configuration = (T)settings.getConfiguration();
if (!setupConfigurationFromContext((T)settings.getConfiguration(), context, new Ref<PsiElement>(context.getPsiLocation()))) {
return null;
}
}
catch (ClassCastException e) {
LOG.error(myConfigurationFactory + " produced wrong type", e);
return null;
}
if (!setupConfigurationFromContext(configuration, context, locationRef)) {
return null;
}
return new ConfigurationFromContextImpl(this, settings, locationRef.get());
return new ConfigurationFromContextImpl(this, settings, context.getPsiLocation());
}
/**
@@ -248,7 +245,13 @@ public abstract class RunConfigurationProducer<T extends RunConfiguration> {
@Nullable
public RunConfiguration createLightConfiguration(@NotNull final ConfigurationContext context) {
RunConfiguration configuration = myConfigurationFactory.createTemplateConfiguration(context.getProject());
if (!setupConfigurationFromContext((T)configuration, context, new Ref<PsiElement>(context.getPsiLocation()))) {
try {
if (!setupConfigurationFromContext((T)configuration, context, new Ref<PsiElement>(context.getPsiLocation()))) {
return null;
}
}
catch (Exception e) {
LOG.error(myConfigurationFactory + " produced wrong type", e);
return null;
}
return configuration;