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

xerces disabled in xhtmls: proper fix

Browse Source
This commit is contained in:
Dmitry Avdeev
2009-12-07 19:58:13 +03:00
parent b8550f6511
commit 9b80dd090f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java
+1 -3
View File
@@ -22,7 +22,6 @@ import com.intellij.lang.annotation.AnnotationHolder;
import com.intellij.lang.annotation.ExternalAnnotator;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider;
import com.intellij.psi.xml.XmlDocument;
import com.intellij.psi.xml.XmlFile;
import com.intellij.psi.xml.XmlTag;
@@ -37,8 +36,7 @@ public class XMLExternalAnnotator implements ExternalAnnotator, Validator.Valida
private AnnotationHolder myHolder;
public void annotate(PsiFile file, AnnotationHolder holder) {
if (!(file instanceof XmlFile) || file.getViewProvider() instanceof TemplateLanguageFileViewProvider) return;
if (!(file instanceof XmlFile)) return;
myHolder = holder;
final XmlDocument document = ((XmlFile)file).getDocument();
if (document == null) return;
xml/impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java
+7 -3
View File
@@ -20,12 +20,13 @@ import com.intellij.codeInsight.daemon.Validator;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInspection.InspectionProfile;
import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
import com.intellij.ide.highlighter.XHtmlFileType;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.lang.Language;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
@@ -35,6 +36,7 @@ import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.source.SourceTreeToPsiMap;
import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.xml.*;
import com.intellij.reference.SoftReference;
@@ -42,8 +44,6 @@ import com.intellij.xml.actions.ValidateXmlActionHandler;
import com.intellij.xml.util.CheckXmlFileWithXercesValidatorInspection;
import com.intellij.xml.util.XmlResourceResolver;
import com.intellij.xml.util.XmlUtil;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.ide.highlighter.XHtmlFileType;
import org.jetbrains.annotations.NonNls;
import org.xml.sax.SAXParseException;
@@ -337,6 +337,10 @@ public class ExternalDocumentValidator {
return;
}
if (containingFile.getViewProvider() instanceof TemplateLanguageFileViewProvider) {
return;
}
final FileType fileType = containingFile.getViewProvider().getVirtualFile().getFileType();
if (fileType != XmlFileType.INSTANCE && fileType != XHtmlFileType.INSTANCE) {
return;