Fix error range for ETagRequired (#395)

Fixes #387 Signed-off-by: David Kwon <[email protected]>
eclipse · May 29, 2019 · c228469 · c228469
1 parent c914529
commit c228469
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/utils/XMLPositionUtility.java b/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/utils/XMLPositionUtility.java
@@ -177,20 +177,32 @@ public static Range selectChildEndTag(String childTag, int offset, DOMDocument d
 		if (parent == null || !parent.isElement() || ((DOMElement) parent).getTagName() == null) {
 			return null;
 		}
-		if (parent != null) {
-			DOMNode child = findChildNode(childTag, parent.getChildren());
-			if (child != null) {
+
+		DOMNode curr = parent;
+		DOMNode child;
+		while (curr != null) {
+			child = findUnclosedChildNode(childTag, curr.getChildren());
+			if (child == null) {
+				curr = findUnclosedChildNode(curr.getChildren());
+			} else {
 				return createRange(child.getStart() + 1, child.getStart() + 1 + childTag.length(), document);
 			}
-			if(parent.isElement()) {
-				String parentName = ((DOMElement) parent).getTagName();
-				return createRange(parent.getStart() + 2, parent.getStart() + 2 + parentName.length(), document);
+		}
+
+		String parentName = ((DOMElement) parent).getTagName();
+		return createRange(parent.getStart() + 2, parent.getStart() + 2 + parentName.length(), document);
+	}
+
+	public static DOMNode findUnclosedChildNode(List<DOMNode> children) {
+		for (DOMNode child: children) {
+			if (!child.isClosed()) {
+				return child;
 			}
 		}
 		return null;
 	}
 
-	static DOMNode findChildNode(String childTag, List<DOMNode> children) {
+	static DOMNode findUnclosedChildNode(String childTag, List<DOMNode> children) {
 		for (DOMNode child : children) {
 			if (child.isElement() && childTag != null && childTag.equals(((DOMElement) child).getTagName())
 					&& !child.isClosed()) {

diff --git a/...l/src/test/java/org/eclipse/lsp4xml/extensions/contentmodel/XMLSyntaxDiagnosticsTest.java b/...l/src/test/java/org/eclipse/lsp4xml/extensions/contentmodel/XMLSyntaxDiagnosticsTest.java
@@ -167,6 +167,16 @@ public void testETagRequired2() throws Exception {
 		testDiagnosticsFor(xml, d(1, 13, 1, 15, XMLSyntaxErrorCode.ETagRequired));
 	}
 
+	@Test
+	public void testETagRequired3() throws Exception {
+		String xml = "<UltmtDbtr>\r\n" +
+				"    <Nm>Name</Nm>\r\n" +
+				"    <Ad>\r\n" +
+				"    <Ph>\r\n" +
+				"</UltmtDbtr>";
+		testDiagnosticsFor(xml, d(3, 5, 3, 7, XMLSyntaxErrorCode.ETagRequired));
+	}
+
 	/**
 	 * Test ETagUnterminated
 	 *