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

UP-2253

Browse Source
This commit is contained in:
Alexey Kudravtsev
2014-10-22 17:20:52 +04:00
parent b73348f83c
commit dfcbd14bb0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlElementDescriptorImpl.java
+4 -4
View File
@@ -219,7 +219,6 @@ public class XmlElementDescriptorImpl extends XsdEnumerationDescriptor<XmlTag>
if (type instanceof ComplexTypeDescriptor) {
final ComplexTypeDescriptor descriptor = (ComplexTypeDescriptor)type;
String contextNs;
PsiFile containingFile = context != null ? context.getContainingFile():null;
if (context != null && !containingFile.isPhysical()) {
@@ -227,10 +226,11 @@ public class XmlElementDescriptorImpl extends XsdEnumerationDescriptor<XmlTag>
//context = context.getParentTag();
}
String contextNs;
if (context != null &&
( descriptor.canContainTag(context.getLocalName(), contextNs = context.getNamespace(), context ) &&
(!contextNs.equals(getNamespace()) || descriptor.hasAnyInContentModel())
) ) {
descriptor.canContainTag(context.getLocalName(), contextNs = context.getNamespace(), context) &&
(!contextNs.equals(getNamespace()) || descriptor.hasAnyInContentModel()) &&
containingFile instanceof XmlFile) { // JSXmlLiteralExpressionImpl is crazy
final XmlNSDescriptor nsDescriptor = getNSDescriptor();
if (nsDescriptor != null) {