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

IDEA-58211: jsp: "remove unused namespace declaration" in JSPX should not reformat file [rev. by nik]

Browse Source
This commit is contained in:
Dmitry Avdeev
2010-12-06 12:46:36 +03:00
parent 000fc4aacd
commit 921c4571c9
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnusedNamespaceInspection.java
+1 -2
View File
@@ -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) {
xml/impl/src/com/intellij/xml/util/XmlUtil.java
+11
View File
@@ -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;