Fix error range for cvc-pattern-valid

Signed-off-by: David Kwon <dakwon@redhat.com>
eclipse-lemminx · Jun 28, 2019 · fee5859 · fee5859
1 parent 85bf167
commit fee5859
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/...ain/java/org/eclipse/lsp4xml/extensions/contentmodel/participants/XMLSchemaErrorCode.java b/...ain/java/org/eclipse/lsp4xml/extensions/contentmodel/participants/XMLSchemaErrorCode.java
@@ -54,6 +54,7 @@ public enum XMLSchemaErrorCode implements IXMLErrorCode {
 	cvc_elt_3_1("cvc-elt.3.1"), // https://wiki.xmldation.com/Support/Validator/cvc-elt-3-1
 	cvc_elt_3_2_1("cvc-elt.3.2.1"), // https://wiki.xmldation.com/Support/Validator/cvc-elt-3-2-1
 	cvc_elt_4_2("cvc-elt.4.2"), // https://wiki.xmldation.com/Support/Validator/cvc-elt-4-2
+	cvc_pattern_valid("cvc-pattern-valid"), // https://wiki.xmldation.com/Support/Validator/cvc-pattern-valid
 	cvc_type_3_1_1("cvc-type.3.1.1"), // https://wiki.xmldation.com/Support/Validator/cvc-type-3-1-1
 	cvc_type_3_1_2("cvc-type.3.1.2"), // https://wiki.xmldation.com/Support/Validator/cvc-type-3-1-2
 	cvc_type_3_1_3("cvc-type.3.1.3"), // https://wiki.xmldation.com/Support/Validator/cvc-type-3-1-3,
@@ -150,6 +151,10 @@ public static Range toLSPRange(XMLLocator location, XMLSchemaErrorCode code, Obj
 			}
 			return XMLPositionUtility.selectAttributeFromGivenNameAt(attrName, offset, document);
 		}
+		case cvc_pattern_valid: {
+			String attrValue = (String) arguments[0];
+			return XMLPositionUtility.selectAttributeValueByGivenValueAt(attrValue, offset, document);
+		}
 		case SchemaLocation:
 		case schema_reference_4: {
 			DOMNode attrValueNode;

diff --git a/...l/src/test/java/org/eclipse/lsp4xml/extensions/contentmodel/XMLSchemaDiagnosticsTest.java b/...l/src/test/java/org/eclipse/lsp4xml/extensions/contentmodel/XMLSchemaDiagnosticsTest.java
@@ -342,6 +342,17 @@ public void cvc_complex_type_2_1WithLinefeed() throws Exception {
 		testCodeActionsFor(xml, d, ca(d, te(5, 25, 7, 8, "/>")));
 	}
 
+	@Test
+	public void cvc_pattern_valid() throws Exception {
+		String xml = "<Annotation\r\n" +
+				"	xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n" +
+				"	xsi:noNamespaceSchemaLocation=\"src/test/resources/xsd/pattern.xsd\"\r\n" +
+				"	Term=\"X\"></Annotation>";
+		Diagnostic patternValid = d(3, 6, 3, 9, XMLSchemaErrorCode.cvc_pattern_valid);
+		Diagnostic cvcAttribute3 = d(3, 6, 3, 9, XMLSchemaErrorCode.cvc_attribute_3);
+		testDiagnosticsFor(xml, patternValid, cvcAttribute3);
+	}
+
 	/**
 	 * @see https://github.com/angelozerr/lsp4xml/issues/217
 	 */

diff --git a/org.eclipse.lsp4xml/src/test/resources/xsd/pattern.xsd b/org.eclipse.lsp4xml/src/test/resources/xsd/pattern.xsd
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+	<xs:element name="Annotation">
+		<xs:complexType>
+			<xs:attribute name="Term" type="TQualifiedName"
+				use="required" />
+		</xs:complexType>
+	</xs:element>
+
+
+	<xs:simpleType name="TQualifiedName">
+		<xs:restriction base="xs:NCName">
+			<xs:pattern
+				value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){1,}" />
+		</xs:restriction>
+	</xs:simpleType>
+
+</xs:schema>