Restore the behavior of cssSelector before v1.16.2

Author: PhuNH

src/main/java/org/jsoup/nodes/Element.java

@@ -937,6 +937,25 @@ public Element wrap(String html) {
         return (Element) super.wrap(html);
     }
 
+    private String idAsCssSelector() {
+        String result = "";
+
+        if (!id().isEmpty()) {
+            // prefer to return the ID - but check that it's actually unique first!
+            String idSel = "#" + escapeCssIdentifier(id());
+            Document doc = ownerDocument();
+            if (doc != null) {
+                Elements els = doc.select(idSel);
+                if (els.size() == 1 && els.get(0) == this) // otherwise, continue to the nth-child impl
+                    result = idSel;
+            } else {
+                result = idSel; // no ownerdoc, return the ID selector
+            }
+        }
+
+        return result;
+    }
+
     /**
      * Get a CSS selector that will uniquely select this element.
      * <p>
@@ -948,22 +967,18 @@ public Element wrap(String html) {
      * @return the CSS Path that can be used to retrieve the element in a selector.
      */
     public String cssSelector() {
-        if (id().length() > 0) {
-            // prefer to return the ID - but check that it's actually unique first!
-            String idSel = "#" + escapeCssIdentifier(id());
-            Document doc = ownerDocument();
-            if (doc != null) {
-                Elements els = doc.select(idSel);
-                if (els.size() == 1 && els.get(0) == this) // otherwise, continue to the nth-child impl
-                    return idSel;
-            } else {
-                return idSel; // no ownerdoc, return the ID selector
-            }
-        }
+        String idAsCssSelector = idAsCssSelector();
+        if (!idAsCssSelector.isEmpty())
+            return idAsCssSelector;
 
         StringBuilder selector = StringUtil.borrowBuilder();
         Element el = this;
         while (el != null && !(el instanceof Document)) {
+            idAsCssSelector = el.idAsCssSelector();
+            if (!idAsCssSelector.isEmpty()) {
+                selector.insert(0, idAsCssSelector);
+                break;
+            }
             selector.insert(0, el.cssSelectorComponent());
             el = el.parent();
         }

src/test/java/org/jsoup/nodes/ElementTest.java

@@ -2592,6 +2592,17 @@ void prettySerializationRoundTrips(Document.OutputSettings settings) {
         assertEquals("div", el.cssSelector());
     }
 
+    @Test void cssSelectorParentWithId() {
+        // https://github.com/jhy/jsoup/issues/2282
+        Document doc = Jsoup.parse("<div><div id=\"id1\"><p>A</p></div><div><p>B</p></div><div class=\"c1 c2\"><p>C</p></div></div>");
+        Element divA = doc.select("div div p").get(0);
+        Element divB = doc.select("div div p").get(1);
+        Element divC = doc.select("div div p").get(2);
+        assertEquals("#id1 > p", divA.cssSelector());
+        assertEquals("html > body > div > div:nth-child(2) > p", divB.cssSelector());
+        assertEquals("html > body > div > div.c1.c2 > p", divC.cssSelector());
+    }
+
     @Test void cssSelectorDoesntStackOverflow() {
         // https://github.com/jhy/jsoup/issues/2001
         Element element = new Element("element");