From 0b6d910d16b27170bff751c096ff14d81774febf Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Tue, 7 Nov 2017 22:08:33 +0000 Subject: [PATCH] Revert "cleanup" This reverts commit 7735db6 --- .../relaxNG/model/descriptors/RngNsDescriptor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java index a891ca406dc4..a104f877606c 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java @@ -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> myDescriptorsMap = Collections.synchronizedMap(new HashMap>()); + private static final Key> 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());