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-125129 I would like to reopen IDEA-117698: regression fixed

Browse Source
This commit is contained in:
Dmitry Avdeev
2014-05-27 16:28:31 +04:00
parent 2475299004
commit ce036b544a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/editorActions/XmlSlashTypedHandler.java
+8 -2
View File
@@ -29,6 +29,7 @@ import com.intellij.psi.templateLanguages.OuterLanguageElement;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.xml.*;
import com.intellij.xml.util.XmlTagUtil;
import com.intellij.xml.util.XmlUtil;
import org.jetbrains.annotations.NotNull;
@@ -91,13 +92,13 @@ public class XmlSlashTypedHandler extends TypedHandlerDelegate implements XmlTok
if (element1 != null && element1.getText().startsWith("</")) {
// case of top-level jsp tag
XmlTag tag1 = PsiTreeUtil.getParentOfType(element1, XmlTag.class);
if (tag1 != null && tag1 != tag && tag1.getTextOffset() > tag.getTextOffset()) {
if (shouldReplace(tag, tag1)) {
tag = tag1;
}
else {
// if we have enclosing jsp tag, actual tag to be completed will be previous sibling
tag1 = PsiTreeUtil.getPrevSiblingOfType(element1.getParent(), XmlTag.class);
if (tag1 != null && tag1 != tag && tag1.getTextOffset() > tag.getTextOffset()) {
if (shouldReplace(tag, tag1)) {
tag = tag1;
}
}
@@ -135,4 +136,9 @@ public class XmlSlashTypedHandler extends TypedHandlerDelegate implements XmlTok
}
return Result.CONTINUE;
}
public boolean shouldReplace(XmlTag tag, XmlTag tag1) {
return tag1 != null && tag1 != tag && tag1.getTextOffset() > tag.getTextOffset() &&
XmlUtil.getTokenOfType(tag1, XmlTokenType.XML_EMPTY_ELEMENT_END) == null && XmlTagUtil.getEndTagNameElement(tag1) == null;
}
}