From 3ea8abb35e0cf396f0886c54c04eda2325db98a1 Mon Sep 17 00:00:00 2001
From: Angelo <angelo.zerr@gmail.com>
Date: Wed, 16 Sep 2020 18:01:20 +0200
Subject: [PATCH] Improve error range for ETagUnterminated (#877)

Fixes #875

Signed-off-by: azerr <azerr@redhat.com>

Co-authored-by: azerr <azerr@redhat.com>
---
 .../participants/XMLSyntaxErrorCode.java      | 11 +++-
 .../lemminx/utils/XMLPositionUtility.java     | 55 -------------------
 .../XMLSyntaxDiagnosticsTest.java             | 35 ++++++++++++
 3 files changed, 44 insertions(+), 57 deletions(-)

diff --git a/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/extensions/contentmodel/participants/XMLSyntaxErrorCode.java b/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/extensions/contentmodel/participants/XMLSyntaxErrorCode.java
index 6da8797f4..49b7d8293 100644
--- a/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/extensions/contentmodel/participants/XMLSyntaxErrorCode.java
+++ b/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/extensions/contentmodel/participants/XMLSyntaxErrorCode.java
@@ -194,7 +194,7 @@ public static Range toLSPRange(XMLLocator location, XMLSyntaxErrorCode code, Obj
 			String attrValue = getString(arguments[0]);
 			return XMLPositionUtility.selectAttributeValueByGivenValueAt(attrValue, offset, document);
 		}
-		case ETagUnterminated:
+		case ETagUnterminated: {
 			/**
 			 * Cases:
 			 * 
@@ -204,7 +204,14 @@ public static Range toLSPRange(XMLLocator location, XMLSyntaxErrorCode code, Obj
 			 * 
 			 * <a> <a> </a> </b
 			 */
-			return XMLPositionUtility.selectPreviousNodesEndTag(offset, document);
+			String text = document.getText();
+			char ch = text.charAt(offset);
+			while(Character.isWhitespace(ch)) {
+				offset--;
+				ch = text.charAt(offset);
+			}
+			return XMLPositionUtility.selectEndTagName(offset, document);
+		}
 		case CustomETag:
 			return XMLPositionUtility.selectEndTagName(offset, document);
 		case ETagRequired: {
diff --git a/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/utils/XMLPositionUtility.java b/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/utils/XMLPositionUtility.java
index 876f76347..55608f7ba 100644
--- a/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/utils/XMLPositionUtility.java
+++ b/org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/utils/XMLPositionUtility.java
@@ -497,61 +497,6 @@ public static Range selectEndTagName(DOMElement element, boolean localNameOnly)
 		return null;
 	}
 
-	/**
-	 * Finds the offset of the first tag it comes across behind the given offset.
-	 * 
-	 * <p>
-	 * This will include the tag it starts in if the offset is within a tag's
-	 * content:
-	 * </p>
-	 * <p>
-	 * {@code  <a> <b> | </b> </a> } , will give {@code </b>}
-	 * </p>
-	 * 
-	 * or within an unclosed end tag:
-	 * 
-	 * <p>
-	 * {@code  <a> <b>  </b> </a| <c>} , will give {@code </a>}
-	 * </p>
-	 * 
-	 * 
-	 * <p>
-	 * {@code  <a> <b|>  </b> </a>} , will give {@code </a>}
-	 * </p>
-	 * 
-	 */
-	public static Range selectPreviousNodesEndTag(int offset, DOMDocument document) {
-
-		DOMNode node = null;
-		DOMNode nodeAt = document.findNodeAt(offset);
-		if (nodeAt != null && nodeAt.isElement()) {
-			node = nodeAt;
-		} else {
-			DOMNode nodeBefore = document.findNodeBefore(offset);
-			if (nodeBefore != null && nodeBefore.isElement()) {
-				node = nodeBefore;
-			}
-		}
-		if (node != null) {
-			DOMElement element = (DOMElement) node;
-			if (element.isClosed() && !element.isEndTagClosed()) {
-				return selectEndTagName(element.getEnd(), document);
-			}
-		}
-
-		// boolean firstBracket = false;
-		int i = offset;
-		char c = document.getText().charAt(i);
-		while (i >= 0) {
-			if (c == '>') {
-				return selectEndTagName(i, document);
-			}
-			i--;
-			c = document.getText().charAt(i);
-		}
-		return null;
-	}
-
 	// ------------ Entities selection
 
 	/**
diff --git a/org.eclipse.lemminx/src/test/java/org/eclipse/lemminx/extensions/contentmodel/XMLSyntaxDiagnosticsTest.java b/org.eclipse.lemminx/src/test/java/org/eclipse/lemminx/extensions/contentmodel/XMLSyntaxDiagnosticsTest.java
index 0c31b1e3e..272a57b8b 100644
--- a/org.eclipse.lemminx/src/test/java/org/eclipse/lemminx/extensions/contentmodel/XMLSyntaxDiagnosticsTest.java
+++ b/org.eclipse.lemminx/src/test/java/org/eclipse/lemminx/extensions/contentmodel/XMLSyntaxDiagnosticsTest.java
@@ -330,6 +330,41 @@ public void testETagUnterminated2() throws Exception {
 		testDiagnosticsFor(xml, d(3, 4, 3, 5, XMLSyntaxErrorCode.ETagUnterminated));
 	}
 
+	/**
+	 * Test ETagUnterminated
+	 * 
+	 * @see https://wiki.xmldation.com/Support/Validator/ETagUnterminated
+	 * @throws Exception
+	 */
+	@Test
+	public void testETagUnterminated3() throws Exception {
+		String xml = "<foo>\r\n" + //
+				"  <ba><ABCD></ABCD></bar>\r\n" + // // <-- error
+				"</foo>";
+		testDiagnosticsFor(xml, d(1, 21, 1, 24, XMLSyntaxErrorCode.ETagUnterminated));
+	}
+
+	/**
+	 * Test ETagUnterminated
+	 * 
+	 * @see https://wiki.xmldation.com/Support/Validator/ETagUnterminated
+	 * @throws Exception
+	 */
+	@Test
+	public void testETagUnterminated4() throws Exception {
+		String xml = "<project>\r\n" + //
+				"  <dependencies>\r\n" + //
+				"    <dependency>\r\n" + //
+				"      <scope>test</scope>\r\n" + //
+				"    </dependency\r\n" + // <-- error
+				"    <dependency>\r\n" + //
+				"      <scope>test</scope>\r\n" + //
+				"    </dependency>\r\n" + //
+				"  </dependencies>\r\n" + //
+				"</project>";
+		testDiagnosticsFor(xml, d(4, 6, 4, 16, XMLSyntaxErrorCode.ETagUnterminated));
+	}
+
 	@Test
 	public void testETagRequiredWithText() throws Exception {
 		String xml = "<root>\r\n" + //