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

don't auto-close tags with required children (WEB-30180)

Browse Source
This commit is contained in:
Dennis Ushakov
2019-03-12 21:36:00 +03:00
parent 20e10ee0d8
commit aba30175ba
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java
+3 -4
View File
@@ -366,7 +366,7 @@ public class XmlTagInsertHandler implements InsertHandler<LookupElement> {
}
private static void completeTagTail(Template template, XmlElementDescriptor descriptor, PsiFile file, XmlTag context, boolean firstLevel) {
boolean completeIt = !firstLevel || !canHaveAttributes(descriptor, context, file);
boolean completeIt = !firstLevel || !canHaveAttributes(descriptor, context);
switch (descriptor.getContentType()) {
case XmlElementDescriptor.CONTENT_TYPE_UNKNOWN:
return;
@@ -399,11 +399,10 @@ public class XmlTagInsertHandler implements InsertHandler<LookupElement> {
}
}
private static boolean canHaveAttributes(XmlElementDescriptor descriptor, XmlTag context, PsiFile file) {
private static boolean canHaveAttributes(XmlElementDescriptor descriptor, XmlTag context) {
XmlAttributeDescriptor[] attributes = descriptor.getAttributesDescriptors(context);
XmlExtension extension = XmlExtension.getExtension(file);
int required = WebEditorOptions.getInstance().isAutomaticallyInsertRequiredAttributes() ?
ArraysKt.count(attributes, (attribute) -> extension.shouldBeInserted(attribute) && context.getAttribute(attribute.getName()) == null) :
ArraysKt.count(attributes, (attribute) -> attribute.isRequired() && context.getAttribute(attribute.getName()) == null) :
0;
return attributes.length - required > 0 ;
}