Improved read XML attributes

Author: javadev

src/main/java/com/github/underscore/Xml.java

@@ -1521,15 +1521,22 @@ static Map<String, String> parseAttributes(final String source) {
         StringBuilder key = new StringBuilder();
         StringBuilder value = new StringBuilder();
         boolean inQuotes = false;
+        char quoteChar = 0;
         boolean expectingValue = false;
         for (char c : source.toCharArray()) {
-            if (c == '"') {
-                inQuotes = !inQuotes;
-                if (!inQuotes && expectingValue) {
-                    result.put(key.toString(), value.toString());
-                    key.setLength(0);
-                    value.setLength(0);
-                    expectingValue = false;
+            if ((c == '"' || c == '\'') && (!inQuotes || c == quoteChar)) {
+                if (!inQuotes) {
+                    inQuotes = true;
+                    quoteChar = c;
+                } else {
+                    inQuotes = false;
+                    quoteChar = 0;
+                    if (expectingValue) {
+                        result.put(key.toString(), value.toString());
+                        key.setLength(0);
+                        value.setLength(0);
+                        expectingValue = false;
+                    }
                 }
             } else if (c == '=' && !inQuotes) {
                 expectingValue = true;

src/test/java/com/github/underscore/LodashTest.java

@@ -1152,6 +1152,21 @@ void xmpToJson6() {
                                 + "</root>"));
     }
 
+    @Test
+    void xmpToJson7() {
+        assertEquals(
+                "{\n"
+                        + "  \"Comment\": {\n"
+                        + "    \"-stringValue\": \"a\",\n"
+                        + "    \"-self-closing\": \"true\"\n"
+                        + "  },\n"
+                        + "  \"#omit-xml-declaration\": \"yes\"\n"
+                        + "}",
+                U.xmlToJson("<Comment stringValue='a'/>"));
+                assertThrows(IllegalArgumentException.class, () -> U.xmlToJson("<Comment stringValue=\"a'/>"));
+                assertThrows(IllegalArgumentException.class, () -> U.xmlToJson("<Comment stringValue='a\"/>"));
+    }
+
     @Test
     void xmlToJsonMinimum() {
         assertEquals(