MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

diagnostics for IDEA-236167 XmlTag#getSubTags is not idempotent, also EA-220861

Browse Source 
GitOrigin-RevId: 75e5662f2a416640835a5f1f349f1411e4177fdd
This commit is contained in:
Peter Gromov
2020-04-30 15:54:18 +02:00
committed by intellij-monorepo-bot
parent 621fa82ba7
commit d2ae5b5141
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xml/xml-psi-impl/src/com/intellij/xml/util/InclusionProvider.java
View File

@@ -2,7 +2,6 @@
package com.intellij.xml.util;
import com.intellij.openapi.util.JDOMUtil;
import com.intellij.openapi.util.NullableComputable;
import com.intellij.openapi.util.RecursionManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.xml.XmlTagImpl;
@@ -12,6 +11,7 @@ import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.psi.xml.XmlDocument;
import com.intellij.psi.xml.XmlFile;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.IdempotenceChecker;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -29,14 +29,19 @@ final class InclusionProvider implements CachedValueProvider<PsiElement[]> {
}
public static PsiElement @NotNull [] getIncludedTags(XmlTag xincludeTag) {
if (!XmlTagImpl.shouldProcessIncludesNow()) return PsiElement.EMPTY_ARRAY;
if (!XmlTagImpl.shouldProcessIncludesNow()) {
IdempotenceChecker.logTrace("!shouldProcessIncludesNow");
return PsiElement.EMPTY_ARRAY;
}
return CachedValuesManager.getCachedValue(xincludeTag, new InclusionProvider(xincludeTag));
}
@Override
public Result<PsiElement[]> compute() {
PsiElement[] result = RecursionManager.doPreventingRecursion(myXincludeTag, true,
(NullableComputable<PsiElement[]>)() -> computeInclusion(myXincludeTag));
PsiElement[] result = RecursionManager.doPreventingRecursion(myXincludeTag, true, () -> computeInclusion(myXincludeTag));
if (result == null) {
IdempotenceChecker.logTrace("InclusionProvider recursion prevented");
}
return Result.create(result == null ? PsiElement.EMPTY_ARRAY : result, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT);
}
@@ -62,11 +67,17 @@ final class InclusionProvider implements CachedValueProvider<PsiElement[]> {
private static PsiElement @Nullable [] computeInclusion(final XmlTag xincludeTag) {
final XmlFile included = XmlIncludeHandler.resolveXIncludeFile(xincludeTag);
if (IdempotenceChecker.isLoggingEnabled()) {
IdempotenceChecker.logTrace("InclusionProvider resolved file=" + included);
}
final XmlDocument document = included != null ? included.getDocument() : null;
final XmlTag rootTag = document != null ? document.getRootTag() : null;
if (rootTag != null) {
final String xpointer = xincludeTag.getAttributeValue("xpointer", XmlPsiUtil.XINCLUDE_URI);
final XmlTag[] includeTag = extractXpointer(rootTag, xpointer);
if (IdempotenceChecker.isLoggingEnabled()) {
IdempotenceChecker.logTrace("InclusionProvider found " + includeTag.length + " tags by " + xpointer);
}
PsiElement[] result = new PsiElement[includeTag.length];
for (int i = 0; i < includeTag.length; i++) {
result[i] = new IncludedXmlTag(includeTag[i], xincludeTag.getParentTag());

10
xml/xml-psi-impl/src/com/intellij/xml/util/XmlPsiUtil.java
View File

@@ -27,6 +27,7 @@ import com.intellij.psi.util.CachedValue;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.xml.*;
import com.intellij.util.IdempotenceChecker;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -126,7 +127,14 @@ public class XmlPsiUtil {
startFrom = xmlConditionalSection.getBodyStart();
}
else if (processIncludes && XmlIncludeHandler.isXInclude(element)) {
for (PsiElement psiElement : InclusionProvider.getIncludedTags((XmlTag)element)) {
if (IdempotenceChecker.isLoggingEnabled()) {
IdempotenceChecker.logTrace("Processing xinclude " + element.getText());
}
PsiElement[] tags = InclusionProvider.getIncludedTags((XmlTag)element);
for (PsiElement psiElement : tags) {
if (IdempotenceChecker.isLoggingEnabled()) {
IdempotenceChecker.logTrace("Processing included tag " + psiElement);
}
if (!processElement(psiElement, deepFlag, wideFlag, true)) return false;
}
}