2 files changed, 10 insertions, 2 deletions
diff --git a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java
index eee6ed52e305..635420098b6e 100644
--- a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java
+++ b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomAttributeXmlDescriptor.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.xml.XmlElement;
 import com.intellij.psi.xml.XmlTag;
+import com.intellij.util.xml.Required;
 import com.intellij.util.xml.XmlName;
 import com.intellij.util.xml.impl.DomInvocationHandler;
 import com.intellij.util.xml.impl.DomManagerImpl;
@@ -43,7 +44,8 @@ public class DomAttributeXmlDescriptor implements NamespaceAwareXmlAttributeDesc
   }
 
   public boolean isRequired() {
-    return false;
+    final Required required = myDescription.getAnnotation(Required.class);
+    return required != null && required.value();
   }
 
   public boolean isFixed() {
diff --git a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java
index 018de44b522d..d5894851bf93 100644
--- a/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java
+++ b/xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.xml.impl.dom;
 
+import com.intellij.codeInsight.daemon.impl.analysis.XmlHighlightingAwareElementDescriptor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.text.StringUtil;
@@ -36,7 +37,7 @@ import java.util.List;
 /**
  * @author mike
  */
-public class DomElementXmlDescriptor extends AbstractDomChildrenDescriptor {
+public class DomElementXmlDescriptor extends AbstractDomChildrenDescriptor implements XmlHighlightingAwareElementDescriptor {
   private final DomChildrenDescription myChildrenDescription;
 
   public DomElementXmlDescriptor(@NotNull final DomElement domElement) {
@@ -82,6 +83,11 @@ public class DomElementXmlDescriptor extends AbstractDomChildrenDescriptor {
     return name;
   }
 
+  @Override
+  public boolean shouldCheckRequiredAttributes() {
+    return false;
+  }
+
   private static class MyRootDomChildrenDescription implements DomChildrenDescription {
     private final DomElement myDomElement;