TargetNamespace.1 error highlights invalid xmlns

If the declared namespace of the root element is not the same as the namespace declared in the schema, the incorrect namespace is highlighted. Fixes eclipse-lemminx#704 Signed-off-by: David Thompson <davthomp@redhat.com>
datho7561 · Jun 3, 2020 · a70fec4 · a70fec4
1 parent 374ea32
commit a70fec4
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 0 deletions.
diff --git a/...ain/java/org/eclipse/lemminx/extensions/contentmodel/participants/XMLSchemaErrorCode.java b/...ain/java/org/eclipse/lemminx/extensions/contentmodel/participants/XMLSchemaErrorCode.java
@@ -74,6 +74,7 @@ public enum XMLSchemaErrorCode implements IXMLErrorCode {
 	cvc_maxInclusive_valid("cvc-maxInclusive-valid"), // https://wiki.xmldation.com/Support/validator/cvc-maxinclusive-valid
 	cvc_minExclusive_valid("cvc-minExclusive-valid"), // https://wiki.xmldation.com/Support/validator/cvc-minexclusive-valid
 	cvc_minInclusive_valid("cvc-minInclusive-valid"), // https://wiki.xmldation.com/Support/validator/cvc-mininclusive-valid
+	TargetNamespace_1("TargetNamespace.1"), //
 	TargetNamespace_2("TargetNamespace.2"), SchemaLocation("SchemaLocation"), schema_reference_4("schema_reference.4"), //
 	src_element_3("src-element.3");
 
@@ -245,6 +246,13 @@ public static Range toLSPRange(XMLLocator location, XMLSchemaErrorCode code, Obj
 		}
 		case cvc_type_3_1_2:
 			return XMLPositionUtility.selectStartTagName(offset, document);
+			case TargetNamespace_1:
+			for (DOMNode node : document.getRoots()) {
+				if (node.hasAttribute("xmlns")) {
+					return XMLPositionUtility.selectAttributeValue(node.getAttributeNode("xmlns"));
+				}
+			}
+			return null;
 		default:
 		}
 		return null;

diff --git a/...ain/java/org/eclipse/lemminx/extensions/contentmodel/participants/XMLSyntaxErrorCode.java b/...ain/java/org/eclipse/lemminx/extensions/contentmodel/participants/XMLSyntaxErrorCode.java
@@ -22,6 +22,7 @@
 import org.apache.xerces.xni.XMLLocator;
 import org.eclipse.lemminx.dom.DOMDocument;
 import org.eclipse.lemminx.dom.DOMDocumentType;
+import org.eclipse.lemminx.dom.DOMNode;
 import org.eclipse.lemminx.extensions.contentmodel.participants.codeactions.ETagRequiredCodeAction;
 import org.eclipse.lemminx.extensions.contentmodel.participants.codeactions.ElementUnterminatedCodeAction;
 import org.eclipse.lemminx.extensions.contentmodel.participants.codeactions.EqRequiredInAttributeCodeAction;

diff --git a/...x/src/test/java/org/eclipse/lemminx/extensions/contentmodel/XMLSchemaDiagnosticsTest.java b/...x/src/test/java/org/eclipse/lemminx/extensions/contentmodel/XMLSchemaDiagnosticsTest.java
@@ -577,6 +577,28 @@ public void cvc_complex_type_2_2_withText() throws Exception {
 		testDiagnosticsFor(xml, diagnosticBob, diagnostic_cvc_2_2);
 	}
 
+	@Test
+	public void testTargetNamespace_1Normal() throws Exception {
+		String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + //
+				"<?xml-model href=\"src/test/resources/xsd/two-letter-name.xsd\"?>\n" + //
+				"<two-letter-name xmlns=\"BAD_NS\">Io</two-letter-name>";
+		testDiagnosticsFor(xml,
+				d(2, 23, 2, 31, XMLSchemaErrorCode.TargetNamespace_1, "TargetNamespace.1: Expecting namespace 'BAD_NS', but the target namespace of the schema document is 'http://two-letter-name'."),
+				d(2, 1, 2, 16, XMLSchemaErrorCode.cvc_elt_1_a, "cvc-elt.1.a: Cannot find the declaration of element 'two-letter-name'.")
+		);
+	}
+
+	@Test
+	public void testTargetNamespace_1ShortNS() throws Exception {
+		String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + //
+				"<?xml-model href=\"src/test/resources/xsd/two-letter-name.xsd\"?>\n" + //
+				"<two-letter-name xmlns=\"_\">Io</two-letter-name>";
+		testDiagnosticsFor(xml,
+				d(2, 23, 2, 26, XMLSchemaErrorCode.TargetNamespace_1, "TargetNamespace.1: Expecting namespace '_', but the target namespace of the schema document is 'http://two-letter-name'."),
+				d(2, 1, 2, 16, XMLSchemaErrorCode.cvc_elt_1_a, "cvc-elt.1.a: Cannot find the declaration of element 'two-letter-name'.")
+		);
+	}
+
 	private static void testDiagnosticsFor(String xml, Diagnostic... expected) {
 		XMLAssert.testDiagnosticsFor(xml, "src/test/resources/catalogs/catalog.xml", expected);
 	}

diff --git a/...x/src/test/java/org/eclipse/lemminx/extensions/contentmodel/XMLSyntaxDiagnosticsTest.java b/...x/src/test/java/org/eclipse/lemminx/extensions/contentmodel/XMLSyntaxDiagnosticsTest.java
@@ -19,6 +19,7 @@
 import static org.eclipse.lemminx.XMLAssert.testDiagnosticsFor;
 
 import org.eclipse.lemminx.XMLAssert;
+import org.eclipse.lemminx.extensions.contentmodel.participants.XMLSchemaErrorCode;
 import org.eclipse.lemminx.extensions.contentmodel.participants.XMLSyntaxErrorCode;
 import org.eclipse.lemminx.settings.EnforceQuoteStyle;
 import org.eclipse.lemminx.settings.QuoteStyle;

diff --git a/org.eclipse.lemminx/src/test/resources/xsd/two-letter-name.xsd b/org.eclipse.lemminx/src/test/resources/xsd/two-letter-name.xsd
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://two-letter-name">
+    <xs:element name="two-letter-name">
+        <xs:simpleType>
+            <xs:restriction base="xs:token">
+                <xs:pattern value="[A-Z][a-z]"></xs:pattern>
+            </xs:restriction>
+        </xs:simpleType>
+    </xs:element>
+</xs:schema>