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

do not try to merge Injection with no InjectionPlace

Browse Source
This commit is contained in:
Alexander Kass
2016-05-31 12:23:05 +03:00
parent c3a00b0e5b
commit 6246749b47
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java
+6 -1
View File
@@ -410,7 +410,12 @@ public class Configuration extends SimpleModificationTracker implements Persiste
}
}
main: for (BaseInjection other : importingInjections) {
final Set<BaseInjection> matchingInjections = JBIterable.of(other.getInjectionPlaces())
InjectionPlace[] places = other.getInjectionPlaces();
if (places.length == 0) {
if (!existingInjections.contains(other)) newInjections.add(other);
continue;
}
final Set<BaseInjection> matchingInjections = JBIterable.of(places)
.flatten(o -> JBIterable.from(placeMap.get(o))).toSet();
if (matchingInjections.isEmpty()) {
newInjections.add(other);