simplify

staabm · staabm · commit 24a00b6eabbb · 2024-12-17T10:19:58.000+01:00
diff --git a/src/Type/Regex/RegexGroupParser.php b/src/Type/Regex/RegexGroupParser.php
@@ -72,12 +72,9 @@ public function parseGroups(string $regex): ?array
 			}
 		}
 
-		// The regex engine ignores everything after the (?# until the first closing parenthesis
-		$regex = preg_replace('/\(\?#[^)]*\)/', '', $regex) ?? '';
-
 		if (str_contains($modifiers, 'x')) {
 			// in freespacing mode the # character starts a comment and runs until the end of the line
-			$regex = preg_replace('/#.*/', '', $regex) ?? '';
+			$regex = preg_replace('/[^?]#.*/', '', $regex) ?? '';
 		}
 
 		$rawRegex = $this->regexExpressionHelper->removeDelimitersAndModifiers($regex);

Original file line number	Diff line number	Diff line change
`@@ -72,12 +72,9 @@ public function parseGroups(string $regex): ?array`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`- // The regex engine ignores everything after the (?# until the first closing parenthesis`
`76`		`- $regex = preg_replace('/\(\?#[^)]*\)/', '', $regex) ?? '';`
`77`		`-`
`78`	`75`	`if (str_contains($modifiers, 'x')) {`
`79`	`76`	`// in freespacing mode the # character starts a comment and runs until the end of the line`
`80`		`- $regex = preg_replace('/#.*/', '', $regex) ?? '';`
	`77`	`+ $regex = preg_replace('/[^?]#.*/', '', $regex) ?? '';`
`81`	`78`	`}`
`82`	`79`
`83`	`80`	`$rawRegex = $this->regexExpressionHelper->removeDelimitersAndModifiers($regex);`