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

IDEA-67475 Autocompletion doesn't work in manifest tag

Browse Source
This commit is contained in:
peter
2011-09-16 10:45:15 +02:00
parent a37b000ea7
commit 56ea7a4598
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/testSrc/org/jetbrains/android/dom/AndroidManifestDomTest.java
+1 -1
View File
@@ -163,7 +163,7 @@ public class AndroidManifestDomTest extends AndroidDomTest {
doTestCompletion();
}
public void _testCompletionInManifestTag() throws Throwable {
public void testCompletionInManifestTag() throws Throwable {
doTestCompletion();
}
}
xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java
+18 -7
View File
@@ -16,19 +16,19 @@
package com.intellij.util.xml.impl;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiErrorElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.source.tree.TreeElement;
import com.intellij.psi.xml.*;
import com.intellij.testFramework.LightVirtualFile;
import com.intellij.util.ReflectionCache;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.xml.*;
import com.intellij.util.xml.reflect.DomCollectionChildDescription;
import com.intellij.util.xml.reflect.DomFixedChildDescription;
import com.intellij.xml.util.XmlUtil;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -184,10 +184,9 @@ public class DomImplUtil {
!localName1.equals(qName));
}
@NotNull
@NotNull
public static XmlFileHeader getXmlFileHeader(final PsiFile file) {
final VirtualFile virtualFile = file.getVirtualFile();
if (virtualFile instanceof LightVirtualFile && file instanceof XmlFile && FileDocumentManager.getInstance().getCachedDocument(virtualFile) == null) {
if (file instanceof XmlFile && file.getNode().isParsed()) {
final XmlDocument document = ((XmlFile)file).getDocument();
if (document != null) {
String publicId = null;
@@ -198,12 +197,24 @@ public class DomImplUtil {
if (doctype != null) {
publicId = doctype.getPublicId();
systemId = doctype.getSystemId();
if (systemId == null) {
systemId = doctype.getDtdUri();
}
}
}
final XmlTag tag = document.getRootTag();
if (tag != null) {
return new XmlFileHeader(tag.getLocalName(), tag.getNamespace(), publicId, systemId);
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);
}
}
}
return XmlFileHeader.EMPTY;