fix: let Matcher#namedGroups() be called multiple times (#27)

related #17 fix #26
tony19 · Oct 15, 2022 · 7506b68 · 7506b68
1 parent 9674eb8
commit 7506b68
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/main/java/com/google/code/regexp/Matcher.java b/src/main/java/com/google/code/regexp/Matcher.java
@@ -320,7 +320,9 @@ public List<Map<String, String>> namedGroups() {
         }
 
         int nextIndex = 0;
-        while (!matcher.hitEnd() && matcher.find(nextIndex)) {
+        int lastNextIndex = 0;
+        matcher.reset();
+        while (matcher.find(nextIndex)) {
             Map<String, String> matches = new LinkedHashMap<String, String>();
 
             for (String groupName : groupNames) {
@@ -329,6 +331,11 @@ public List<Map<String, String>> namedGroups() {
                 nextIndex = matcher.end();
             }
 
+            if (nextIndex == lastNextIndex) {
+                break;
+            }
+            lastNextIndex = nextIndex;
+
             result.add(matches);
         }
         return result;

diff --git a/src/test/java/com/google/code/regexp/MatcherTest.java b/src/test/java/com/google/code/regexp/MatcherTest.java
@@ -763,4 +763,17 @@ public void testNamedGroupsReturnsWhenMatchesEmptyString() {
         assertEquals(1, groups.size());
         assertEquals("bar", groups.get(0).get("foo"));
     }
+
+    // Issue #26
+    @Test
+    public void testNamedGroupsCanBeCalledMultipleTimes() {
+        final String regex = "/teamDrawer/(?<roomId>.*)";
+        final String url = "/teamDrawer/12345";
+
+        final Matcher matcher = Pattern.compile(regex).matcher(url);
+        final Integer count = matcher.namedGroups().size();
+        final Integer mapCount = matcher.namedGroups().get(0).size();
+        final String value = matcher.namedGroups().get(0).get("roomId");
+        assertEquals("12345", value);
+    }
 }