From dbe6ff737f39ece845546625e7b557c68020bf08 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Mon, 4 Sep 2017 20:50:01 +0300
Subject: [PATCH] IDEA-176694 redundant attribute inspection ignores the fixed
 attribute in xml schema

---
 .../codeInsight/daemon/XmlInspectionsTest.java      | 13 +++++++++++++
 xml/tests/testData/xml/def.xml                      |  1 +
 xml/tests/testData/xml/def.xsd                      |  8 ++++++++
 .../XmlDefaultAttributeValueInspection.java         |  2 +-
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 xml/tests/testData/xml/def.xml
 create mode 100644 xml/tests/testData/xml/def.xsd

diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/XmlInspectionsTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/XmlInspectionsTest.java
index 9d1884e088ea..3451505b0aeb 100644
--- a/xml/tests/src/com/intellij/codeInsight/daemon/XmlInspectionsTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/XmlInspectionsTest.java
@@ -19,8 +19,11 @@ import com.intellij.codeInsight.daemon.impl.analysis.XmlDefaultAttributeValueIns
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.ide.highlighter.HtmlFileType;
 import com.intellij.ide.highlighter.XmlFileType;
+import com.intellij.testFramework.PlatformTestUtil;
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
 
+import java.io.File;
+
 /**
  * @author Dmitry Avdeev
  */
@@ -63,4 +66,14 @@ public class XmlInspectionsTest extends LightPlatformCodeInsightFixtureTestCase
     myFixture.configureByText(HtmlFileType.INSTANCE, "<input type=\"text\"/>");
     myFixture.checkHighlighting();
   }
+
+  public void testRequiredFixedAttribute() {
+    myFixture.enableInspections(new XmlDefaultAttributeValueInspection());
+    myFixture.testHighlighting("def.xml", "def.xsd");
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/xml/tests/testData/xml";
+  }
 }
diff --git a/xml/tests/testData/xml/def.xml b/xml/tests/testData/xml/def.xml
new file mode 100644
index 000000000000..3793ef8b953e
--- /dev/null
+++ b/xml/tests/testData/xml/def.xml
@@ -0,0 +1 @@
+<root xmlns="test.required" required="foo" fixed=<warning descr="Redundant default attribute value assignment">"foo"</warning>/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/def.xsd b/xml/tests/testData/xml/def.xsd
new file mode 100644
index 000000000000..e10de914c05a
--- /dev/null
+++ b/xml/tests/testData/xml/def.xsd
@@ -0,0 +1,8 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="test.required">
+    <element name="root">
+        <complexType>
+            <attribute name="required" fixed="foo" use="required"/>
+            <attribute name="fixed" fixed="foo"/>
+        </complexType>
+    </element>
+</schema>
\ No newline at end of file
diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDefaultAttributeValueInspection.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDefaultAttributeValueInspection.java
index 013e854035ed..f54342306459 100644
--- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDefaultAttributeValueInspection.java
+++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlDefaultAttributeValueInspection.java
@@ -46,7 +46,7 @@ public class XmlDefaultAttributeValueInspection extends XmlSuppressableInspectio
         }
         if (parent.getParent() instanceof HtmlTag) return;
         XmlAttributeDescriptor descriptor = ((XmlAttribute)parent).getDescriptor();
-        if (descriptor == null) {
+        if (descriptor == null || descriptor.isRequired()) {
           return;
         }
         String defaultValue = descriptor.getDefaultValue();