Escaped "-" in makeSafeForCharacterClass() (#11)

Author: markwhitaker

src/main/kotlin/RegexBuilder.kt

@@ -454,8 +454,11 @@ class RegexBuilder {
         stringBuilder.append(quantifier?.toString() ?: "")
 
     private fun makeSafeForCharacterClass(text: String): String {
-        // Replace ] with \]
-        var safeText = text.replace("]", "\\]")
+        var safeText = text
+            // Replace ] with \]
+            .replace("]", "\\]")
+            // Replace - with \-
+            .replace("-", "\\-")
 
         // replace ^ with \^ if it occurs at the start of the string
         if (safeText.startsWith("^")) {

src/test/kotlin/RegexBuilderDslTest.kt

@@ -4,6 +4,7 @@ import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Test
+import uk.co.mainwave.regextoolboxkotlin.RegexBuilder
 import uk.co.mainwave.regextoolboxkotlin.RegexOptions.IGNORE_CASE
 import uk.co.mainwave.regextoolboxkotlin.RegexOptions.MULTILINE
 import uk.co.mainwave.regextoolboxkotlin.RegexQuantifier.AtLeast
@@ -1151,6 +1152,19 @@ class RegexBuilderDslTest {
         assertTrue(regex.containsMatchIn(MAC_ADDRESS))
     }
 
+    @Test
+    fun testAnyCharacterFromWithHyphen() {
+        val regex = regex {
+            anyCharacterFrom("a-f")
+        }
+
+        assertEquals("[a\\-f]", regex.toString())
+        assertTrue(regex.containsMatchIn("a"))
+        assertTrue(regex.containsMatchIn("-"))
+        assertTrue(regex.containsMatchIn("f"))
+        assertFalse(regex.containsMatchIn("c"))
+    }
+
     @Test
     fun testAnyCharacterFromWithCaretNotAtStart() {
         val regex = regex {
@@ -2246,10 +2260,10 @@ class RegexBuilderDslTest {
             text("s", ZeroOrOne)
             text("://")
             nonWhitespace(OneOrMore)
-            anyCharacterFrom("a-zA-Z0-9_/") // Valid last characters
+            anyCharacterFrom("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_/") // Valid last characters
         }
 
-        assertEquals("http(?:s)?://\\S+[a-zA-Z0-9_/]", regex.toString())
+        assertEquals("http(?:s)?://\\S+[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_/]", regex.toString())
         assertTrue(regex.containsMatchIn("http://www.mainwave.co.uk"))
         assertTrue(regex.containsMatchIn("https://www.mainwave.co.uk"))
         assertFalse(regex.containsMatchIn("www.mainwave.co.uk"))

src/test/kotlin/RegexBuilderTest.kt

@@ -1151,6 +1151,19 @@ class RegexBuilderTest {
         assertTrue(regex.containsMatchIn(MAC_ADDRESS))
     }
 
+    @Test
+    fun testAnyCharacterFromWithHyphen() {
+        val regex = RegexBuilder()
+            .anyCharacterFrom("a-f")
+            .buildRegex()
+
+        assertEquals("[a\\-f]", regex.toString())
+        assertTrue(regex.containsMatchIn("a"))
+        assertTrue(regex.containsMatchIn("-"))
+        assertTrue(regex.containsMatchIn("f"))
+        assertFalse(regex.containsMatchIn("c"))
+    }
+
     @Test
     fun testAnyCharacterFromWithCaretNotAtStart() {
         val regex = RegexBuilder()
@@ -2246,10 +2259,10 @@ class RegexBuilderTest {
             .text("s", ZeroOrOne)
             .text("://")
             .nonWhitespace(OneOrMore)
-            .anyCharacterFrom("a-zA-Z0-9_/") // Valid last characters
+            .anyCharacterFrom("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_/") // Valid last characters
             .buildRegex()
 
-        assertEquals("http(?:s)?://\\S+[a-zA-Z0-9_/]", regex.toString())
+        assertEquals("http(?:s)?://\\S+[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_/]", regex.toString())
         assertTrue(regex.containsMatchIn("http://www.mainwave.co.uk"))
         assertTrue(regex.containsMatchIn("https://www.mainwave.co.uk"))
         assertFalse(regex.containsMatchIn("www.mainwave.co.uk"))