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

Revert "use simple cached value as it can handle non-physical elements properly"

Browse Source 
This reverts commit 7ba7dae
This commit is contained in:
Dennis Ushakov
2017-11-07 22:58:03 +00:00
parent 0b6d910d16
commit 195861bdd1
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java
+14 -10
View File
@@ -55,7 +55,7 @@ public class RngNsDescriptor implements XmlNSDescriptorEx, Validator {
private final Map<QName, CachedValue<XmlElementDescriptor>> myDescriptorsMap =
Collections.synchronizedMap(new HashMap<QName, CachedValue<XmlElementDescriptor>>());
private static final Key<CachedValue<XmlElementDescriptor>> ROOT_KEY = Key.create("ROOT_DESCRIPTOR");
private static final Key<ParameterizedCachedValue<XmlElementDescriptor, RngNsDescriptor>> ROOT_KEY = Key.create("ROOT_DESCRIPTOR");
private XmlFile myFile;
private PsiElement myElement;
@@ -100,15 +100,19 @@ public class RngNsDescriptor implements XmlNSDescriptorEx, Validator {
}
private XmlElementDescriptor findRootDescriptor(final XmlTag tag) {
return CachedValuesManager.getCachedValue(tag, ROOT_KEY, () -> {
final XmlElementDescriptor descr = findRootDescriptorInner(tag);
if (descr != null) {
return CachedValueProvider.Result.create(descr, descr.getDependences(), getDependences());
}
else {
return CachedValueProvider.Result.create(null, getDependences());
}
});
return CachedValuesManager.getManager(tag.getProject())
.getParameterizedCachedValue(tag, ROOT_KEY, new ParameterizedCachedValueProvider<XmlElementDescriptor, RngNsDescriptor>() {
@Override
public CachedValueProvider.Result<XmlElementDescriptor> compute(RngNsDescriptor o) {
final XmlElementDescriptor descr = o.findRootDescriptorInner(tag);
if (descr != null) {
return CachedValueProvider.Result.create(descr, descr.getDependences(), o.getDependences());
}
else {
return CachedValueProvider.Result.create(null, o.getDependences());
}
}
}, false, this);
}
private XmlElementDescriptor findRootDescriptorInner(XmlTag tag) {