From 921c4571c9ca77716cc2022d2db41038d0ebf367 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Fri, 3 Dec 2010 17:18:48 +0300
Subject: [PATCH] IDEA-58211: jsp: "remove unused namespace declaration" in
 JSPX should not reformat file [rev. by nik]

---
 .../impl/analysis/XmlUnusedNamespaceInspection.java   |  3 +--
 xml/impl/src/com/intellij/xml/util/XmlUtil.java       | 11 +++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnusedNamespaceInspection.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnusedNamespaceInspection.java
index 17740e3e8453..388c8bf9a1d3 100644
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnusedNamespaceInspection.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnusedNamespaceInspection.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.impl.source.xml.SchemaPrefix;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlAttributeValue;
@@ -267,7 +266,7 @@ public class XmlUnusedNamespaceInspection extends XmlSuppressableInspectionTool
       manager.commitDocument(document);
       XmlTag tag = pointer.getElement();
       assert tag != null;
-      CodeStyleManager.getInstance(project).reformat(tag);
+      XmlUtil.reformatTagStart(tag);
     }
 
     protected void doRemove(Project project, XmlAttribute attribute, XmlTag parent) {
diff --git a/xml/impl/src/com/intellij/xml/util/XmlUtil.java b/xml/impl/src/com/intellij/xml/util/XmlUtil.java
index 54c573491f95..e678ac64f21b 100644
--- a/xml/impl/src/com/intellij/xml/util/XmlUtil.java
+++ b/xml/impl/src/com/intellij/xml/util/XmlUtil.java
@@ -48,6 +48,7 @@ import com.intellij.patterns.StringPattern;
 import com.intellij.patterns.XmlPatterns;
 import com.intellij.psi.*;
 import com.intellij.psi.XmlElementFactory;
+import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.filters.ElementFilter;
 import com.intellij.psi.filters.XmlTagFilter;
 import com.intellij.psi.filters.position.FilterPattern;
@@ -560,6 +561,16 @@ public class XmlUtil {
     return null;
   }
 
+  public static void reformatTagStart(XmlTag tag) {
+    ASTNode child = XmlChildRole.START_TAG_END_FINDER.findChild(tag.getNode());
+    if (child == null) {
+      CodeStyleManager.getInstance(tag.getProject()).reformat(tag);
+    }
+    else {
+      CodeStyleManager.getInstance(tag.getProject()).reformatRange(tag, tag.getTextRange().getStartOffset(), child.getTextRange().getEndOffset());
+    }
+  }
+
   private static class XmlElementProcessor {
     private final PsiElementProcessor processor;
     private final PsiFile targetFile;