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

extract HtmlPsiUtil out of HtmlUtil

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-05-24 18:01:13 +02:00
parent 512cfb28ab
commit 0019d6d355
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java
+2 -3
View File
@@ -27,9 +27,8 @@ import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.xml.*;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.util.HtmlUtil;
import com.intellij.xml.util.HtmlPsiUtil;
import com.intellij.xml.util.XmlPsiUtil;
import com.intellij.xml.util.XmlUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -63,7 +62,7 @@ public class ScriptSupportUtil {
@Override
public Result<XmlTag[]> compute() {
final List<XmlTag> scriptTags = new ArrayList<XmlTag>();
final XmlDocument document = HtmlUtil.getRealXmlDocument(element.getDocument());
final XmlDocument document = HtmlPsiUtil.getRealXmlDocument(element.getDocument());
if (document != null) {
PsiElementProcessor psiElementProcessor = new PsiElementProcessor() {
xml/impl/src/com/intellij/xml/util/HtmlUtil.java
+1 -9
View File
@@ -42,7 +42,6 @@ import com.intellij.psi.impl.source.parsing.xml.XmlBuilder;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.psi.impl.source.xml.XmlAttributeImpl;
import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider;
import com.intellij.psi.templateLanguages.TemplateLanguageUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.xml.*;
import com.intellij.util.ArrayUtil;
@@ -230,14 +229,7 @@ public class HtmlUtil {
@Nullable
public static XmlDocument getRealXmlDocument(@Nullable XmlDocument doc) {
if (doc == null) return null;
final PsiFile containingFile = doc.getContainingFile();
final PsiFile templateFile = TemplateLanguageUtil.getTemplateFile(containingFile);
if (templateFile instanceof XmlFile) {
return ((XmlFile)templateFile).getDocument();
}
return doc;
return HtmlPsiUtil.getRealXmlDocument(doc);
}
public static String[] getHtmlTagNames() {
xml/xml-psi-impl/src/com/intellij/xml/util/HtmlPsiUtil.java
+21
View File
@@ -0,0 +1,21 @@
package com.intellij.xml.util;
import com.intellij.psi.PsiFile;
import com.intellij.psi.templateLanguages.TemplateLanguageUtil;
import com.intellij.psi.xml.XmlDocument;
import com.intellij.psi.xml.XmlFile;
import org.jetbrains.annotations.Nullable;
public class HtmlPsiUtil {
@Nullable
public static XmlDocument getRealXmlDocument(@Nullable XmlDocument doc) {
if (doc == null) return null;
final PsiFile containingFile = doc.getContainingFile();
final PsiFile templateFile = TemplateLanguageUtil.getTemplateFile(containingFile);
if (templateFile instanceof XmlFile) {
return ((XmlFile)templateFile).getDocument();
}
return doc;
}
}