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

OC-16061 "Compound" Run configuration type does not work with device/simulator selection: handle deleted execution targets

Browse Source
This commit is contained in:
Anton Makeev
2017-10-20 22:44:33 +02:00
parent 872ffe8267
commit 80f4b17109
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java
+15 -12
View File
@@ -206,24 +206,27 @@ public class ExecutionTargetManagerImpl extends ExecutionTargetManager implement
ExecutionTargetProvider[] providers = Extensions.getExtensions(ExecutionTargetProvider.EXTENSION_NAME);
LinkedHashSet<ExecutionTarget> result = new LinkedHashSet<>();
Set<ExecutionTarget> specifiedTargets = new THashSet<>();
doWithEachNonCompoundWithSpecifiedTarget(settings, each -> {
if (each.second != null) {
result.add(each.second);
}
else {
for (ExecutionTargetProvider eachTargetProvider : providers) {
result.addAll(eachTargetProvider.getTargets(myProject, each.first));
for (ExecutionTargetProvider eachTargetProvider : providers) {
List<ExecutionTarget> supportedTargets = eachTargetProvider.getTargets(myProject, each.first);
if (each.second != null) {
if (supportedTargets.contains(each.second)) {
result.add(each.second);
specifiedTargets.add(each.second);
break;
}
}
else {
result.addAll(supportedTargets);
}
}
return true;
});
if (!result.isEmpty()) {
doWithEachNonCompoundWithSpecifiedTarget(settings, each -> {
if (each.second != null) {
result.retainAll(Collections.singleton(each.second));
}
return true;
});
specifiedTargets.forEach(it -> result.retainAll(Collections.singleton(it)));
if (result.isEmpty()) {
result.add(MULTIPLE_TARGETS);
}