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 "cleanup"

Browse Source 
This reverts commit 7735db6
This commit is contained in:
Dennis Ushakov
2017-11-07 22:58:03 +00:00
parent 5647640e44
commit 0b6d910d16
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java
+5 -5
View File
@@ -19,6 +19,7 @@ package org.intellij.plugins.relaxNG.model.descriptors;
import com.intellij.codeInsight.daemon.Validator;
import com.intellij.javaee.ExternalResourceManager;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.ModificationTracker;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
@@ -26,10 +27,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.psi.search.PsiElementProcessor;
import com.intellij.psi.util.CachedValue;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.*;
import com.intellij.psi.xml.XmlDocument;
import com.intellij.psi.xml.XmlFile;
import com.intellij.psi.xml.XmlTag;
@@ -57,6 +55,8 @@ 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 XmlFile myFile;
private PsiElement myElement;
private String myUrl;
@@ -100,7 +100,7 @@ public class RngNsDescriptor implements XmlNSDescriptorEx, Validator {
}
private XmlElementDescriptor findRootDescriptor(final XmlTag tag) {
return CachedValuesManager.getCachedValue(tag, () -> {
return CachedValuesManager.getCachedValue(tag, ROOT_KEY, () -> {
final XmlElementDescriptor descr = findRootDescriptorInner(tag);
if (descr != null) {
return CachedValueProvider.Result.create(descr, descr.getDependences(), getDependences());