From 0019d6d3558ee1160fb1d503402b9ee49aa5e685 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 23 May 2013 21:41:25 +0200
Subject: [PATCH] extract HtmlPsiUtil out of HtmlUtil

---
 .../impl/source/html/ScriptSupportUtil.java   |  5 ++---
 .../src/com/intellij/xml/util/HtmlUtil.java   | 10 +--------
 .../com/intellij/xml/util/HtmlPsiUtil.java    | 21 +++++++++++++++++++
 3 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 xml/xml-psi-impl/src/com/intellij/xml/util/HtmlPsiUtil.java

diff --git a/xml/impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java b/xml/impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java
index 85d693b6a31a..0cb4c12407a8 100644
--- a/xml/impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/html/ScriptSupportUtil.java
@@ -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() {
diff --git a/xml/impl/src/com/intellij/xml/util/HtmlUtil.java b/xml/impl/src/com/intellij/xml/util/HtmlUtil.java
index f687b6aacf3e..0d6685b1009a 100644
--- a/xml/impl/src/com/intellij/xml/util/HtmlUtil.java
+++ b/xml/impl/src/com/intellij/xml/util/HtmlUtil.java
@@ -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() {
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlPsiUtil.java b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlPsiUtil.java
new file mode 100644
index 000000000000..00e81f9caca4
--- /dev/null
+++ b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlPsiUtil.java
@@ -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;
+  }
+}