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

Fixed consequences of CVS -> Perforce upgrade

Browse Source
This commit is contained in:
Maxim Mossienko
2005-01-14 22:00:49 +03:00
parent eaf70ce2f2
commit 14b2f18739
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java
+4 -3
View File
@@ -336,13 +336,14 @@ public class XmlHighlightVisitor extends PsiElementVisitor{
if (elementDescriptor == null) { return; }
elementDescriptor = elementDescriptor.getElementDescriptor(tag);
if (elementDescriptor instanceof AnyXmlElementDescriptor) {
elementDescriptor = tag.getDescriptor();
}
if (elementDescriptor == null) {
addElementsForTag(tag, "Element " + name + " is not allowed here", myResult, HighlightInfoType.WRONG_REF, null);
return;
}
if (elementDescriptor instanceof AnyXmlElementDescriptor) {
elementDescriptor = tag.getDescriptor();
}
}
else {
//root tag
source/com/intellij/jsp/impl/TldTagDescriptor.java
+9 -3
View File
@@ -3,6 +3,7 @@ package com.intellij.jsp.impl;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlAttributeDescriptor;
import com.intellij.xml.XmlNSDescriptor;
import com.intellij.xml.impl.schema.AnyXmlElementDescriptor;
import com.intellij.xml.util.XmlUtil;
import com.intellij.psi.xml.*;
import com.intellij.psi.PsiElement;
@@ -24,6 +25,7 @@ public class TldTagDescriptor implements XmlElementDescriptor {
private String myName;
private XmlAttributeDescriptor[] myAttributeDescriptors;
private TldDescriptor myNsDescriptor;
private boolean myEmpty;
public TldTagDescriptor() {}
@@ -41,11 +43,12 @@ public class TldTagDescriptor implements XmlElementDescriptor {
//todo: refactor to support full DTD spec
public XmlElementDescriptor[] getElementsDescriptors(XmlTag context) {
return new XmlElementDescriptor[0];
return EMPTY_ARRAY;
}
public XmlElementDescriptor getElementDescriptor(XmlTag childTag) {
return null;
if (myEmpty) return null;
return new AnyXmlElementDescriptor(this,getNSDescriptor());
}
public XmlAttributeDescriptor[] getAttributesDescriptors() {
@@ -89,7 +92,8 @@ public class TldTagDescriptor implements XmlElementDescriptor {
}
public int getContentType() {
return 0; //To change body of implemented methods use File | Settings | File Templates.
if (myEmpty) return CONTENT_TYPE_EMPTY;;
return CONTENT_TYPE_MIXED;
}
public PsiElement getDeclaration() {
@@ -133,6 +137,8 @@ public class TldTagDescriptor implements XmlElementDescriptor {
myNsDescriptor = null;
}
myTag = (XmlTag)element;
final XmlTag bodyContent = myTag.findFirstSubTag("bodycontent");
if (bodyContent!=null) myEmpty = bodyContent.getValue().getText().equals("empty");
}
public Object[] getDependences() {