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

jspx default xhtml namespace removed, fixed issue with no parent delegation for namespace that is declared in the parent

Browse Source
This commit is contained in:
Maxim Mossienko
2005-02-02 21:52:17 +03:00
parent af704b8f22
commit ec8061af33
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/psi/impl/source/xml/XmlTagImpl.java
+26 -20
View File
@@ -12,6 +12,7 @@ import com.intellij.pom.PomModel;
import com.intellij.pom.event.PomModelEvent;
import com.intellij.pom.impl.PomTransactionBase;
import com.intellij.psi.*;
import com.intellij.psi.jsp.JspFile;
import com.intellij.psi.impl.meta.MetaRegistry;
import com.intellij.psi.impl.source.DummyHolder;
import com.intellij.psi.impl.source.PsiFileImpl;
@@ -112,11 +113,19 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag/*, Modification
public XmlNSDescriptor getNSDescriptor(final String namespace, boolean strict) {
initNSDescriptorsMap();
if(myNSDescriptorsMap.isEmpty()) return ((XmlTag)getParent()).getNSDescriptor(namespace, strict);
final XmlElement parent = getParent();
if(myNSDescriptorsMap.isEmpty()) {
return ((XmlTag)parent).getNSDescriptor(namespace, strict);
}
CachedValue<XmlNSDescriptor> descriptor = myNSDescriptorsMap.get(namespace);
if(descriptor != null) {
final XmlNSDescriptor value = descriptor.getValue();
if(value != null) return value;
} else if (parent instanceof XmlTag) {
return ((XmlTag)parent).getNSDescriptor(namespace, strict);
}
if(!strict) {
@@ -165,18 +174,6 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag/*, Modification
}
}
final PsiFile containingFile = getContainingFile();
if (containingFile!=null && containingFile.getFileType() == StdFileTypes.JSPX) {
initializeSchema(XmlUtil.XHTML_URI,XmlUtil.XHTML_URI);
final XmlNSDescriptor xhtmlDescriptor = myNSDescriptorsMap.get(XmlUtil.XHTML_URI).getValue();
myNSDescriptorsMap.put(XmlUtil.XHTML_URI, getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider<XmlNSDescriptor>() {
public Result<XmlNSDescriptor> compute() {
final XmlNSDescriptor jspxNSDescriptor = new JspXHTMLDescriptor(xhtmlDescriptor);
return new Result<XmlNSDescriptor>(jspxNSDescriptor, jspxNSDescriptor.getDependences());
}
}, false));
}
}
}
@@ -269,7 +266,7 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag/*, Modification
return myNSDescriptorsMap;
}
private boolean initializeSchema(String namespace, final String fileLocation) {
private boolean initializeSchema(final String namespace, final String fileLocation) {
XmlNSDescriptor descriptor;
if(myNSDescriptorsMap == null) myNSDescriptorsMap = new HashMap<String, CachedValue<XmlNSDescriptor>>();
@@ -280,7 +277,7 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag/*, Modification
}
if (file != null){
descriptor = (XmlNSDescriptor)file.getDocument().getMetaData();
descriptor = getMetaDataDescriptor(file,namespace);
if(descriptor != null){
final XmlFile file1 = file;
@@ -288,7 +285,7 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag/*, Modification
myNSDescriptorsMap.put(namespace, getManager().getCachedValuesManager().createCachedValue(new CachedValueProvider<XmlNSDescriptor>() {
public CachedValueProvider.Result<XmlNSDescriptor> compute() {
return new Result<XmlNSDescriptor>(
(XmlNSDescriptor)file1.getDocument().getMetaData(),
getMetaDataDescriptor(file1,namespace),
new Object[]{file1}
);
}
@@ -299,6 +296,19 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag/*, Modification
return true;
}
private XmlNSDescriptor getMetaDataDescriptor(final XmlFile file, String namespace) {
XmlNSDescriptor descriptor;
descriptor = (XmlNSDescriptor)file.getDocument().getMetaData();
PsiFile myContainingFile = getContainingFile();
if (myContainingFile!=null) {
if(myContainingFile.getFileType() == StdFileTypes.JSPX && namespace.equals(XmlUtil.XHTML_URI)) {
descriptor = new JspXHTMLDescriptor(descriptor);
}
}
return descriptor;
}
public PsiReference getReference() {
final PsiReference[] references = getReferences();
if (references != null && references.length > 0){
@@ -545,10 +555,6 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag/*, Modification
}
}
final PsiFile containingFile = parent.getContainingFile();
if (containingFile!=null && containingFile.getFileType() == StdFileTypes.JSPX) {
myNamespaceMap.put("",XmlUtil.XHTML_URI);
}
}
if(parent instanceof XmlDocument && myNamespaceMap == null){
myNamespaceMap = new BidirectionalMap<String, String>();
source/com/intellij/xml/util/XmlUtil.java
+1 -2
View File
@@ -508,8 +508,7 @@ public class XmlUtil {
final FileType fileType = file.getFileType();
if (fileType == StdFileTypes.HTML ||
fileType == StdFileTypes.XHTML ||
fileType == StdFileTypes.JSPX
fileType == StdFileTypes.XHTML
) {
return XHTML_URI;
}