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

Merge branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Kirill Likhodedov
2010-11-17 11:16:05 +03:00
parent 4fe19342a1 5d1b82e8c7
commit 5b67db9ff9
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/completion/XmlTagInsertHandler.java
+10 -2
View File
@@ -35,6 +35,7 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.editor.ScrollType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
@@ -48,6 +49,7 @@ import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlElementDescriptorWithCDataContent;
import com.intellij.xml.XmlExtension;
import com.intellij.xml.actions.GenerateXmlTagAction;
import com.intellij.xml.impl.schema.XmlElementDescriptorImpl;
import com.intellij.xml.util.HtmlUtil;
import com.intellij.xml.util.XmlUtil;
import org.jetbrains.annotations.Nullable;
@@ -76,7 +78,6 @@ public class XmlTagInsertHandler implements InsertHandler<LookupElement> {
if (XmlUtil.getTokenOfType(tag, XmlTokenType.XML_TAG_END) == null &&
XmlUtil.getTokenOfType(tag, XmlTokenType.XML_EMPTY_ELEMENT_END) == null) {
Template t = TemplateManager.getInstance(project).getActiveTemplate(editor);
if (descriptor != null) {
insertIncompleteTag(context.getCompletionChar(), editor, project, descriptor, tag);
}
@@ -307,7 +308,14 @@ public class XmlTagInsertHandler implements InsertHandler<LookupElement> {
template.addVariable(new MacroCallNode(new CompleteSmartMacro()), true);
continue;
}
template.addTextSegment("<" + subTag.getName());
String qname = subTag.getName();
if (subTag instanceof XmlElementDescriptorImpl) {
String prefixByNamespace = context.getPrefixByNamespace(((XmlElementDescriptorImpl)subTag).getNamespace());
if (StringUtil.isNotEmpty(prefixByNamespace)) {
qname = prefixByNamespace + ":" + subTag.getName();
}
}
template.addTextSegment("<" + qname);
addRequiredAttributes(subTag, null, template, file);
completeTagTail(template, subTag, file, context, false);
}
xml/impl/src/com/intellij/lang/xml/XMLExternalAnnotator.java
+2
View File
@@ -45,6 +45,8 @@ public class XMLExternalAnnotator implements ExternalAnnotator, Validator.Valida
XmlNSDescriptor nsDescriptor = rootTag == null ? null : rootTag.getNSDescriptor(rootTag.getNamespace(), false);
if (nsDescriptor instanceof Validator && !HtmlUtil.isHtml5Document(document)) {
XmlFile descriptorFile = nsDescriptor.getDescriptorFile();
if (descriptorFile != null && !descriptorFile.isPhysical()) return;
((Validator<XmlDocument>)nsDescriptor).validate(document, this);
}
}