From 5cb3d85612f5412a7e9bac65d5e8225c3e1fe8ff Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Tue, 28 Aug 2012 15:44:01 +0400
Subject: [PATCH] use PSI for building root tag stub (support incomplete root
 tag like "<foo")

---
 .../util/xml/impl/DomServiceImpl.java         | 57 +++++++++----------
 .../xml/stubs/builder/DomStubBuilder.java     |  4 +-
 xml/dom-tests/testData/stubs/nullTag.xml      |  3 +
 .../util/xml/stubs/DomStubBuilderTest.java    |  5 ++
 .../intellij/util/xml/stubs/DomStubTest.java  |  8 ++-
 5 files changed, 43 insertions(+), 34 deletions(-)
 create mode 100644 xml/dom-tests/testData/stubs/nullTag.xml

diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java
index 04e520073ca1..9039c97979e8 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java
@@ -65,7 +65,7 @@ public class DomServiceImpl extends DomService {
   };
 
   @NotNull
-  private static XmlFileHeader calcXmlFileHeader(final PsiFile file) {
+  private static XmlFileHeader calcXmlFileHeader(final XmlFile file) {
 
     if (!DomStubBuilder.isStubBuilding(file) && file.getFileType() == XmlFileType.INSTANCE) {
       VirtualFile virtualFile = file.getVirtualFile();
@@ -77,38 +77,35 @@ public class DomServiceImpl extends DomService {
       }
     }
 
-    if (file instanceof XmlFile && file.getNode().isParsed()) {
-      final XmlDocument document = ((XmlFile)file).getDocument();
-      if (document != null) {
-        String publicId = null;
-        String systemId = null;
-        final XmlProlog prolog = document.getProlog();
-        if (prolog != null) {
-          final XmlDoctype doctype = prolog.getDoctype();
-          if (doctype != null) {
-            publicId = doctype.getPublicId();
-            systemId = doctype.getSystemId();
-            if (systemId == null) {
-              systemId = doctype.getDtdUri();
-            }
-          }
-        }
-
-        final XmlTag tag = document.getRootTag();
-        if (tag != null) {
-          String localName = tag.getLocalName();
-          if (StringUtil.isNotEmpty(localName)) {
-            if (tag.getPrevSibling() instanceof PsiErrorElement) {
-              return XmlFileHeader.EMPTY;
-            }
-
-            String psiNs = tag.getNamespace();
-            return new XmlFileHeader(localName, psiNs == XmlUtil.EMPTY_URI || Comparing.equal(psiNs, systemId) ? null : psiNs, publicId,
-                                     systemId);
+    final XmlDocument document = file.getDocument();
+    if (document != null) {
+      String publicId = null;
+      String systemId = null;
+      final XmlProlog prolog = document.getProlog();
+      if (prolog != null) {
+        final XmlDoctype doctype = prolog.getDoctype();
+        if (doctype != null) {
+          publicId = doctype.getPublicId();
+          systemId = doctype.getSystemId();
+          if (systemId == null) {
+            systemId = doctype.getDtdUri();
           }
         }
       }
-      return XmlFileHeader.EMPTY;
+
+      final XmlTag tag = document.getRootTag();
+      if (tag != null) {
+        String localName = tag.getLocalName();
+        if (StringUtil.isNotEmpty(localName)) {
+          if (tag.getPrevSibling() instanceof PsiErrorElement) {
+            return XmlFileHeader.EMPTY;
+          }
+
+          String psiNs = tag.getNamespace();
+          return new XmlFileHeader(localName, psiNs == XmlUtil.EMPTY_URI || Comparing.equal(psiNs, systemId) ? null : psiNs, publicId,
+                                   systemId);
+        }
+      }
     }
 
     if (!file.isValid()) return XmlFileHeader.EMPTY;
diff --git a/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java b/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java
index d676c25857cc..48b8c2f9ade6 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/stubs/builder/DomStubBuilder.java
@@ -29,8 +29,6 @@ import com.intellij.psi.xml.XmlFile;
 import com.intellij.util.xml.*;
 import com.intellij.util.xml.stubs.FileStub;
 
-import java.io.ByteArrayInputStream;
-
 /**
  * @author Dmitry Avdeev
  *         Date: 8/2/12
@@ -62,7 +60,7 @@ public class DomStubBuilder implements BinaryFileStubBuilder {
       DomFileElement<? extends DomElement> fileElement = manager.getFileElement(xmlFile);
       if (fileElement == null || !fileElement.getFileDescription().hasStubs()) return null;
 
-      XmlFileHeader header = NanoXmlUtil.parseHeader(new ByteArrayInputStream(content));
+      XmlFileHeader header = DomService.getInstance().getXmlFileHeader(xmlFile);
       if (header.getRootTagLocalName() == null) {
         LOG.error("null root tag for " + fileElement + " for " + file);
       }
diff --git a/xml/dom-tests/testData/stubs/nullTag.xml b/xml/dom-tests/testData/stubs/nullTag.xml
new file mode 100644
index 000000000000..21f7485661c8
--- /dev/null
+++ b/xml/dom-tests/testData/stubs/nullTag.xml
@@ -0,0 +1,3 @@
+<!DOCTYPE beans PUBLIC "-//FOO" "http://foo.dtd">
+
+<foo
\ No newline at end of file
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java b/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java
index 80253b2d3a67..70d5cbbdf667 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java
@@ -49,6 +49,11 @@ public class DomStubBuilderTest extends DomStubTest {
                                   "    Element:bar\n");
   }
 
+  public void testNullTag() throws Exception {
+    doBuilderTest("nullTag.xml", "File:foo\n" +
+                                 "  Element:foo\n");
+  }
+
   public static class TestExtender extends DomExtender<Bar> {
 
     @Override
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubTest.java b/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubTest.java
index b22bd4f2e1f6..128ee566c6c9 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubTest.java
@@ -36,11 +36,17 @@ import com.intellij.util.xml.stubs.model.Foo;
  */
 public abstract class DomStubTest extends LightCodeInsightFixtureTestCase {
 
-  private static final DomFileDescription<Foo> DOM_FILE_DESCRIPTION = new DomFileDescription<Foo>(Foo.class, "foo") {
+  private static final String HTTP_FOO_DTD = "http://foo.dtd";
+  private static final DomFileDescription<Foo> DOM_FILE_DESCRIPTION = new DomFileDescription<Foo>(Foo.class, "foo", HTTP_FOO_DTD) {
     @Override
     public boolean hasStubs() {
       return true;
     }
+
+    @Override
+    protected void initializeFileDescription() {
+      registerNamespacePolicy("foo", HTTP_FOO_DTD);
+    }
   };
 
   @Override