From 89f876cca0fefd71ab2f75e3bcb87d1cb13e203e Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Tue, 16 Nov 2021 17:32:09 +0300 Subject: [PATCH] [dom] dont request stubs during stubs building should fix some flaky tests. Funny that in other similar calls there is a comment that `XmlUtil.isStubBuilding()` is not necessary, but my guess that it still is. GitOrigin-RevId: bdb4295b50dca58ff9a3ebcdb4a67cf464b3a24f --- xml/dom-impl/src/com/intellij/util/xml/impl/DomCreator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomCreator.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomCreator.java index 232ab1ad49f4..6062c1d60115 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomCreator.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomCreator.java @@ -35,6 +35,7 @@ import com.intellij.util.xml.stubs.DomStub; import com.intellij.util.xml.stubs.ElementStub; import com.intellij.util.xml.stubs.FileStub; import com.intellij.xml.util.IncludedXmlTag; +import com.intellij.xml.util.XmlUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -200,7 +201,7 @@ final class DomCreator { FileStub stub = null; DomFileMetaData meta = DomApplicationComponent.getInstance().findMeta(description); if (meta != null && meta.hasStubs() && file instanceof VirtualFileWithId && !isFileParsed(xmlFile)) { - if (FileBasedIndex.getInstance().getFileBeingCurrentlyIndexed() == null) { + if (FileBasedIndex.getInstance().getFileBeingCurrentlyIndexed() == null && !XmlUtil.isStubBuilding()) { ObjectStubTree stubTree = StubTreeLoader.getInstance().readFromVFile(xmlFile.getProject(), file); if (stubTree != null) { stub = (FileStub)stubTree.getRoot();